diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc
index dcf9db7f..76c30593 100644
--- a/dotfiles/.bashrc
+++ b/dotfiles/.bashrc
@@ -70,4 +70,9 @@ if [ "$0" = 'bash' ] || [ "$0" = '/bin/bash' ]; then
   if [ -f "$HOME/.fig/shell/bashrc.post.bash" ]; then
     . "$HOME/.fig/shell/bashrc.post.bash"
   fi
+
+  ### Vault
+  if command -v vault > /dev/null; then
+    complete -C vault vault
+  fi
 fi
diff --git a/dotfiles/.local/share/bash-completion/generate.sh b/dotfiles/.local/share/bash-completion/generate.sh
index 731d5169..da4ecdf7 100644
--- a/dotfiles/.local/share/bash-completion/generate.sh
+++ b/dotfiles/.local/share/bash-completion/generate.sh
@@ -86,6 +86,8 @@ fi
 ### wp-cli (only bash available)
 if command -v wp > /dev/null && [ -f /usr/local/src/wp-cli/wp-completion.bash ]; then
   cp /usr/local/src/wp-cli/wp-completion.bash "$HOME/.local/share/bash-completion/completions/wp.bash"
+elif command -v wp > /dev/null; then
+  curl -sSL https://raw.githubusercontent.com/wp-cli/wp-cli/v2.7.1/utils/wp-completion.bash > "$HOME/.local/share/bash-completion/completions/wp.bash"
 fi
 
 ### zoxide
diff --git a/dotfiles/.zshrc b/dotfiles/.zshrc
index 3767619d..49702e4f 100644
--- a/dotfiles/.zshrc
+++ b/dotfiles/.zshrc
@@ -259,26 +259,60 @@ if [ -f "$HOME/.local/antigen.zsh" ]; then
 fi
 if command -v antigen > /dev/null; then
   antigen use oh-my-zsh
+  antigen bundle adb
   antigen bundle colored-man-pages
   antigen bundle command-not-found
   antigen bundle copyfile
   antigen bundle copybuffer
+  antigen bundle cp
+  antigen bundle deno
+  antigen bundle docker
+  antigen bundle docker-compose
   antigen bundle encode64
+  antigen bundle fd
+  antigen bundle gem
+  antigen bundle gh
   antigen bundle git-auto-fetch
+  antigen bundle gradle
   antigen bundle gnu-utils
+  antigen bundle helm
+  antigen bundle heroku
+  antigen bundle ionic
+  # antigen bundle keychain
+  antigen bundle kubectl
+  antigen bundle kubectx
   antigen bundle macos
   antigen bundle magic-enter
+  antigen bundle microk8s
+  antigen bundle minikube
+  antigen bundle multipass
+  antigen bundle ng
+  antigen bundle nomad
+  antigen bundle npm
+  antigen bundle pip
+  antigen bundle pm2
+  antigen bundle poetry
+  antigen bundle redis-cli
+  antigen bundle ripgrep
+  antigen bundle rust
   antigen bundle safe-paste
+  antigen bundle salt
   # antigen bundle shell-proxy
   # antigen bundle ssh-agent
   antigen bundle sudo
+  antigen bundle terraform
+  antigen bundle ufw
   antigen bundle vagrant
+  antigen bundle volta
+  # antigen bundle web-search
+  antigen bundle yarn
+  antigen bundle zsh-interactive-cd
+  # antigen bundle zsh-navigation-tools
   antigen bundle zsh-users/zsh-completions src
   antigen bundle zsh-users/zsh-autosuggestions
   antigen bundle zsh-users/zsh-syntax-highlighting
   antigen bundle marlonrichert/zsh-autocomplete@main
   antigen theme romkatv/powerlevel10k
-  antigen bundle npm
   antigen apply
 fi
 
@@ -330,3 +364,11 @@ fi
 if [ -f ~/.local/p10k.zsh ]; then
 	source ~/.local/p10k.zsh
 fi
+
+### Bash Completions
+autoload -U +X bashcompinit && bashcompinit
+
+### HashiCorp Vault
+if command -v vault > /dev/null; then
+	complete -o nospace -C vault vault
+fi