diff --git a/helmfile.d/headscale.yaml.gotmpl b/helmfile.d/headscale.yaml.gotmpl
index 3d6a32a5..b59bc78e 100644
--- a/helmfile.d/headscale.yaml.gotmpl
+++ b/helmfile.d/headscale.yaml.gotmpl
@@ -9,6 +9,17 @@ commonLabels:
   tier: system
 
 releases:
+- name: headscale
+  namespace: headscale
+  chart: headscale/headscale
+  condition: headscale.enabled
+  values:
+  - ../values/headscale/values/values.yaml
+  - ../values/headscale/values/values-{{ .Environment.Name }}.yaml
+  postRenderer: ../bin/kustomizer
+  postRendererArgs:
+  - ../values/headscale/kustomize/{{ .Environment.Name }}
+  missingFileHandler: Info
 - name: manifests
   namespace: headscale-system
   chart: manifests
diff --git a/values/headscale/manifests/headscale.yaml b/values/headscale/manifests/headscale.yaml
index de0b40cc..9b6ff829 100644
--- a/values/headscale/manifests/headscale.yaml
+++ b/values/headscale/manifests/headscale.yaml
@@ -25,15 +25,6 @@ spec:
         value: default
       - name: HELMFILE_FILE_PATH
         value: headscale.yaml.gotmpl
-  - repoURL: https://charts.gabe565.com
-    targetRevision: 0.16.0
-    chart: headscale
-    helm:
-      valueFiles:
-        - $values/values/headscale/values/values.yaml
-  - repoURL: {{ .Values.clusterConfig.manifests }}
-    targetRevision: main
-    ref: values
   project: sys
   syncPolicy:
     managedNamespaceMetadata: