diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoi.yaml.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoi.yaml.tmpl
index a74273ef..f83f7346 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoi.yaml.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoi.yaml.tmpl
@@ -119,7 +119,7 @@
 {{-   writeToStdout "Chezmoi is running in headless environment.\n" -}}
 {{- end -}}
 
-encryption: gpg
+encryption: "gpg"
 gpg:
   recipient: "{{ $gpgKeyId }}"
 data:
@@ -146,7 +146,7 @@ data:
   user:
     email: "{{ $email }}"
     name: "{{ $name }}"
-    username: "{{ output "echo" "$USER" }}
+    username: "{{ output "echo" "$USER" }}"
     domain: "{{ $domain }}"
     gpg:
       id: "{{ $gpgKeyId }}"
diff --git a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_before_90-install-packages.tmpl b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_before_90-install-packages.tmpl
index 324af857..cd44184e 100644
--- a/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_before_90-install-packages.tmpl
+++ b/dotfiles/.local/share/chezmoi/home/.chezmoiscripts/_universal/run_onchange_before_90-install-packages.tmpl
@@ -4,7 +4,7 @@
 
 if command -v install-software > /dev/null; then
   logg 'Installing packages defined in .chezmoidata.yaml under the .softwareGroups key'
-  install-software {{ join (get .softwareGroups .host.softwareGroup) " " }}
+  install-software {{ join (index .softwareGroups .host.softwareGroup) " " }}
 else
   logg error '`install-software` is not in the PATH'
 fi
diff --git a/dotfiles/.local/share/chezmoi/home/dot_bashrc b/dotfiles/.local/share/chezmoi/home/dot_bashrc
index da1f50ee..0159c3a5 100644
--- a/dotfiles/.local/share/chezmoi/home/dot_bashrc
+++ b/dotfiles/.local/share/chezmoi/home/dot_bashrc
@@ -39,7 +39,7 @@ if [ "$BASH_SUPPORT" = 'true' ]; then
     ### Styled Terminal
     if command -v oh-my-posh > /dev/null; then
       # Oh My Posh (See: https://ohmyposh.dev/)
-      eval "$(oh-my-posh init bash --config "$XDG_CONFIG_HOME/oh-my-posh/Betelgeuse.omp.json)"
+      eval "$(oh-my-posh init bash --config "$XDG_CONFIG_HOME/oh-my-posh/Betelgeuse.omp.json")"
     else
       # Basic styled terminal
       case "$TERM" in