diff --git a/helmfile/environments/production.yaml.gotmpl b/helmfile/environments/production.yaml.gotmpl
new file mode 100644
index 0000000..46924d6
--- /dev/null
+++ b/helmfile/environments/production.yaml.gotmpl
@@ -0,0 +1,9 @@
+#{{ $branded_image_tag:= env "BRANDED_IMAGE_TAG" | default (exec "../scripts/branded_image_tag.sh" (list) | trim) }}
+#{{ $ocelot_image_tag := env "OCELOT_IMAGE_TAG" | default  (exec "../scripts/ocelot_image_tag.sh" (list) | trim) }}
+{{ $image_tag := env "IMAGE_TAG" | default  (exec "../scripts/branded_image_tag.sh" (list) | trim) }}
+
+domain: wir-social-production.ocelot-social-production.it4c.org
+namespace: wir-social-ocelot-production
+#image_tag: {{ env "IMAGE_TAG" | default (printf "ocelot-%s--branded-%s" $ocelot_image_tag $branded_image_tag) }}
+image_tag: {{ $image_tag }}
+github_repository: wir-social/wir.social
diff --git a/helmfile/environments/production.yaml.gotmpl.old b/helmfile/environments/production.yaml.gotmpl.old
deleted file mode 100644
index b9d9458..0000000
--- a/helmfile/environments/production.yaml.gotmpl.old
+++ /dev/null
@@ -1,7 +0,0 @@
-{{ $branded_image_tag:= env "BRANDED_IMAGE_TAG" | default (exec "../scripts/branded_image_tag.sh" (list) | trim) }}
-{{ $ocelot_image_tag := env "OCELOT_IMAGE_TAG" | default  (exec "../scripts/ocelot_image_tag.sh" (list) | trim) }}
-
-domain: wir-social-staging.ocelot-social.it4c.org
-namespace: wir-social-ocelot
-image_tag: {{ env "IMAGE_TAG" | default (printf "ocelot-%s--branded-%s" $ocelot_image_tag $branded_image_tag) }}
-github_repository: wir-social/wir.social
diff --git a/helmfile/helmfile.yaml.gotmpl b/helmfile/helmfile.yaml.gotmpl
index c5665d0..2db0ad5 100644
--- a/helmfile/helmfile.yaml.gotmpl
+++ b/helmfile/helmfile.yaml.gotmpl
@@ -3,6 +3,9 @@ environments:
   default:
     values:
       - ./environments/default.yaml.gotmpl
+  production:
+    values:
+      - ./environments/production.yaml.gotmpl
 ---
 repositories:
   - name: ocelot-social