diff --git a/.env.example b/.env.example
index a056071..407adec 100644
--- a/.env.example
+++ b/.env.example
@@ -51,6 +51,5 @@ LOG_LEVEL=INFO
 PGADMIN_DEFAULT_EMAIL=user@domain.local
 PGADMIN_DEFAULT_PASSWORD=change_this_bad_password
 PGADMIN_DISABLE_POSTFIX=true
-PGADMIN_ENABLE_TLS=false
 PGADMIN_LISTEN_ADDRESS=::
-PGADMIN_LISTEN_PORT=8080
\ No newline at end of file
+PGADMIN_HOST_PORT=8092
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 09caef5..0ef5d17 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -108,10 +108,18 @@ services:
       PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL}
       PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD:-change_this_bad_password}
       PGADMIN_DISABLE_POSTFIX: ${PGADMIN_DISABLE_POSTFIX}
-      PGADMIN_ENABLE_TLS: ${PGADMIN_ENABLE_TLS}
+      PGADMIN_ENABLE_TLS: false
       PGADMIN_LISTEN_ADDRESS: ${PGADMIN_LISTEN_ADDRESS}
-      PGADMIN_LISTEN_PORT: ${PGADMIN_LISTEN_PORT}
-
+      PGADMIN_LISTEN_PORT: 80
+      TZ: ${TZ:-Europe/Stockholm}
+    ports:
+      - ${PGADMIN_HOST_PORT:-18081}:80
+    healthcheck:
+      test: ["CMD", "wget", "-O", "-", "http://localhost:80/misc/ping"]
+      interval: 10s
+      timeout: 10s
+      start_period: 160s
+      retries: 3
   broker:
     # Optional MQTT broker for local testing; excluded unless the "test"
     # profile is active (docker compose --profile test ...). Point