diff --git a/helmfile.d/kueue.yaml.gotmpl b/helmfile.d/kueue.yaml.gotmpl
index 3ffe53ae..57f781b7 100644
--- a/helmfile.d/kueue.yaml.gotmpl
+++ b/helmfile.d/kueue.yaml.gotmpl
@@ -13,7 +13,7 @@ releases:
   values:
   - ../values/kueue/values/values.yaml
   - ../values/kueue/values/values-{{ .Environment.Name }}.yaml
-  - ../values/kueue/values/values-{{ .Environment.Name }}-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
+  - ../values/kueue/values/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
   postRenderer: ../bin/kustomizer
   postRendererArgs:
   - ../values/kueue/kustomize/{{ .Environment.Name }}
diff --git a/values/kueue/values/values-prod-ekman.yaml b/values/kueue/values/values-ekman.yaml
similarity index 100%
rename from values/kueue/values/values-prod-ekman.yaml
rename to values/kueue/values/values-ekman.yaml
diff --git a/values/kueue/values/values-prod-rossby.yaml b/values/kueue/values/values-rossby.yaml
similarity index 100%
rename from values/kueue/values/values-prod-rossby.yaml
rename to values/kueue/values/values-rossby.yaml