diff --git a/vscode/rootfs/root/.zshrc b/vscode/rootfs/root/.zshrc
index 3366aec..fcd5075 100755
--- a/vscode/rootfs/root/.zshrc
+++ b/vscode/rootfs/root/.zshrc
@@ -94,8 +94,11 @@ source $ZSH/oh-my-zsh.sh
 # alias ohmyzsh="mate ~/.oh-my-zsh"
 alias reset-settings="cp /root/.code-server/settings.json /data/vscode/User/settings.json && echo 'Setting restored!'"
 
-# Home Assistant CLI
+# Home Assistant Core CLI
 eval "$(_HASS_CLI_COMPLETE=source_zsh hass-cli)"
 
+# Home Assistant CLI
+source <(ha completion --zsh)
+
 # Show motd on start
 cat /etc/motd