diff --git a/templates/compose/forgejo-with-runner-with-mariadb.yaml b/templates/compose/forgejo-with-runner-with-mariadb.yaml
index 973d5e900..805aa0d9f 100644
--- a/templates/compose/forgejo-with-runner-with-mariadb.yaml
+++ b/templates/compose/forgejo-with-runner-with-mariadb.yaml
@@ -63,7 +63,10 @@ services:
     privileged: true
     restart: 'unless-stopped'
     healthcheck:
-      disable: true
+      test: ["CMD", "nc", "-z", "127.0.0.1", "2376"]
+      interval: 10s
+      timeout: 30s
+      retries: 10
     environment:
       DOCKER_TLS_CERTDIR: /certs
       DOCKER_HOST: docker-in-docker
diff --git a/templates/compose/forgejo-with-runner-with-mysql.yaml b/templates/compose/forgejo-with-runner-with-mysql.yaml
index 3d0cae916..9487694af 100644
--- a/templates/compose/forgejo-with-runner-with-mysql.yaml
+++ b/templates/compose/forgejo-with-runner-with-mysql.yaml
@@ -63,7 +63,10 @@ services:
     privileged: true
     restart: 'unless-stopped'
     healthcheck:
-      disable: true
+      test: ["CMD", "nc", "-z", "127.0.0.1", "2376"]
+      interval: 10s
+      timeout: 30s
+      retries: 10
     environment:
       DOCKER_TLS_CERTDIR: /certs
       DOCKER_HOST: docker-in-docker
diff --git a/templates/compose/forgejo-with-runner-with-postgresql.yaml b/templates/compose/forgejo-with-runner-with-postgresql.yaml
index 040626f9f..bac4a4681 100644
--- a/templates/compose/forgejo-with-runner-with-postgresql.yaml
+++ b/templates/compose/forgejo-with-runner-with-postgresql.yaml
@@ -62,7 +62,10 @@ services:
     privileged: true
     restart: 'unless-stopped'
     healthcheck:
-      disable: true
+      test: ["CMD", "nc", "-z", "127.0.0.1", "2376"]
+      interval: 10s
+      timeout: 30s
+      retries: 10
     environment:
       DOCKER_TLS_CERTDIR: /certs
       DOCKER_HOST: docker-in-docker
diff --git a/templates/compose/forgejo-with-runner.yaml b/templates/compose/forgejo-with-runner.yaml
index e375279be..7865e8fa4 100644
--- a/templates/compose/forgejo-with-runner.yaml
+++ b/templates/compose/forgejo-with-runner.yaml
@@ -40,7 +40,10 @@ services:
     privileged: true
     restart: 'unless-stopped'
     healthcheck:
-      disable: true
+      test: ["CMD", "nc", "-z", "127.0.0.1", "2376"]
+      interval: 10s
+      timeout: 30s
+      retries: 10
     environment:
       DOCKER_TLS_CERTDIR: /certs
       DOCKER_HOST: docker-in-docker