diff --git a/templates/compose/forgejo-with-mariadb.yaml b/templates/compose/forgejo-with-mariadb.yaml
index e1d49515b..6b58b683c 100644
--- a/templates/compose/forgejo-with-mariadb.yaml
+++ b/templates/compose/forgejo-with-mariadb.yaml
@@ -7,13 +7,15 @@ services:
   forgejo:
     image: codeberg.org/forgejo/forgejo:7
     environment:
+      - SERVICE_FQDN_FORGEJO_3000
+      - FORGEJO__server__ROOT_URL=${SERVICE_FQDN_FORGEJO}
       - USER_UID=1000
       - USER_GID=1000
-      - DB_TYPE=mysql
-      - HOST=mariadb
-      - NAME=${MYSQL_DATABASE-forgejo}
-      - USER=$SERVICE_USER_MYSQL
-      - PASSWD=$SERVICE_PASSWORD_MYSQL
+      - FORGEJO__database__DB_TYPE=mysql
+      - FORGEJO__database__HOST=mariadb
+      - FORGEJO__database__NAME=${MYSQL_DATABASE-forgejo}
+      - FORGEJO__database__USER=$SERVICE_USER_MYSQL
+      - FORGEJO__database__PASSWD=$SERVICE_PASSWORD_MYSQL
     volumes:
       - forgejo-data:/data
       - forgejo-timezone:/etc/timezone:ro
diff --git a/templates/compose/forgejo-with-mysql.yaml b/templates/compose/forgejo-with-mysql.yaml
index f46b2c447..2029ba39f 100644
--- a/templates/compose/forgejo-with-mysql.yaml
+++ b/templates/compose/forgejo-with-mysql.yaml
@@ -8,13 +8,14 @@ services:
     image: codeberg.org/forgejo/forgejo:7
     environment:
       - SERVICE_FQDN_FORGEJO_3000
+      - FORGEJO__server__ROOT_URL=${SERVICE_FQDN_FORGEJO}
       - USER_UID=1000
       - USER_GID=1000
-      - DB_TYPE=mysql
-      - HOST=mysql
-      - NAME=${MYSQL_DATABASE-forgejo}
-      - USER=$SERVICE_USER_MYSQL
-      - PASSWD=$SERVICE_PASSWORD_MYSQL
+      - FORGEJO__database__DB_TYPE=mysql
+      - FORGEJO__database__HOST=mysql
+      - FORGEJO__database__NAME=${MYSQL_DATABASE-forgejo}
+      - FORGEJO__database__USER=$SERVICE_USER_MYSQL
+      - FORGEJO__database__PASSWD=$SERVICE_PASSWORD_MYSQL
     volumes:
       - forgejo-data:/data
       - forgejo-timezone:/etc/timezone:ro
diff --git a/templates/compose/forgejo-with-postgresql.yaml b/templates/compose/forgejo-with-postgresql.yaml
index 4c39fc1b9..4549ab70f 100644
--- a/templates/compose/forgejo-with-postgresql.yaml
+++ b/templates/compose/forgejo-with-postgresql.yaml
@@ -7,13 +7,15 @@ services:
   forgejo:
     image: codeberg.org/forgejo/forgejo:7
     environment:
+      - SERVICE_FQDN_FORGEJO_3000
+      - FORGEJO__server__ROOT_URL=${SERVICE_FQDN_FORGEJO}
       - USER_UID=1000
       - USER_GID=1000
-      - DB_TYPE=postgres
-      - HOST=postgresql
-      - NAME=${POSTGRESQL_DATABASE-forgejo}
-      - USER=$SERVICE_USER_POSTGRESQL
-      - PASSWD=$SERVICE_PASSWORD_POSTGRESQL
+      - FORGEJO__database__DB_TYPE=postgres
+      - FORGEJO__database__HOST=postgresql
+      - FORGEJO__database__NAME=${POSTGRESQL_DATABASE-forgejo}
+      - FORGEJO__database__USER=$SERVICE_USER_POSTGRESQL
+      - FORGEJO__database__PASSWD=$SERVICE_PASSWORD_POSTGRESQL
     volumes:
       - forgejo-data:/data
       - forgejo-timezone:/etc/timezone:ro
