diff --git a/helmfile.d/headscale-router.yaml.gotmpl b/helmfile.d/headscale-router.yaml.gotmpl
index df45fee4..d10d4530 100644
--- a/helmfile.d/headscale-router.yaml.gotmpl
+++ b/helmfile.d/headscale-router.yaml.gotmpl
@@ -12,7 +12,7 @@ releases:
 - name: headscale-router
   namespace: headscale
   chart: headscale/headscale
-  condition: headscale-router.enabled
+  condition: headscale.enabled
   values:
   - ../values/headscale-router/values/values.yaml
   - ../values/headscale-router/values/values-{{ .Environment.Name }}.yaml
@@ -23,7 +23,7 @@ releases:
 - name: manifests
   namespace: headscale-system
   chart: manifests
-  condition: headscale-router.enabled
+  condition: headscale.enabled
   missingFileHandler: Info
   values:
   - ../values/env.yaml
diff --git a/values/headscale-router/env-oceanbox.yaml.gotmpl b/values/headscale-router/env-oceanbox.yaml.gotmpl
index e7ccd598..751125e4 100644
--- a/values/headscale-router/env-oceanbox.yaml.gotmpl
+++ b/values/headscale-router/env-oceanbox.yaml.gotmpl
@@ -1,3 +1,3 @@
-headscale-router:
+headscale:
   enabled: true
 
diff --git a/values/headscale-router/env.yaml.gotmpl b/values/headscale-router/env.yaml.gotmpl
index 93f0536a..5392a712 100644
--- a/values/headscale-router/env.yaml.gotmpl
+++ b/values/headscale-router/env.yaml.gotmpl
@@ -1,4 +1,4 @@
-headscale-router:
+headscale:
   enabled: false
   autosync: false
 
diff --git a/values/headscale-router/manifests/headscale-router.yaml b/values/headscale-router/manifests/headscale-router.yaml
index 9ad92e92..9ebd50a3 100644
--- a/values/headscale-router/manifests/headscale-router.yaml
+++ b/values/headscale-router/manifests/headscale-router.yaml
@@ -34,7 +34,7 @@ spec:
       - CreateNamespace=true
       - ApplyOutOfSyncOnly=true
       # - ServerSideApply=true
-    {{- if .Values.headscale-router.autosync }}
+    {{- if .Values.headscale.autosync }}
     automated:
       prune: true
       # selfHeal: false