diff --git a/.chezmoi.toml.tmpl b/.chezmoi.toml.tmpl
index 7bc08d1..f93afe6 100644
--- a/.chezmoi.toml.tmpl
+++ b/.chezmoi.toml.tmpl
@@ -2,9 +2,9 @@ encryption = "age"
 
 [age]
     {{ if eq .chezmoi.osRelease.id "nixos" }}
-    identity = "{{ .vars.nixosAgeKeyPath }}"
+    identity = "{{ .nixosAgeKeyPath }}"
     {{ else }}
-    identity = "{{ .vars.defaultAgeKeyPath }}"
+    identity = "{{ .defaultAgeKeyPath }}"
     {{ end }}
     recipient = "age1tl5hp6v0t38fl8gxuqds40z503mwz885ev22au4jdy5r24aak3zsza23sx"
 
diff --git a/.chezmoiscripts/run_onchange_before_11-setup-age-key.sh.tmpl b/.chezmoiscripts/run_onchange_before_11-setup-age-key.sh.tmpl
index 69f0ddb..9736e07 100755
--- a/.chezmoiscripts/run_onchange_before_11-setup-age-key.sh.tmpl
+++ b/.chezmoiscripts/run_onchange_before_11-setup-age-key.sh.tmpl
@@ -7,10 +7,10 @@ set -euo pipefail
 
 echo "Setting up age key..."
 
-KEY_FILE="{{ .vars.defaultAgeKeyPath }}"
+KEY_FILE="{{ .defaultAgeKeyPath }}"
 KEY_DIR="$(dirname "$KEY_FILE")"
 
-{{ if .vars.skipCreatingAgeKey }}
+{{ if .skipCreatingAgeKey }}
 echo "Expecting age key to be at $KEY_FILE"
 exit 0
 {{ end }}