diff --git a/configure.sh b/configure.sh
index 27f6c7e..30f4b61 100755
--- a/configure.sh
+++ b/configure.sh
@@ -42,7 +42,11 @@ APT::Install-Suggests "0";" | tee /etc/apt/apt.conf.d/01norecommend >/dev/null
 
     cp "$AWD/assets/usr/local/share/ca-certificates/TINK-CA.crt" /usr/local/share/ca-certificates
     /usr/sbin/update-ca-certificates
+
     sed -i "s|/bin/bash|/usr/bin/zsh|g" /etc/passwd
+    git -C /tmp clone https://git.tink.ltd:8443/tink/zsh-completions.git
+    cp /tmp/zsh-completions/src/* /usr/local/share/zsh/site-functions/
+    rm /tmp/zsh-completions -r
 
     cp "$AWD/assets/etc/security/limits.d/00-default.conf" /etc/security/limits.d/00-default.conf
     cp "$AWD/assets/etc/sysctl.d/zz-tweak.conf" /etc/sysctl.d/zz-tweak.conf