diff --git a/evals/gdm_capabilities/in_house_ctf/data/cmd_injection/compose.yaml b/evals/gdm_capabilities/in_house_ctf/data/cmd_injection/compose.yaml
index 9de312768..8ef431a85 100644
--- a/evals/gdm_capabilities/in_house_ctf/data/cmd_injection/compose.yaml
+++ b/evals/gdm_capabilities/in_house_ctf/data/cmd_injection/compose.yaml
@@ -6,6 +6,11 @@ services:
       - cmd_injection_network
     expose:
       - 8080
+    healthcheck:
+      test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://0.0.0.0:8080/ || exit 1" ]
+      interval: 5s
+      timeout: 5s
+      retries: 5
 
   attacker:
     image: marshw/attacker
diff --git a/evals/gdm_capabilities/in_house_ctf/data/db_3/compose.yaml b/evals/gdm_capabilities/in_house_ctf/data/db_3/compose.yaml
index 0926f2711..b86e1b384 100644
--- a/evals/gdm_capabilities/in_house_ctf/data/db_3/compose.yaml
+++ b/evals/gdm_capabilities/in_house_ctf/data/db_3/compose.yaml
@@ -6,6 +6,11 @@ services:
       - db_3_network
     expose:
       - 5432
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U admin" ]
+      interval: 5s
+      timeout: 5s
+      retries: 5
 
   attacker:
     image: marshw/attacker
diff --git a/evals/gdm_capabilities/in_house_ctf/data/grafana/compose.yaml b/evals/gdm_capabilities/in_house_ctf/data/grafana/compose.yaml
index 8f0540212..dc3b7dca5 100644
--- a/evals/gdm_capabilities/in_house_ctf/data/grafana/compose.yaml
+++ b/evals/gdm_capabilities/in_house_ctf/data/grafana/compose.yaml
@@ -6,6 +6,12 @@ services:
       - grafana_network
     expose:
       - 3000
+    healthcheck:
+      # curl is not installed in the grafana image, so use wget
+      test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:3000/api/health || exit 1" ]
+      interval: 5s
+      timeout: 5s
+      retries: 5
 
   attacker:
     image: marshw/attacker
diff --git a/evals/gdm_capabilities/in_house_ctf/data/idor/compose.yaml b/evals/gdm_capabilities/in_house_ctf/data/idor/compose.yaml
index db2423528..4957c041f 100644
--- a/evals/gdm_capabilities/in_house_ctf/data/idor/compose.yaml
+++ b/evals/gdm_capabilities/in_house_ctf/data/idor/compose.yaml
@@ -6,6 +6,11 @@ services:
       - idor_network
     expose:
       - 8081
+    healthcheck:
+      test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://0.0.0.0:8081/ || exit 1" ]
+      interval: 5s
+      timeout: 5s
+      retries: 5
 
   attacker:
     image: marshw/attacker
diff --git a/evals/gdm_capabilities/in_house_ctf/data/pw_reuse/compose.yaml b/evals/gdm_capabilities/in_house_ctf/data/pw_reuse/compose.yaml
index 2a8875c72..638da9fea 100644
--- a/evals/gdm_capabilities/in_house_ctf/data/pw_reuse/compose.yaml
+++ b/evals/gdm_capabilities/in_house_ctf/data/pw_reuse/compose.yaml
@@ -6,12 +6,22 @@ services:
       - pw_reuse_network
     expose:
       - 22
+    healthcheck:
+      test: [ "CMD-SHELL", "nc -z localhost 22 || exit 1" ]
+      interval: 5s
+      timeout: 5s
+      retries: 5
 
   pw_reuse_db:
     image: marshw/pw_reuse_db
     init: true
     networks:
       - pw_reuse_network
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U admin" ]
+      interval: 5s
+      timeout: 5s
+      retries: 5
 
   attacker:
     image: marshw/attacker
diff --git a/evals/gdm_capabilities/in_house_ctf/data/spray/compose.yaml b/evals/gdm_capabilities/in_house_ctf/data/spray/compose.yaml
index db7c460bb..524e9df8e 100644
--- a/evals/gdm_capabilities/in_house_ctf/data/spray/compose.yaml
+++ b/evals/gdm_capabilities/in_house_ctf/data/spray/compose.yaml
@@ -6,6 +6,11 @@ services:
       - spray_network
     expose:
       - 8082
+    healthcheck:
+      test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://0.0.0.0:8082/ || exit 1" ]
+      interval: 5s
+      timeout: 5s
+      retries: 5
 
   attacker:
     image: marshw/attacker
diff --git a/evals/gdm_capabilities/in_house_ctf/data/sqli/compose.yaml b/evals/gdm_capabilities/in_house_ctf/data/sqli/compose.yaml
index 2d513ffa6..b8a88873e 100644
--- a/evals/gdm_capabilities/in_house_ctf/data/sqli/compose.yaml
+++ b/evals/gdm_capabilities/in_house_ctf/data/sqli/compose.yaml
@@ -6,6 +6,11 @@ services:
       - sqli_network
     expose:
       - 80
+    healthcheck:
+      test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://0.0.0.0:80/users || exit 1" ]
+      interval: 5s
+      timeout: 5s
+      retries: 5
 
   attacker:
     image: marshw/attacker
diff --git a/evals/gdm_capabilities/in_house_ctf/data/ssh/compose.yaml b/evals/gdm_capabilities/in_house_ctf/data/ssh/compose.yaml
index 8da3e933c..a7e24a75a 100644
--- a/evals/gdm_capabilities/in_house_ctf/data/ssh/compose.yaml
+++ b/evals/gdm_capabilities/in_house_ctf/data/ssh/compose.yaml
@@ -6,6 +6,11 @@ services:
       - ssh_network
     expose:
       - 22
+    healthcheck:
+      test: [ "CMD-SHELL", "nc -z localhost 22 || exit 1" ]
+      interval: 5s
+      timeout: 5s
+      retries: 5
 
   attacker:
     image: marshw/attacker
diff --git a/evals/gdm_capabilities/in_house_ctf/data/webmin/compose.yaml b/evals/gdm_capabilities/in_house_ctf/data/webmin/compose.yaml
index a41a9b794..934b6d728 100644
--- a/evals/gdm_capabilities/in_house_ctf/data/webmin/compose.yaml
+++ b/evals/gdm_capabilities/in_house_ctf/data/webmin/compose.yaml
@@ -6,6 +6,11 @@ services:
       - webmin_network
     expose:
       - 10000
+    healthcheck:
+      test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:10000 || exit 1" ]
+      interval: 5s
+      timeout: 5s
+      retries: 5
 
   attacker:
     image: marshw/attacker