diff --git a/dotfiles/.local/share/chezmoi/dot_cache/zsh/.gitkeep b/dotfiles/.local/share/chezmoi/dot_cache/zsh/.gitkeep
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/dotfiles/.local/share/chezmoi/dot_cache/zsh/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/dotfiles/.local/share/chezmoi/dot_zshrc.tmpl b/dotfiles/.local/share/chezmoi/dot_zshrc.tmpl.sh
similarity index 98%
rename from dotfiles/.local/share/chezmoi/dot_zshrc.tmpl
rename to dotfiles/.local/share/chezmoi/dot_zshrc.tmpl.sh
index 5f81df55..6312f1c3 100644
--- a/dotfiles/.local/share/chezmoi/dot_zshrc.tmpl
+++ b/dotfiles/.local/share/chezmoi/dot_zshrc.tmpl.sh
@@ -51,8 +51,9 @@ setopt SHARE_HISTORY
 
 # ZSH completion system
 autoload -Uz compinit
-compinit -d ~/.cache/zcompdump
+compinit -d "$XDG_CACHE_HOME/zsh/zcompdump-$ZSH_VERSION"
 zstyle ':completion:*:*:*:*:*' menu select
+zstyle ':completion:*' cache-path "$XDG_CACHE_HOME/zsh/zcompcache"
 zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}'
 zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}"
 zstyle ':completion:*' auto-description 'specify: %d'