diff --git a/templates/compose/forgejo-with-mariadb.yaml b/templates/compose/forgejo-with-mariadb.yaml
index 00ceb350d..1296ff515 100644
--- a/templates/compose/forgejo-with-mariadb.yaml
+++ b/templates/compose/forgejo-with-mariadb.yaml
@@ -10,7 +10,7 @@ services:
     image: codeberg.org/forgejo/forgejo:8
     environment:
       - SERVICE_URL_FORGEJO_3000
-      - FORGEJO__server__ROOT_URL=${SERVICE_URL_FORGEJO_3000}
+      - FORGEJO__server__ROOT_URL=${SERVICE_URL_FORGEJO}
       - FORGEJO__migrations__ALLOWED_DOMAINS=${FORGEJO__migrations__ALLOWED_DOMAINS}
       - FORGEJO__migrations__ALLOW_LOCALNETWORKS=${FORGEJO__migrations__ALLOW_LOCALNETWORKS-false}
       - USER_UID=1000
diff --git a/templates/compose/forgejo-with-mysql.yaml b/templates/compose/forgejo-with-mysql.yaml
index e7b677cbb..c0a770b21 100644
--- a/templates/compose/forgejo-with-mysql.yaml
+++ b/templates/compose/forgejo-with-mysql.yaml
@@ -10,7 +10,7 @@ services:
     image: codeberg.org/forgejo/forgejo:8
     environment:
       - SERVICE_URL_FORGEJO_3000
-      - FORGEJO__server__ROOT_URL=${SERVICE_URL_FORGEJO_3000}
+      - FORGEJO__server__ROOT_URL=${SERVICE_URL_FORGEJO}
       - FORGEJO__migrations__ALLOWED_DOMAINS=${FORGEJO__migrations__ALLOWED_DOMAINS}
       - FORGEJO__migrations__ALLOW_LOCALNETWORKS=${FORGEJO__migrations__ALLOW_LOCALNETWORKS-false}
       - USER_UID=1000
diff --git a/templates/compose/forgejo-with-postgresql.yaml b/templates/compose/forgejo-with-postgresql.yaml
index 6011711a8..5fdf9bba4 100644
--- a/templates/compose/forgejo-with-postgresql.yaml
+++ b/templates/compose/forgejo-with-postgresql.yaml
@@ -10,7 +10,7 @@ services:
     image: codeberg.org/forgejo/forgejo:8
     environment:
       - SERVICE_URL_FORGEJO_3000
-      - FORGEJO__server__ROOT_URL=${SERVICE_URL_FORGEJO_3000}
+      - FORGEJO__server__ROOT_URL=${SERVICE_URL_FORGEJO}
       - FORGEJO__migrations__ALLOWED_DOMAINS=${FORGEJO__migrations__ALLOWED_DOMAINS}
       - FORGEJO__migrations__ALLOW_LOCALNETWORKS=${FORGEJO__migrations__ALLOW_LOCALNETWORKS-false}
       - USER_UID=1000
diff --git a/templates/compose/forgejo-with-runner-with-mariadb.yaml b/templates/compose/forgejo-with-runner-with-mariadb.yaml
index bcbdfc6f8..a0a8a412e 100644
--- a/templates/compose/forgejo-with-runner-with-mariadb.yaml
+++ b/templates/compose/forgejo-with-runner-with-mariadb.yaml
@@ -11,7 +11,7 @@ services:
     image: codeberg.org/forgejo/forgejo:8
     environment:
       - SERVICE_URL_FORGEJO_3000
-      - FORGEJO__server__ROOT_URL=${SERVICE_URL_FORGEJO_3000}
+      - FORGEJO__server__ROOT_URL=${SERVICE_URL_FORGEJO}
       - FORGEJO__migrations__ALLOWED_DOMAINS=${FORGEJO__migrations__ALLOWED_DOMAINS}
       - FORGEJO__migrations__ALLOW_LOCALNETWORKS=${FORGEJO__migrations__ALLOW_LOCALNETWORKS-false}
       - USER_UID=1000
