diff --git a/scripts/ci-build-azure-ccm.sh b/scripts/ci-build-azure-ccm.sh
index 307c3be8376a..342dc48f655b 100755
--- a/scripts/ci-build-azure-ccm.sh
+++ b/scripts/ci-build-azure-ccm.sh
@@ -49,8 +49,17 @@ setup() {
 
 main() {
     if [[ "$(can_reuse_artifacts)" == "false" ]]; then
-        echo "Building Azure cloud controller manager and cloud node manager..."
-        make -C "${AZURE_CLOUD_PROVIDER_ROOT}" image push
+        echo "Building Linux Azure amd64 cloud controller and node managers"
+        make -C "${AZURE_CLOUD_PROVIDER_ROOT}" build-ccm-image-amd64 push-ccm-image-amd64
+        make -C "${AZURE_CLOUD_PROVIDER_ROOT}" build-node-image-linux-amd64 push-node-image-linux-amd64
+        if [[ -n "${TEST_WINDOWS:-}" ]]; then
+            echo "Building Windows ltsc2022 amd64 cloud node manager"
+            make -C "${AZURE_CLOUD_PROVIDER_ROOT}" push-node-image-windows-ltsc2022-amd64
+        else
+            export SPECIFIC_OSVERSIONS_WINDOWS=""
+        fi
+        echo "Create and push a manifest list containing all the Windows and Linux images."
+        make -C "${AZURE_CLOUD_PROVIDER_ROOT}" push-specific-arch-os-node-manager-image
     fi
 }