diff --git a/template/stacks/forgejo/forgejo-server/values.yaml b/template/stacks/forgejo/forgejo-server/values.yaml
index a3e12c4..6a39caa 100644
--- a/template/stacks/forgejo/forgejo-server/values.yaml
+++ b/template/stacks/forgejo/forgejo-server/values.yaml
@@ -1,3 +1,13 @@
+{{{- define "BUCKET_NAME" -}}}
+{{{- if (getenv "FORGEJO_BUCKET_NAME") -}}}
+{{{ getenv "FORGEJO_BUCKET_NAME" }}}
+{{{- else -}}}
+edp-forgejo-{{{ getenv "CLUSTER_ENVIRONMENT" }}}
+{{{- end -}}}
+{{{- end -}}}
+
+
+
 # We use recreate to make sure only one instance with one version is running, because Forgejo might break or data gets inconsistant. 
 strategy:
   type: Recreate
@@ -121,10 +131,7 @@ gitea:
       MINIO_ENDPOINT: obs.eu-de.otc.t-systems.com:443
       STORAGE_TYPE: minio
       MINIO_LOCATION: eu-de
-{{{- define "DEFAULT_FORGEJO_BUCKET_NAME" -}}}
-  edp-forgejo-{{{.env.CLUSTER_ENVIRONMENT}}}
-{{{- end -}}}
-      MINIO_BUCKET: {{{ getenv "FORGEJO_BUCKET_NAME" ( template "DEFAULT_FORGEJO_BUCKET_NAME" ) }}}
+      MINIO_BUCKET: "{{{ template "BUCKET_NAME" }}}"
       MINIO_USE_SSL: true
 
     queue: