diff --git a/README.md b/README.md
index 7c898615e4c..2c0b091d436 100644
--- a/README.md
+++ b/README.md
@@ -170,7 +170,7 @@ brew install $(curl -Ls -o /dev/null -w %{url_effective} https://aka.ms/InstallA
 You can install the edge build on Ubuntu Xenial with the following command:
 
 ```bash
-curl -Ls -o azure-cli_xenial_all.deb https://aka.ms/InstallAzureCliXenialEdge && dpkg -i azure-cli_xenial_all.deb
+curl -Ls -o azure-cli_xenial_$(dpkg --print-architecture).deb https://aka.ms/InstallAzureCliXenialEdge && dpkg -i azure-cli_xenial_$(dpkg --print-architecture).deb
 ```
 
 And install the edge build with rpm package on CentOS/RHEL/Fedora:
diff --git a/doc/use_cli_in_airgapped_clouds.md b/doc/use_cli_in_airgapped_clouds.md
index 9e19200265f..e843445b724 100644
--- a/doc/use_cli_in_airgapped_clouds.md
+++ b/doc/use_cli_in_airgapped_clouds.md
@@ -17,7 +17,7 @@ We are working on solutions to make the installation and upgrade of Azure CLI ea
 
 Package | Download Address | Install Command
 --- | --- | ---
-DEB | https://packages.microsoft.com/repos/azure-cli/pool/main/a/azure-cli/ | dpkg -i azure-cli_<version\>-1~<distro\>_all.deb
+DEB | https://packages.microsoft.com/repos/azure-cli/pool/main/a/azure-cli/ | dpkg -i azure-cli_<version\>-1~<distro\>_*.deb
 RPM | https://packages.microsoft.com/yumrepos/azure-cli/ | rpm -ivh --nodeps azure-cli-<version\>-*.rpm
 MSI | https://azurecliprod.blob.core.windows.net/msi/azure-cli-<version\>.msi | Start-Process msiexec.exe -Wait -ArgumentList '/I azure-cli-<version\>.msi'  
 
diff --git a/scripts/release/debian/Dockerfile b/scripts/release/debian/Dockerfile
index b044af03374..ff5ec5d1688 100644
--- a/scripts/release/debian/Dockerfile
+++ b/scripts/release/debian/Dockerfile
@@ -36,11 +36,11 @@ ARG cli_version_revision=1
 RUN mkdir -p ./debian && \
     CLI_VERSION=${cli_version} CLI_VERSION_REVISION=${cli_version_revision} ./scripts/release/debian/prepare.sh ./debian ./az.completion ./ && \
     dpkg-buildpackage -us -uc && \
-    cp /azure-cli_${cli_version}-${cli_version_revision}_all.deb /azure-cli_all.deb
+    cp /azure-cli_${cli_version}-${cli_version_revision}_*.deb /azure-cli_$(dpkg --print-architecture).deb
 
 FROM $base_image AS execution-env
 
-COPY --from=build-env /azure-cli_all.deb /azure-cli_all.deb
+COPY --from=build-env /azure-cli_*.deb /
 
-RUN dpkg -i /azure-cli_all.deb && \
-    rm /azure-cli_all.deb
+RUN dpkg -i /azure-cli_$(dpkg --print-architecture).deb && \
+    rm /azure-cli_$(dpkg --print-architecture).deb
diff --git a/scripts/release/debian/README.md b/scripts/release/debian/README.md
index 67c2a01893b..2e1af8a7ce7 100644
--- a/scripts/release/debian/README.md
+++ b/scripts/release/debian/README.md
@@ -24,7 +24,7 @@ Verification
 ------------
 
 ``` bash
-sudo dpkg -i azure-cli_${CLI_VERSION}-1_all.deb
+sudo dpkg -i azure-cli_${CLI_VERSION}-1_$(dpkg --print-architecture).deb
 az
 az --version
 ```
diff --git a/scripts/release/debian/build.sh b/scripts/release/debian/build.sh
index d7105ae10eb..994b84457c9 100755
--- a/scripts/release/debian/build.sh
+++ b/scripts/release/debian/build.sh
@@ -51,5 +51,5 @@ $SCRIPT_DIR/prepare.sh $WORKDIR/debian $WORKDIR/az.completion $WORKDIR
 cd $WORKDIR
 dpkg-buildpackage -us -uc
 
-deb_file=$WORKDIR/../azure-cli_${CLI_VERSION}-${CLI_VERSION_REVISION:=1}_all.deb
+deb_file="${WORKDIR}/../azure-cli_${CLI_VERSION}-${CLI_VERSION_REVISION:=1}_$(dpkg --print-architecture).deb"
 cp $deb_file /mnt/output/
diff --git a/scripts/release/debian/prepare.sh b/scripts/release/debian/prepare.sh
index 173aa02ba22..483d22364ac 100755
--- a/scripts/release/debian/prepare.sh
+++ b/scripts/release/debian/prepare.sh
@@ -57,7 +57,7 @@ Standards-Version: 3.9.5
 Homepage: https://github.com/azure/azure-cli
 
 Package: azure-cli
-Architecture: all
+Architecture: linux-any
 Depends: \${shlibs:Depends}, \${misc:Depends}
 Description: Azure CLI
  A great cloud needs great tools; we're excited to introduce Azure CLI,
diff --git a/scripts/release/debian/test_deb_in_docker.sh b/scripts/release/debian/test_deb_in_docker.sh
index 2809fa907f1..88d15da3e69 100644
--- a/scripts/release/debian/test_deb_in_docker.sh
+++ b/scripts/release/debian/test_deb_in_docker.sh
@@ -14,7 +14,7 @@ case ${DISTRO} in
     *)                        :;;
 esac
 
-dpkg -i /mnt/artifacts/azure-cli_$CLI_VERSION-1~${DISTRO}_all.deb
+dpkg -i /mnt/artifacts/azure-cli_$CLI_VERSION-1~${DISTRO}_$(dpkg --print-architecture).deb
 
 time az self-test
 time az --version