diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index da95a00aa..ad7074848 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -32,19 +32,20 @@ services:
       ELASTICSEARCH_HOST: elasticsearch
       QUICKSTATEMENTS_PUBLIC_URL: https://${QUICKSTATEMENTS_PUBLIC_HOST}
     healthcheck:
-      test: curl --silent --fail localhost/wiki/Main_Page
+      test: /healthcheck.sh
       interval: 10s
       start_period: 5m
 
   wikibase-jobrunner:
     image: wikibase/wikibase:3
-    command: /jobrunner-entrypoint.sh
     depends_on:
       wikibase:
         condition: service_healthy
     restart: unless-stopped
     volumes_from:
       - wikibase
+    environment:
+      IS_JOBRUNNER: true
 
   mysql:
     image: mariadb:10.11
@@ -78,7 +79,7 @@ services:
       discovery.type: single-node
       ES_JAVA_OPTS: -Xms512m -Xmx512m -Dlog4j2.formatMsgNoLookups=true
     healthcheck:
-      test: curl --silent --fail localhost:9200
+      test: /healthcheck.sh
       interval: 10s
       start_period: 2m
 
@@ -99,7 +100,7 @@ services:
     volumes:
       - wdqs-data:/wdqs/data
     healthcheck:
-      test: curl --silent --fail localhost:9999/bigdata/namespace/wdq/sparql
+      test: /healthcheck.sh
       interval: 10s
       start_period: 2m
 
@@ -138,7 +139,7 @@ services:
     environment:
       WDQS_HOST: wdqs-proxy
     healthcheck:
-      test: curl --silent --fail localhost
+      test: /healthcheck.sh
       interval: 10s
       start_period: 2m
 
@@ -159,7 +160,7 @@ services:
       QUICKSTATEMENTS_PUBLIC_URL: https://${QUICKSTATEMENTS_PUBLIC_HOST}
       WIKIBASE_PUBLIC_URL: https://${WIKIBASE_PUBLIC_HOST}
     healthcheck:
-      test: curl --silent --fail localhost
+      test: /healthcheck.sh
       interval: 10s
       start_period: 2m