diff --git a/templates/compose/forgejo-with-runner-mariadb.yaml b/templates/compose/forgejo-with-runner-mariadb.yaml
index 1f4b932d1..973d5e900 100644
--- a/templates/compose/forgejo-with-runner-mariadb.yaml
+++ b/templates/compose/forgejo-with-runner-mariadb.yaml
@@ -1,6 +1,6 @@
 # documentation: https://forgejo.org/docs
 # 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
+# tags: version control, collaboration, code, hosting, lightweight, runner, mariadb, actions, cicd, ci
 # logo: svgs/forgejo.svg
 
 services:
@@ -8,14 +8,15 @@ services:
     image: codeberg.org/forgejo/forgejo:7
     environment:
       - SERVICE_FQDN_FORGEJO_3000
-      - RUNNER_SHARED_SECRET=${RUNNER_SHARED_SECRET}
+      - FORGEJO__server__ROOT_URL=${SERVICE_FQDN_FORGEJO}
       - USER_UID=1000
       - USER_GID=1000
-      - DB_TYPE=mysql
-      - HOST=mariadb
-      - NAME=${MYSQL_DATABASE-forgejo}
-      - USER=$SERVICE_USER_MYSQL
-      - PASSWD=$SERVICE_PASSWORD_MYSQL
+      - FORGEJO__database__DB_TYPE=mysql
+      - FORGEJO__database__HOST=mariadb
+      - FORGEJO__database__NAME=${MYSQL_DATABASE-forgejo}
+      - FORGEJO__database__USER=$SERVICE_USER_MYSQL
+      - FORGEJO__database__PASSWD=$SERVICE_PASSWORD_MYSQL
+      - RUNNER_SHARED_SECRET=${RUNNER_SHARED_SECRET-0000000000000000000000000000000000000000}
       - FORGEJO__repository__ENABLE_PUSH_CREATE_USER=true
       - FORGEJO__repository__DEFAULT_PUSH_CREATE_PRIVATE=false
       - FORGEJO__repository__DEFAULT_REPO_UNITS=repo.code,repo.actions
diff --git a/templates/compose/forgejo-with-runner-with-mysql.yaml b/templates/compose/forgejo-with-runner-with-mysql.yaml
index 0dd87767e..3d0cae916 100644
--- a/templates/compose/forgejo-with-runner-with-mysql.yaml
+++ b/templates/compose/forgejo-with-runner-with-mysql.yaml
@@ -1,6 +1,6 @@
 # documentation: https://forgejo.org/docs
 # 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
+# tags: version control, collaboration, code, hosting, lightweight, runner, mysql, actions, cicd, ci
 # logo: svgs/forgejo.svg
 
 services:
@@ -8,14 +8,15 @@ services:
     image: codeberg.org/forgejo/forgejo:7
     environment:
       - SERVICE_FQDN_FORGEJO_3000
-      - RUNNER_SHARED_SECRET=${RUNNER_SHARED_SECRET}
+      - FORGEJO__server__ROOT_URL=${SERVICE_FQDN_FORGEJO}
       - USER_UID=1000
       - USER_GID=1000
-      - DB_TYPE=mysql
-      - HOST=mysql
-      - NAME=${MYSQL_DATABASE-forgejo}
-      - USER=$SERVICE_USER_MYSQL
-      - PASSWD=$SERVICE_PASSWORD_MYSQL
+      - FORGEJO__database__DB_TYPE=mysql
+      - FORGEJO__database__HOST=mysql
+      - FORGEJO__database__NAME=${MYSQL_DATABASE-forgejo}
+      - FORGEJO__database__USER=$SERVICE_USER_MYSQL
+      - FORGEJO__database__PASSWD=$SERVICE_PASSWORD_MYSQL
+      - RUNNER_SHARED_SECRET=${RUNNER_SHARED_SECRET-0000000000000000000000000000000000000000}
       - FORGEJO__repository__ENABLE_PUSH_CREATE_USER=true
       - FORGEJO__repository__DEFAULT_PUSH_CREATE_PRIVATE=false
       - FORGEJO__repository__DEFAULT_REPO_UNITS=repo.code,repo.actions
