diff --git a/.azure/install-innosetup.yml b/.azure/install-innosetup.yml
index f4d563221..bd7e2980e 100644
--- a/.azure/install-innosetup.yml
+++ b/.azure/install-innosetup.yml
@@ -2,12 +2,17 @@
 
 steps:
   - bash: |
-      choco install innosetup -y
+      set -ex
+      if [ -x "`command -v iscc`" ]; then
+        echo `command -v iscc` `iscc -?` installed
+      else
+        choco install innosetup -y
+      fi
     displayName: Install InnoSetup - Windows
     condition: eq(variables['Agent.OS'], 'Windows_NT')
 
-  - bash: |
-      set -ex
-      iscc
-    displayName: InnoSetup
-    condition: eq(variables['Agent.OS'], 'Windows_NT')
+  # - bash: |
+  #     set -ex
+  #     iscc
+  #   displayName: InnoSetup
+  #   condition: eq(variables['Agent.OS'], 'Windows_NT')
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 31652fd2d..1d3b43f64 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -93,12 +93,6 @@ jobs:
     - template: .azure/install-cmake.yml
     - template: .azure/install-innosetup.yml
     - template: .azure/install-llvm.yml
-    - bash: make release
-      displayName: Build (*nix)
-      condition: and(succeeded(), not(eq(variables['Agent.OS'], 'Windows_NT')))
-    - bash: make release-llvm
-      displayName: Build (Windows)
-      condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
     - bash: make capi
       displayName: Build c-api (*nix)
       condition: and(succeeded(), not(eq(variables['Agent.OS'], 'Windows_NT')))
@@ -107,6 +101,25 @@ jobs:
         cargo build -p wasmer-runtime-c-api --release
       displayName: Build c-api (Windows)
       condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
+    - bash: make release
+      displayName: Build (*nix)
+      condition: and(succeeded(), not(eq(variables['Agent.OS'], 'Windows_NT')))
+    - bash: make release-llvm
+      displayName: Build (Windows)
+      condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
+    - bash: |
+        cargo build --release --manifest-path wapm-cli/Cargo.toml --features "telemetry update-notifications"
+      displayName: Build WAPM
+    - bash: |
+        mkdir -p artifacts
+        make build-install
+      displayName: Build Distribution (*nix)
+      condition: and(succeeded(), not(eq(variables['Agent.OS'], 'Windows_NT')))
+    - bash: |
+        cd ./src/installer
+        iscc wasmer.iss
+      displayName: Build Distribution (Windows)
+      condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
     - bash: |
         install_name_tool -id "@rpath/libwasmer_runtime_c_api.dylib" target/release/libwasmer_runtime_c_api.dylib
       displayName: Build c-api (Darwin fix)