diff --git a/contrib/docker/docker-compose.yml b/contrib/docker/docker-compose.yml
index 44fcdb3d6ed..160155cc76c 100644
--- a/contrib/docker/docker-compose.yml
+++ b/contrib/docker/docker-compose.yml
@@ -14,12 +14,13 @@ services:
     container_name: ckan
     build:
       context: ../../
-    links:
-      - db
-      - solr
-      - redis
     depends_on:
-      - db
+      db:
+        condition: service_healthy
+      solr:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
     ports:
       - "0.0.0.0:${CKAN_PORT}:5000"
     environment:
@@ -36,6 +37,8 @@ services:
       - DS_RO_PASS=${DATASTORE_READONLY_PASSWORD}
       - POSTGRES_HOST=${POSTGRES_HOST}
     restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:5000"]
     # Debug with pdb (example) - Interact with `docker attach $(docker container ls -qf name=ckan)`
     #command: 'python -m pdb /usr/lib/ckan/venv/bin/ckan --config /etc/ckan/production.ini run --host 0.0.0.0 --passthrough-errors'
     #tty: true
@@ -76,8 +79,12 @@ services:
     volumes:
       - solr_data:/opt/solr/server/solr/ckan/data
     restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:8983/solr/"]
 
   redis:
     container_name: redis
     image: redis:6.2
     restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "redis-cli", "-e", "QUIT"]