diff --git a/vscode/Dockerfile b/vscode/Dockerfile
index 7283d1c..0612d25 100755
--- a/vscode/Dockerfile
+++ b/vscode/Dockerfile
@@ -87,7 +87,7 @@ RUN \
     && ls -la /usr/local/lib/code-server/lib/vscode/extensions/ \
     \
     && curl -L -s -o /usr/bin/ha \
-        "https://github.com/home-assistant/cli/releases/download/4.21.0/ha_${BUILD_ARCH}" \
+        "https://github.com/home-assistant/cli/releases/download/4.22.0/ha_${BUILD_ARCH}" \
     && chmod a+x /usr/bin/ha \
     \
     && git clone --branch master --single-branch --depth 1 \
diff --git a/vscode/rootfs/root/.zshrc b/vscode/rootfs/root/.zshrc
index de1f56d..63fd50c 100755
--- a/vscode/rootfs/root/.zshrc
+++ b/vscode/rootfs/root/.zshrc
@@ -97,7 +97,7 @@ source $ZSH/oh-my-zsh.sh
 alias reset-settings="cp /root/.code-server/settings.json /data/vscode/User/settings.json && echo 'Setting restored!'"
 
 # Home Assistant CLI
-source <(ha completion --zsh)
+source <(ha completion zsh) && compdef _ha ha
 
 # Show motd on start
 cat /etc/motd