diff --git a/.circleci/config.yml b/.circleci/config.yml
index 03aefd678..5fadef8b2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,6 +3,7 @@ version: 2.1
 
 orbs:
   win: circleci/windows@2.2.0
+  azure-cli: circleci/azure-cli@1.0.0
 
 jobs:
   build:
@@ -45,12 +46,27 @@ jobs:
           at: 'C:\tmp\workspace'
       - run:
           name: Copy from Workspace
-          command: 'Copy-Item "C:\tmp\workspace\*" "package" -Recurse'
+          command: Copy-Item -Path "C:\tmp\workspace\*" -Destination "package\dist" -Recurse
       - run:
           name: install innosetup and build
-          command: Set-Location package; .\build.ps1
+          command: Set-Location package; dir; .\build.ps1
+      - persist_to_workspace:
+          root: .
+          paths:
+           - package/output/*
       - store_artifacts:
-          path: output/
+          path: package/output/*
+    
+  upload-binary:
+    executor: azure-cli/default
+    steps:
+      - azure-cli/install
+      - attach_workspace:
+          at: '\tmp\workspace'
+      - run:
+          name: Upload binary
+          command: cd \tmp\workspace\ && ls && az storage blob upload-batch -s . -d "$AZURE_STORAGE_CONTAINER_NAME" --pattern 'helm_*' --connection-string "$AZURE_STORAGE_CONNECTION_STRING"
+
 
 workflows:
   version: 2
@@ -66,3 +82,10 @@ workflows:
           filters:
             tags:
               only: /.*/
+      - upload-binary:
+          requires:
+            - build
+            - generate-windows-installer
+          filters:
+            tags:
+              only: /.*/
\ No newline at end of file
diff --git a/package/helm_installer.iss b/package/helm_installer.iss
index 55bd97521..c327f4d00 100644
--- a/package/helm_installer.iss
+++ b/package/helm_installer.iss
@@ -7,11 +7,11 @@ PrivilegesRequired=lowest
 AppPublisher=Helm
 AppPublisherURL=https://helm.sh
 AppSupportURL=https://github.com/helm/helm
-LicenseFile="windows-amd64\LICENSE"
+LicenseFile="dist\LICENSE"
 OutputBaseFilename=helm_installer_win64
 
 [Files]
-Source: "windows-amd64\*" ; DestDir: "{app}\bin";
+Source: "dist\*" ; DestDir: "{app}\bin";
 
 [Registry]
 Root: "HKCU"; Subkey: "Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}\bin"; Check: NeedsAddPathHKCU(ExpandConstant('{app}\bin'))