diff --git a/templates/compose/forgejo-with-runner-with-postgresql.yaml b/templates/compose/forgejo-with-runner-with-postgresql.yaml
index 590ba7617..040626f9f 100644
--- a/templates/compose/forgejo-with-runner-with-postgresql.yaml
+++ b/templates/compose/forgejo-with-runner-with-postgresql.yaml
@@ -1,6 +1,6 @@
 # documentation: https://forgejo.org/docs
 # 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
+# tags: version control, collaboration, code, hosting, lightweight, runner, postresql, actions, cicd, ci
 # logo: svgs/forgejo.svg
 
 services:
@@ -8,14 +8,15 @@ services:
     image: codeberg.org/forgejo/forgejo:7
     environment:
       - SERVICE_FQDN_FORGEJO_3000
-      - RUNNER_SHARED_SECRET=${RUNNER_SHARED_SECRET}
+      - FORGEJO__server__ROOT_URL=${SERVICE_FQDN_FORGEJO}
       - USER_UID=1000
       - USER_GID=1000
-      - DB_TYPE=postgres
-      - HOST=postgresql
-      - NAME=${POSTGRESQL_DATABASE-forgejo}
-      - USER=$SERVICE_USER_POSTGRESQL
-      - PASSWD=$SERVICE_PASSWORD_POSTGRESQL
+      - FORGEJO__database__DB_TYPE=postgres
+      - FORGEJO__database__HOST=postgresql
+      - FORGEJO__database__NAME=${POSTGRESQL_DATABASE-forgejo}
+      - FORGEJO__database__USER=$SERVICE_USER_POSTGRESQL
+      - FORGEJO__database__PASSWD=$SERVICE_PASSWORD_POSTGRESQL
+      - RUNNER_SHARED_SECRET=${RUNNER_SHARED_SECRET-0000000000000000000000000000000000000000}
       - FORGEJO__repository__ENABLE_PUSH_CREATE_USER=true
       - FORGEJO__repository__DEFAULT_PUSH_CREATE_PRIVATE=false
       - FORGEJO__repository__DEFAULT_REPO_UNITS=repo.code,repo.actions
diff --git a/templates/compose/forgejo-with-runner.yaml b/templates/compose/forgejo-with-runner.yaml
index ea476efa9..e375279be 100644
--- a/templates/compose/forgejo-with-runner.yaml
+++ b/templates/compose/forgejo-with-runner.yaml
@@ -1,6 +1,6 @@
 # documentation: https://forgejo.org/docs
 # 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
+# tags: version control, collaboration, code, hosting, lightweight, runner, actions, cicd, ci
 # logo: svgs/forgejo.svg
 
 services:
@@ -8,9 +8,10 @@ services:
     image: codeberg.org/forgejo/forgejo:7
     environment:
       - SERVICE_FQDN_FORGEJO_3000
-      - RUNNER_SHARED_SECRET=${RUNNER_SHARED_SECRET}
+      - FORGEJO__server__ROOT_URL=${SERVICE_FQDN_FORGEJO}
       - USER_UID=1000
       - USER_GID=1000
+      - RUNNER_SHARED_SECRET=${RUNNER_SHARED_SECRET-0000000000000000000000000000000000000000}
       - FORGEJO__repository__ENABLE_PUSH_CREATE_USER=true
       - FORGEJO__repository__DEFAULT_PUSH_CREATE_PRIVATE=false
       - FORGEJO__repository__DEFAULT_REPO_UNITS=repo.code,repo.actions
diff --git a/templates/compose/forgejo.yaml b/templates/compose/forgejo.yaml
index fe633d609..3f13f1323 100644
--- a/templates/compose/forgejo.yaml
+++ b/templates/compose/forgejo.yaml
@@ -7,6 +7,8 @@ services:
   forgejo:
     image: codeberg.org/forgejo/forgejo:7
     environment:
+      - SERVICE_FQDN_FORGEJO_3000
+      - FORGEJO__server__ROOT_URL=${SERVICE_FQDN_FORGEJO}
       - USER_UID=1000
       - USER_GID=1000
     ports: