diff --git a/home/.chezmoiscripts/run_after_99-finish.sh.tmpl b/home/.chezmoiscripts/run_after_99-finish.sh.tmpl
index cccde3b..bd757b7 100644
--- a/home/.chezmoiscripts/run_after_99-finish.sh.tmpl
+++ b/home/.chezmoiscripts/run_after_99-finish.sh.tmpl
@@ -1,4 +1,4 @@
-{{ template "common" }}
+{{ template "common" . -}}
 
 bot "Setup was successfully done!"
 echo "Happy Coding!"
diff --git a/home/.chezmoiscripts/run_before_00-intro.sh.tmpl b/home/.chezmoiscripts/run_before_00-intro.sh.tmpl
index cf2fa75..a98de67 100644
--- a/home/.chezmoiscripts/run_before_00-intro.sh.tmpl
+++ b/home/.chezmoiscripts/run_before_00-intro.sh.tmpl
@@ -1,5 +1,5 @@
 {{ if eq .environment "dev" -}}
-{{ template "common" }}
+{{ template "common" . -}}
 {{ template "dotfile" }}
 
 bot "This script will guide you through the dofiles setup as well as installing required system packages."
diff --git a/home/.chezmoiscripts/run_once_after_01-tmux-conf.sh.tmpl b/home/.chezmoiscripts/run_once_after_01-tmux-conf.sh.tmpl
index 6bb96fb..6e3d7e3 100644
--- a/home/.chezmoiscripts/run_once_after_01-tmux-conf.sh.tmpl
+++ b/home/.chezmoiscripts/run_once_after_01-tmux-conf.sh.tmpl
@@ -1,4 +1,4 @@
-{{ template "common" }}
+{{ template "common" . -}}
 
 bot "Configuring tmux"
 echo