diff --git a/templates/compose/forgejo-with-runner-with-mysql.yaml b/templates/compose/forgejo-with-runner-with-mysql.yaml
index a096f3563..54e664794 100644
--- a/templates/compose/forgejo-with-runner-with-mysql.yaml
+++ b/templates/compose/forgejo-with-runner-with-mysql.yaml
@@ -11,7 +11,7 @@ services:
     image: codeberg.org/forgejo/forgejo:8
     environment:
       - SERVICE_URL_FORGEJO_3000
-      - FORGEJO__server__ROOT_URL=${SERVICE_URL_FORGEJO_3000}
+      - FORGEJO__server__ROOT_URL=${SERVICE_URL_FORGEJO}
       - FORGEJO__migrations__ALLOWED_DOMAINS=${FORGEJO__migrations__ALLOWED_DOMAINS}
       - FORGEJO__migrations__ALLOW_LOCALNETWORKS=${FORGEJO__migrations__ALLOW_LOCALNETWORKS-false}
       - USER_UID=1000
diff --git a/templates/compose/forgejo-with-runner-with-postgresql.yaml b/templates/compose/forgejo-with-runner-with-postgresql.yaml
index 2139ed3af..d9a770c53 100644
--- a/templates/compose/forgejo-with-runner-with-postgresql.yaml
+++ b/templates/compose/forgejo-with-runner-with-postgresql.yaml
@@ -11,7 +11,7 @@ services:
     image: codeberg.org/forgejo/forgejo:8
     environment:
       - SERVICE_URL_FORGEJO_3000
-      - FORGEJO__server__ROOT_URL=${SERVICE_URL_FORGEJO_3000}
+      - FORGEJO__server__ROOT_URL=${SERVICE_URL_FORGEJO}
       - FORGEJO__migrations__ALLOWED_DOMAINS=${FORGEJO__migrations__ALLOWED_DOMAINS}
       - FORGEJO__migrations__ALLOW_LOCALNETWORKS=${FORGEJO__migrations__ALLOW_LOCALNETWORKS-false}
       - USER_UID=1000
diff --git a/templates/compose/forgejo-with-runner.yaml b/templates/compose/forgejo-with-runner.yaml
index 1a35cd6b4..68331b7db 100644
--- a/templates/compose/forgejo-with-runner.yaml
+++ b/templates/compose/forgejo-with-runner.yaml
@@ -11,7 +11,7 @@ services:
     image: codeberg.org/forgejo/forgejo:8
     environment:
       - SERVICE_URL_FORGEJO_3000
-      - FORGEJO__server__ROOT_URL=${SERVICE_URL_FORGEJO_3000}
+      - FORGEJO__server__ROOT_URL=${SERVICE_URL_FORGEJO}
       - FORGEJO__migrations__ALLOWED_DOMAINS=${FORGEJO__migrations__ALLOWED_DOMAINS}
       - FORGEJO__migrations__ALLOW_LOCALNETWORKS=${FORGEJO__migrations__ALLOW_LOCALNETWORKS:-false}
       - USER_UID=1000
diff --git a/templates/compose/forgejo.yaml b/templates/compose/forgejo.yaml
index 86d57ee4d..e731707b7 100644
--- a/templates/compose/forgejo.yaml
+++ b/templates/compose/forgejo.yaml
@@ -10,7 +10,7 @@ services:
     image: codeberg.org/forgejo/forgejo:8
     environment:
       - SERVICE_URL_FORGEJO_3000
-      - FORGEJO__server__ROOT_URL=${SERVICE_URL_FORGEJO_3000}
+      - FORGEJO__server__ROOT_URL=${SERVICE_URL_FORGEJO}
       - FORGEJO__migrations__ALLOWED_DOMAINS=${FORGEJO__migrations__ALLOWED_DOMAINS}
       - FORGEJO__migrations__ALLOW_LOCALNETWORKS=${FORGEJO__migrations__ALLOW_LOCALNETWORKS-false}
       - USER_UID=1000