diff --git a/templates/compose/forgejo-with-runner.yaml b/templates/compose/forgejo-with-runner.yaml
index abcaa6e7e..66681810f 100644
--- a/templates/compose/forgejo-with-runner.yaml
+++ b/templates/compose/forgejo-with-runner.yaml
@@ -2,15 +2,16 @@
 # slogan: Forgejo is a self-hosted lightweight software forge. Easy to install and low maintenance, it just does the job.
 # tags: version control, collaboration, code, hosting, lightweight, runner, actions, cicd, ci
 # logo: svgs/forgejo.svg
+# port: 3000
 
 services:
   forgejo:
-    image: codeberg.org/forgejo/forgejo:7
+    image: codeberg.org/forgejo/forgejo:8
     environment:
       - SERVICE_FQDN_FORGEJO_3000
-      - FORGEJO__server__ROOT_URL=${SERVICE_FQDN_FORGEJO}
+      - FORGEJO__server__ROOT_URL=${SERVICE_FQDN_FORGEJO_3000}
       - FORGEJO__migrations__ALLOWED_DOMAINS=${FORGEJO__migrations__ALLOWED_DOMAINS}
-      - FORGEJO__migrations__ALLOW_LOCALNETWORKS=${FORGEJO__migrations__ALLOW_LOCALNETWORKS-false}
+      - FORGEJO__migrations__ALLOW_LOCALNETWORKS=${FORGEJO__migrations__ALLOW_LOCALNETWORKS:-false}
       - USER_UID=1000
       - USER_GID=1000
       - RUNNER_SHARED_SECRET=${RUNNER_SHARED_SECRET-0000000000000000000000000000000000000000}
@@ -47,8 +48,8 @@ services:
       timeout: 30s
       retries: 10
     environment:
-      DOCKER_TLS_CERTDIR: /certs
-      DOCKER_HOST: docker-in-docker
+      DOCKER_TLS_CERTDIR=/certs
+      DOCKER_HOST=docker-in-docker
     volumes:
       - forgejo-did-certs:/certs
 
@@ -102,7 +103,6 @@ services:
       - forgejo-did-certs:/certs
       - forgejo-timezone:/etc/timezone:ro
       - forgejo-localtime:/etc/localtime:ro
-    restart: 'unless-stopped'
     healthcheck:
       test: ["CMD", "pgrep", "forgejo-runner"]
       interval: 10s
@@ -111,4 +111,4 @@ services:
     command: >-
       bash -c '
       while : ; do test -w .runner && forgejo-runner --config config.yml daemon ; sleep 1 ; done
-      '
\ No newline at end of file
+      '
diff --git a/templates/compose/forgejo.yaml b/templates/compose/forgejo.yaml
index bb6846679..3e7d5647f 100644
--- a/templates/compose/forgejo.yaml
+++ b/templates/compose/forgejo.yaml
@@ -2,13 +2,14 @@
 # slogan: Forgejo is a self-hosted lightweight software forge. Easy to install and low maintenance, it just does the job.
 # tags: version control, collaboration, code, hosting, lightweight
 # logo: svgs/forgejo.svg
+# port: 3000
 
 services:
   forgejo:
-    image: codeberg.org/forgejo/forgejo:7
+    image: codeberg.org/forgejo/forgejo:8
     environment:
       - SERVICE_FQDN_FORGEJO_3000
-      - FORGEJO__server__ROOT_URL=${SERVICE_FQDN_FORGEJO}
+      - FORGEJO__server__ROOT_URL=${SERVICE_FQDN_FORGEJO_3000}
       - FORGEJO__migrations__ALLOWED_DOMAINS=${FORGEJO__migrations__ALLOWED_DOMAINS}
       - FORGEJO__migrations__ALLOW_LOCALNETWORKS=${FORGEJO__migrations__ALLOW_LOCALNETWORKS-false}
       - USER_UID=1000
@@ -23,4 +24,4 @@ services:
       test: ["CMD", "curl", "-f", "http://127.0.0.1:3000"]
       interval: 2s
       timeout: 10s
-      retries: 15
\ No newline at end of file
+      retries: 15