diff --git a/forgejo_cloudflare/docker-compose.yml b/forgejo_cloudflare/docker-compose.yml
index b8eb85b..b010673 100644
--- a/forgejo_cloudflare/docker-compose.yml
+++ b/forgejo_cloudflare/docker-compose.yml
@@ -96,6 +96,10 @@ services:
     user: 0:0
     command: >-
       bash -ec '
+      if [ -f .runner ]; then
+        echo ".runner file already exists. Exiting."
+        exit 0
+      fi
       while : ; do
         forgejo-runner create-runner-file --connect --instance http://server:3000 --name ${RUNNER_NAME} --secret ${SHARED_SECRET} && break ;
         sleep 1 ;
@@ -111,7 +115,11 @@ services:
       '      
 
   runner-daemon:
-    image: code.forgejo.org/forgejo/runner:4.0.1
+    image: code.forgejo.org/forgejo/runner:${FORGEJO_RUNNER_TAG}
+    restart: always
+    depends_on: 
+      - server
+      - runner-register
     links:
       - docker-in-docker
       - server
@@ -130,6 +138,7 @@ services:
   docker-in-docker:
     image: docker:dind
     hostname: docker  # Must set hostname as TLS certificates are only valid for docker or localhost
+    restart: always
     privileged: true
     environment:
       DOCKER_TLS_CERTDIR: /certs
diff --git a/forgejo_tailscale/docker-compose.yml b/forgejo_tailscale/docker-compose.yml
index 4335404..0fc3b78 100644
--- a/forgejo_tailscale/docker-compose.yml
+++ b/forgejo_tailscale/docker-compose.yml
@@ -91,6 +91,10 @@ services:
     user: 0:0
     command: >-
       bash -ec '
+      if [ -f .runner ]; then
+        echo ".runner file already exists. Exiting."
+        exit 0
+      fi
       while : ; do
         forgejo-runner create-runner-file --connect --instance http://server:3000 --name ${RUNNER_NAME} --secret ${SHARED_SECRET} && break ;
         sleep 1 ;
@@ -106,10 +110,14 @@ services:
       '      
 
   runner-daemon:
-    image: code.forgejo.org/forgejo/runner:4.0.1
+    image: code.forgejo.org/forgejo/runner:${FORGEJO_RUNNER_TAG}
+    restart: always
     links:
       - docker-in-docker
       - server
+    depends_on: 
+      - server
+      - runner-register
     environment:
       DOCKER_HOST: tcp://docker:2376
       DOCKER_CERT_PATH: /certs/client
@@ -126,6 +134,7 @@ services:
     image: docker:dind
     hostname: docker  # Must set hostname as TLS certificates are only valid for docker or localhost
     privileged: true
+    restart: always
     environment:
       DOCKER_TLS_CERTDIR: /certs
       DOCKER_HOST: docker-in-docker