diff --git a/otc/central-forgejo.think-ahead.cloud/stacks/core/forgejo/values.yaml b/otc/central-forgejo.think-ahead.cloud/stacks/core/forgejo/values.yaml
index ee82eb0..2ed5e32 100644
--- a/otc/central-forgejo.think-ahead.cloud/stacks/core/forgejo/values.yaml
+++ b/otc/central-forgejo.think-ahead.cloud/stacks/core/forgejo/values.yaml
@@ -2,7 +2,14 @@ redis-cluster:
   enabled: false
 
 redis:
+  # TODO: This should be false, but doing so breaks the helm generation of the app.ini file.
   enabled: false
+  # TODO: BUG in Forgejo inits scripts when master count is zero. But it should be zero to not start an unused redis instance
+  # inside the cluster. 
+  # Wait for redis to become avialable...
+  # nc: bad address 'forgejo-redis-headless.gitea.svc.cluster.local'
+  #master:
+  #  count: 1
 
 postgresql:
   enabled: false
@@ -47,6 +54,7 @@ gitea:
 
   admin:
     existingSecret: gitea-credential
+
   config:
     storage:
       MINIO_ENDPOINT: obs.eu-de.otc.t-systems.com:443
@@ -57,8 +65,10 @@ gitea:
 
     queue:
       TYPE: redis
+
     session:
       PROVIDER: redis
+
     cache:
       ENABLED: true
       ADAPTER: redis
@@ -74,12 +84,12 @@ gitea:
       DB_TYPE: sqlite3
 
     server:
-      DOMAIN: '{{{ .Env.DOMAIN_GITEA }}}'
-      ROOT_URL: 'https://{{{ .Env.DOMAIN_GITEA }}}:443'
+      DOMAIN: 'gitea.central-forgejo.think-ahead.cloud'
+      ROOT_URL: 'https://gitea.central-forgejo.think-ahead.cloud:443'
 
     mailer:
       ENABLED: true
-      FROM: forgejo@{{{ .Env.DOMAIN_GITEA }}}
+      FROM: forgejo@gitea.central-forgejo.think-ahead.cloud
       PROTOCOL: smtp
       SMTP_ADDR: mailhog.mailhog.svc.cluster.local
       SMTP_PORT: 1025