diff --git a/template/stacks/forgejo/forgejo-server/values.yaml b/template/stacks/forgejo/forgejo-server/values.yaml
index e9a562c..a5a1a33 100644
--- a/template/stacks/forgejo/forgejo-server/values.yaml
+++ b/template/stacks/forgejo/forgejo-server/values.yaml
@@ -121,7 +121,10 @@ gitea:
       MINIO_ENDPOINT: obs.eu-de.otc.t-systems.com:443
       STORAGE_TYPE: minio
       MINIO_LOCATION: eu-de
-      MINIO_BUCKET: {{{ .Env.FORGEJO_BUCKET_NAME }}}
+{{{- define DEFAULT_FORGEJO_BUCKET_NAME -}}}
+  edp-forgejo-{{{.env.CLUSTER_ENVIRONMENT}}}
+{{{- end -}}}
+      MINIO_BUCKET: {{{ getenv "FORGEJO_BUCKET_NAME" {{ template "DEFAULT_FORGEJO_BUCKET_NAME" }} }}}
       MINIO_USE_SSL: true
 
     queue: