diff --git a/helmfile.d/codex.yaml.gotmpl b/helmfile.d/codex.yaml.gotmpl
index ff19c515..0881e830 100644
--- a/helmfile.d/codex.yaml.gotmpl
+++ b/helmfile.d/codex.yaml.gotmpl
@@ -10,21 +10,22 @@ releases:
   chart: ../charts/codex
   condition: codex.enabled
   values:
-  - ../values/codex/values/codex.yaml.gotmpl
-  - ../values/codex/values/codex-{{ .Environment.Name }}.yaml.gotmpl
+  - ../values/codex/values/values.yaml.gotmpl
+  - ../values/codex/values/values-{{ .Environment.Name }}.yaml.gotmpl
   postRenderer: ../bin/kustomizer
   postRendererArgs:
   - ../values/codex/kustomize/{{ .Environment.Name }}
   missingFileHandler: Info
-- name: codex-manifests
+- name: manifests
   namespace: {{ .Environment.Name }}-codex
-  chart: _codex-manifests
+  chart: manifests
   condition: codex.enabled
   missingFileHandler: Info
   values:
-  - ../values/values-{{ requiredEnv "CLUSTER_NAME" }}.yaml
-  - ../values/codex/values.yaml.gotmpl
-  - ../values/codex/values-{{ requiredEnv "CLUSTER_NAME" }}.yaml.gotmpl
+  - ../values/env.yaml
+  - ../values/values-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
+  - ../values/codex/env.yaml.gotmpl
+  - ../values/codex/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
   hooks:
   - events: [ prepare, cleanup ]
     showlogs: true
@@ -34,4 +35,4 @@ releases:
     - '{{`{{ .Release.Chart }}`}}'
     - '{{`{{ .Environment.Name }}`}}'
     - ../values/codex/manifests
-    - _codex-manifests
+    - manifests