diff --git a/helmfile/environments/default.yaml.gotmpl b/helmfile/environments/default.yaml.gotmpl
index ff14844..b51a5f7 100644
--- a/helmfile/environments/default.yaml.gotmpl
+++ b/helmfile/environments/default.yaml.gotmpl
@@ -4,3 +4,4 @@
 domain: staging.ocelot-social.roschaefer.de
 namespace: ocelot-staging
 image_tag: {{ env "IMAGE_TAG" | default (printf "ocelot-%s--branded-%s" $ocelot_image_tag $branded_image_tag) }}
+github_repository: ocelot-social-community/stage.ocelot.social
diff --git a/helmfile/values/ocelot.yaml.gotmpl b/helmfile/values/ocelot.yaml.gotmpl
index 3d4e796..95c8bc9 100644
--- a/helmfile/values/ocelot.yaml.gotmpl
+++ b/helmfile/values/ocelot.yaml.gotmpl
@@ -1,8 +1,5 @@
 domain: {{ .StateValues.domain }}
 
-cert_manager:
-  issuer: reformer-network-letsencrypt-prod
-
 cert_manager:
   issuer: {{ .Release.Name }}-letsencrypt-prod
 
@@ -10,12 +7,12 @@ underMaintenance: false
 
 global:
   image:
+    tag: {{ .StateValues.image_tag }}
     pullPolicy: Always
 
 backend:
   image:
-    repository: ghcr.io/ocelot-social-community/stage.ocelot.social/backend
-    tag: {{ .StateValues.image_tag }}
+    repository:  ghcr.io/{{ .StateValues.github_repository | lower }}/backend
   storage: "10Gi"
   env:
     PRODUCTION_DB_CLEAN_ALLOW: "true"
@@ -25,13 +22,11 @@ backend:
 
 webapp:
   image:
-    repository: ghcr.io/ocelot-social-community/stage.ocelot.social/webapp
-    tag: {{ .StateValues.image_tag }}
+    repository: ghcr.io/{{ .StateValues.github_repository | lower }}/webapp
 
 maintenance:
   image:
-    repository: ghcr.io/ocelot-social-community/stage.ocelot.social/maintenance
-    tag: {{ .StateValues.image_tag }}
+    repository: ghcr.io/{{ .StateValues.github_repository | lower }}/maintenance
 
 neo4j:
   image: