diff --git a/.config/nvim/installer.sh b/.config/nvim/installer.sh
index 4ffcfea..67f594b 100755
--- a/.config/nvim/installer.sh
+++ b/.config/nvim/installer.sh
@@ -93,6 +93,10 @@ function install_meraki_ansible() {
     pip3 install meraki --user --force
 }
 
+function install_azure_cli() {
+    pip3 install azure-cli --user --pre --force
+}
+
 function main() {
     command_start update_pip
     command_start install_pyright
@@ -103,6 +107,7 @@ function main() {
     command_start install_shellcheck
     command_start install_gopls
     command_start install_terraform
+    command_start install_azure_cli
     command_start install_black
     command_start install_ansible
     command_start install_meraki_ansible
diff --git a/.zshrc b/.zshrc
index 5acce64..9f5434c 100644
--- a/.zshrc
+++ b/.zshrc
@@ -32,11 +32,20 @@ plugins=(rake ruby vagrant knife knife_ssh kitchen )
 ZSH_DISABLE_COMPFIX=true
 source $ZSH/oh-my-zsh.sh
 
-[ ! -d $CONFIG/zsh/aws ] && { mkdir -p $CONFIG/zsh/aws ; cd $CONFIG/zsh ; git clone https://github.com/popstas/zsh-command-time.git ; git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ; git clone https://github.com/zsh-users/zsh-autosuggestions.git ; curl https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/plugins/aws/aws.plugin.zsh -o $CONFIG/zsh/aws/aws.plugin.zsh }
 [ -d $CONFIG/zsh ] && source $CONFIG/zsh/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh &>> /dev/null
 [ -d $CONFIG/zsh ] && source $CONFIG/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh &>> /dev/null
 [ -d $CONFIG/zsh ] && source $CONFIG/zsh/zsh-command-time/command-time.plugin.zsh &>> /dev/null
 [ -d $CONFIG/zsh ] && source $CONFIG/zsh/aws/aws.plugin.zsh &>> /dev/null
+if [ ! -d $CONFIG/zsh/aws ]; then
+    mkdir -p $CONFIG/zsh/aws
+    mkdir -p $CONFIG/zsh/azure-cli
+    cd $CONFIG/zsh
+    git clone https://github.com/popstas/zsh-command-time.git
+    git clone https://github.com/zsh-users/zsh-syntax-highlighting.git
+    git clone https://github.com/zsh-users/zsh-autosuggestions.git
+    curl https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/plugins/aws/aws.plugin.zsh -o $CONFIG/zsh/aws/aws.plugin.zsh
+    curl https://raw.githubusercontent.com/Azure/azure-cli/dev/az.completion -o $CONFIG/zsh/azure-cli/az.completion
+fi
 [ -f $HOME/.password ] && source $HOME/.password
 [ ! -d $CONFIG/fzf ] && git clone https://github.com/junegunn/fzf.git $HOME/.config/fzf
 [ -f $CONFIG/fzf/shell/key-bindings.zsh ] && source $HOME/.config/fzf/shell/key-bindings.zsh