diff --git a/home/.chezmoiscripts/run_once_after_02-asdf-install.sh.tmpl b/home/.chezmoiscripts/run_once_after_02-asdf-install.sh.tmpl
index 6e8d2d3..f98ea0e 100644
--- a/home/.chezmoiscripts/run_once_after_02-asdf-install.sh.tmpl
+++ b/home/.chezmoiscripts/run_once_after_02-asdf-install.sh.tmpl
@@ -1,4 +1,4 @@
-{{ template "common" }}
+{{ template "common" . -}}
 
 install_asdf() {
   bot "Checking asdf..."
diff --git a/home/.chezmoiscripts/run_once_after_03-docker-setup.sh.tmpl b/home/.chezmoiscripts/run_once_after_03-docker-setup.sh.tmpl
index 7b9cbee..ad770c1 100644
--- a/home/.chezmoiscripts/run_once_after_03-docker-setup.sh.tmpl
+++ b/home/.chezmoiscripts/run_once_after_03-docker-setup.sh.tmpl
@@ -1,4 +1,4 @@
-{{ template "common" }}
+{{ template "common" . -}}
 
 bot "Docker"
 echo
diff --git a/home/.chezmoiscripts/run_once_after_04-ssh-keys.sh.tmpl b/home/.chezmoiscripts/run_once_after_04-ssh-keys.sh.tmpl
index 0470bf0..d8e1bc3 100644
--- a/home/.chezmoiscripts/run_once_after_04-ssh-keys.sh.tmpl
+++ b/home/.chezmoiscripts/run_once_after_04-ssh-keys.sh.tmpl
@@ -1,5 +1,5 @@
 {{ if eq .environment "dev" -}}
-{{ template "common" }}
+{{ template "common" . -}}
 
 set_ssh_keys() {
   bot "Checking ssh keys..."
diff --git a/home/.chezmoiscripts/run_once_after_06_1password-setup.sh.tmpl b/home/.chezmoiscripts/run_once_after_06_1password-setup.sh.tmpl
index ca94ce0..ce59eea 100644
--- a/home/.chezmoiscripts/run_once_after_06_1password-setup.sh.tmpl
+++ b/home/.chezmoiscripts/run_once_after_06_1password-setup.sh.tmpl
@@ -1,6 +1,6 @@
 {{ if eq .chezmoi.os "linux" -}}
 
-{{ template "common" }}
+{{ template "common" . -}}
 
 bot "Checking 1password..."
 echo
diff --git a/home/.chezmoiscripts/run_once_after_07_vscode-setup.sh.tmpl b/home/.chezmoiscripts/run_once_after_07_vscode-setup.sh.tmpl
index 60345b2..3b2f277 100644
--- a/home/.chezmoiscripts/run_once_after_07_vscode-setup.sh.tmpl
+++ b/home/.chezmoiscripts/run_once_after_07_vscode-setup.sh.tmpl
@@ -1,6 +1,6 @@
 {{ if eq .chezmoi.os "linux" -}}
 
-{{ template "common" }}
+{{ template "common" . -}}
 
 bot "Checking VSCode..."
 echo
diff --git a/home/.chezmoiscripts/run_once_after_08-starship-setup.sh.tmpl b/home/.chezmoiscripts/run_once_after_08-starship-setup.sh.tmpl
index b0fbde2..1750be7 100644
--- a/home/.chezmoiscripts/run_once_after_08-starship-setup.sh.tmpl
+++ b/home/.chezmoiscripts/run_once_after_08-starship-setup.sh.tmpl
@@ -1,6 +1,6 @@
 {{ if eq .chezmoi.os "linux" -}}
 
-{{ template "common" }}
+{{ template "common" . -}}
 
 bot "Checking starship prompt..."
 if ! _exists starship ; then
diff --git a/home/.chezmoiscripts/run_once_after_09-font-fira-code-setup.sh.tmpl b/home/.chezmoiscripts/run_once_after_09-font-fira-code-setup.sh.tmpl
index 60c9f44..1ffd0c4 100644
--- a/home/.chezmoiscripts/run_once_after_09-font-fira-code-setup.sh.tmpl
+++ b/home/.chezmoiscripts/run_once_after_09-font-fira-code-setup.sh.tmpl
@@ -1,6 +1,6 @@
 {{ if eq .chezmoi.os "linux" -}}
 
-{{ template "common" }}
+{{ template "common" . -}}
 
 bot "Fira Code setup."
 
diff --git a/home/.chezmoiscripts/run_once_after_10-gh-cli-setup.sh.tmpl b/home/.chezmoiscripts/run_once_after_10-gh-cli-setup.sh.tmpl
index 3f25146..b3e0298 100644
--- a/home/.chezmoiscripts/run_once_after_10-gh-cli-setup.sh.tmpl
+++ b/home/.chezmoiscripts/run_once_after_10-gh-cli-setup.sh.tmpl
@@ -1,6 +1,6 @@
 {{ if eq .chezmoi.os "linux" -}}
 
-{{ template "common" }}
+{{ template "common" . -}}
 
 bot "Checking GitHub CLI..."
 echo
diff --git a/home/.chezmoiscripts/run_once_after_11_eza-setup.sh.tmpl b/home/.chezmoiscripts/run_once_after_11_eza-setup.sh.tmpl
index b51ea46..2750ded 100644
--- a/home/.chezmoiscripts/run_once_after_11_eza-setup.sh.tmpl
+++ b/home/.chezmoiscripts/run_once_after_11_eza-setup.sh.tmpl
@@ -1,6 +1,6 @@
 {{ if eq .chezmoi.os "linux" -}}
 
-{{ template "common" }}
+{{ template "common" . -}}
 
 bot "Checking eza..."
 echo
diff --git a/home/.chezmoiscripts/run_once_after_98-darwin-add-fish-to-shells.sh.tmpl b/home/.chezmoiscripts/run_once_after_98-darwin-add-fish-to-shells.sh.tmpl
index 0517e72..f0b133e 100644
--- a/home/.chezmoiscripts/run_once_after_98-darwin-add-fish-to-shells.sh.tmpl
+++ b/home/.chezmoiscripts/run_once_after_98-darwin-add-fish-to-shells.sh.tmpl
@@ -1,6 +1,6 @@
 {{ if eq .osid "darwin" -}}
 
-{{ template "common" }}
+{{ template "common" . -}}
 
 if ! grep fish /etc/shells > /dev/null 2>&1; then
   if sudo sh -c 'echo /opt/homebrew/bin/fish >> /etc/shells'; then
diff --git a/home/.chezmoiscripts/run_once_before_01-install-homebrew.sh.tmpl b/home/.chezmoiscripts/run_once_before_01-install-homebrew.sh.tmpl
index 4303ca0..d906923 100644
--- a/home/.chezmoiscripts/run_once_before_01-install-homebrew.sh.tmpl
+++ b/home/.chezmoiscripts/run_once_before_01-install-homebrew.sh.tmpl
@@ -1,6 +1,6 @@
 {{ if eq .osid "darwin" -}}
 
-{{ template "common" }}
+{{ template "common" . -}}
 {{ template "passwordless_sudo" }}
 
 bot "Checking brew..."
diff --git a/home/.chezmoiscripts/run_onchange_darwin-install-packages.sh.tmpl b/home/.chezmoiscripts/run_onchange_darwin-install-packages.sh.tmpl
index 34908bb..1ca308d 100644
--- a/home/.chezmoiscripts/run_onchange_darwin-install-packages.sh.tmpl
+++ b/home/.chezmoiscripts/run_onchange_darwin-install-packages.sh.tmpl
@@ -1,6 +1,6 @@
 {{ if eq .osid "darwin" -}}
 
-{{ template "common" }}
+{{ template "common" . -}}
 
 brew update
 brew bundle --no-lock --file=/dev/stdin <<EOF
diff --git a/home/.chezmoitemplates/passwordless_sudo b/home/.chezmoitemplates/passwordless_sudo
index 1ee93af..f34ab80 100644
--- a/home/.chezmoitemplates/passwordless_sudo
+++ b/home/.chezmoitemplates/passwordless_sudo
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-{{ template "common" }}
+{{ template "common" . -}}
 
 
 if [[ ! "$LOGNAME" =~ ^[a-zA-Z0-9][a-zA-Z0-9_-]*$ ]]; then