diff --git a/universal/ubi10/Dockerfile b/universal/ubi10/Dockerfile
index 112e0c4c..d66d18a7 100644
--- a/universal/ubi10/Dockerfile
+++ b/universal/ubi10/Dockerfile
@@ -511,6 +511,28 @@ EOF
 
 ENV PATH="/usr/local/google-cloud-sdk/bin:${PATH}"
 
+## Azure CLI
+RUN <<EOF
+set -euf -o pipefail
+
+case "$TARGETARCH" in
+    amd64|arm64)
+        # Azure CLI installation for amd64 and arm64
+        rpm --import https://packages.microsoft.com/keys/microsoft.asc
+        dnf install -y https://packages.microsoft.com/config/rhel/10/packages-microsoft-prod.rpm
+        dnf install -y azure-cli
+        dnf clean all
+        rm -rf /var/cache/dnf
+        ;;
+    ppc64le)
+        echo "Skipping Azure CLI installation for unsupported architecture: $TARGETARCH"
+        ;;
+    *)
+        echo "Skipping Azure CLI installation for unsupported architecture: $TARGETARCH"
+        ;;
+esac
+EOF
+
 # e2fsprogs setup
 # Since e2fsprogs-static package has removed RHEL 8 distribution, it is not possible to install from the repository
 # https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/considerations_in_adopting_rhel_8/index#removed-packages_changes-to-packages
@@ -615,6 +637,7 @@ chmod +x /usr/local/bin/herdr
 EOF
 
 RUN <<EOF
+set -euf -o pipefail
 oc completion bash > /usr/share/bash-completion/completions/oc
 tkn completion bash > /usr/share/bash-completion/completions/tkn
 kubectl completion bash > /usr/share/bash-completion/completions/kubectl
@@ -622,6 +645,14 @@ cat ${NVM_DIR}/bash_completion > /usr/share/bash-completion/completions/nvm
 if [ -f /usr/local/google-cloud-sdk/completion.bash.inc ]; then
     cat /usr/local/google-cloud-sdk/completion.bash.inc > /usr/share/bash-completion/completions/gcloud
 fi
+if command -v az &> /dev/null; then
+    set +e
+    az completion bash > /usr/share/bash-completion/completions/az
+    if [ \$? -ne 0 ]; then
+        echo "Warning: az completion generation failed"
+    fi
+    set -e
+fi
 EOF
 
 ## Add sdkman's init script launcher to the end of ${PROFILE_EXT} since we are not adding it on sdkman install
diff --git a/universal/ubi9/Dockerfile b/universal/ubi9/Dockerfile
index 543ed9c0..126cdd18 100644
--- a/universal/ubi9/Dockerfile
+++ b/universal/ubi9/Dockerfile
@@ -478,6 +478,28 @@ EOF
 
 ENV PATH="/usr/local/google-cloud-sdk/bin:${PATH}"
 
+## Azure CLI
+RUN <<EOF
+set -euf -o pipefail
+
+case "$TARGETARCH" in
+    amd64|arm64)
+        # Azure CLI installation for amd64 and arm64
+        rpm --import https://packages.microsoft.com/keys/microsoft.asc
+        dnf install -y https://packages.microsoft.com/config/rhel/9/packages-microsoft-prod.rpm
+        dnf install -y azure-cli
+        dnf clean all
+        rm -rf /var/cache/dnf
+        ;;
+    ppc64le)
+        echo "Skipping Azure CLI installation for unsupported architecture: $TARGETARCH"
+        ;;
+    *)
+        echo "Skipping Azure CLI installation for unsupported architecture: $TARGETARCH"
+        ;;
+esac
+EOF
+
 # e2fsprogs setup
 # Since e2fsprogs-static package has removed RHEL 8 distribution, it is not possible to install from the repository
 # https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/considerations_in_adopting_rhel_8/index#removed-packages_changes-to-packages
@@ -582,6 +604,7 @@ chmod +x /usr/local/bin/herdr
 EOF
 
 RUN <<EOF
+set -euf -o pipefail
 oc completion bash > /usr/share/bash-completion/completions/oc
 tkn completion bash > /usr/share/bash-completion/completions/tkn
 kubectl completion bash > /usr/share/bash-completion/completions/kubectl
@@ -589,6 +612,14 @@ cat ${NVM_DIR}/bash_completion > /usr/share/bash-completion/completions/nvm
 if [ -f /usr/local/google-cloud-sdk/completion.bash.inc ]; then
     cat /usr/local/google-cloud-sdk/completion.bash.inc > /usr/share/bash-completion/completions/gcloud
 fi
+if command -v az &> /dev/null; then
+    set +e
+    az completion bash > /usr/share/bash-completion/completions/az
+    if [ \$? -ne 0 ]; then
+        echo "Warning: az completion generation failed"
+    fi
+    set -e
+fi
 EOF
 
 ## Add sdkman's init script launcher to the end of ${PROFILE_EXT} since we are not adding it on sdkman install