diff --git a/.github/workflows/stack-healthcheck.yml b/.github/workflows/stack-healthcheck.yml
index e0f3d38..3fd822c 100644
--- a/.github/workflows/stack-healthcheck.yml
+++ b/.github/workflows/stack-healthcheck.yml
@@ -12,10 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Deploy the stack
-        run: docker-compose up -d
-
-      - name: Test PGAdmin
-        run: docker run --network container:resolve_pgadmin appropriate/curl --retry 10 --retry-delay 1 --retry-connrefused http://localhost/
+        run: timeout 5 docker-compose up -d
 
       - name: Setup tmate session
         uses: mxschmitt/action-tmate@v3
diff --git a/docker-compose.yml b/docker-compose.yml
index 574898a..525e3ce 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -46,7 +46,7 @@ services:
     restart: always
     volumes:
       - *bk-location
-    links:
+    depends_on:
       - postgres
     environment:
       <<: [*db-environment, *backup-environment]
@@ -54,6 +54,8 @@ services:
       POSTGRES_EXTRA_OPTS: --blobs --format=custom --quote-all-identifiers
       BACKUP_SUFFIX: .backup
       HEALTHCHECK_PORT: 8080
+    healthcheck:
+      interval: 30s
   pgadmin:
     container_name: resolve_pgadmin
     image: dpage/pgadmin4
@@ -62,5 +64,7 @@ services:
       <<: [*admin-environment]
     ports:
       - *pgadmin-port
+    depends_on:
+      - postgres
     healthcheck:
       test: ["CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost/ || exit 1"]