diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 17dd9f5..8a55096 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.0.2
+        uses: actions/checkout@v3
         with:
           token: ${{ secrets.PAT }}
       - name: Get the latest version of Lens
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ae7c6a0..9417aaf 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -38,7 +38,6 @@ jobs:
           node update.js
       - name: Build Lens
         run: |
-          mkdir releasefiles
           if [ "$RUNNER_OS" == "Windows" ]; then
             choco install visualstudio2019buildtools visualstudio2019-workload-vctools
           fi
@@ -58,34 +57,12 @@ jobs:
             fi
             
             npx nx run open-lens:build:app --x64 --arm64
-          
-            for file in open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.dmg; do
-              if [[ "$file" == *"arm64"* ]]; then
-                cp "$file" releasefiles/OpenLens-${{ env.LENS_VERSION }}-arm64.dmg
-              else
-                cp "$file" releasefiles/OpenLens-${{ env.LENS_VERSION }}.dmg
-              fi
-            done
-            for file in open-lens/dist/OpenLens-${{ env.LENS_VERSION }}-mac.zip; do
-              if [[ "$file" == *"arm64"* ]]; then
-                cp "$file" releasefiles/OpenLens-${{ env.LENS_VERSION }}-arm64.zip
-              else
-                cp "$file" releasefiles/OpenLens-${{ env.LENS_VERSION }}.zip
-              fi
-            done
           elif [ "$RUNNER_OS" == "Linux" ]; then
             npx nx run open-lens:build:app --x64 --arm64
-            cp open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.x86_64.AppImage releasefiles/OpenLens-${{ env.LENS_VERSION }}.AppImage
-            cp open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.amd64.deb releasefiles/OpenLens-${{ env.LENS_VERSION }}.deb
-            cp open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.x86_64.rpm releasefiles/OpenLens-${{ env.LENS_VERSION }}.rpm
-            cp open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.arm64.AppImage releasefiles/OpenLens-${{ env.LENS_VERSION }}.arm64.AppImage
-            cp open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.arm64.deb releasefiles/OpenLens-${{ env.LENS_VERSION }}.arm64.deb
-            cp open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.aarch64.rpm releasefiles/OpenLens-${{ env.LENS_VERSION }}.arm64.rpm
           else
             unset DOWNLOAD_ALL_ARCHITECTURES
             npx nx run open-lens:build:app
-            cp open-lens/dist/OpenLens*.exe releasefiles/OpenLens-${{ env.LENS_VERSION }}.exe
-            cp open-lens/dist/OpenLens*.exe open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.exe
+            cp open-lens/dist/OpenLens*.exe open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.${{ github.run_number }}.exe
           fi
         shell: bash
         working-directory: lens
@@ -101,14 +78,14 @@ jobs:
           WIN_CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD_WIN }}
           CSC_FOR_PULL_REQUEST: true
           DOWNLOAD_ALL_ARCHITECTURES: true
-          BUILD_NUMBER: ${{ github.run_id }}
+          BUILD_NUMBER: ${{ github.run_number }}
 
       - name: Calculate SHA256 checksum
         run: |
           if [ "$RUNNER_OS" == "Windows" ]; then
-            certutil -hashfile OpenLens-${{ env.LENS_VERSION }}.exe SHA256 | tee OpenLens-${{ env.LENS_VERSION }}.exe.sha256
+            certutil -hashfile OpenLens-${{ env.LENS_VERSION }}.${{ github.run_number }}.exe SHA256 | tee OpenLens-${{ env.LENS_VERSION }}.${{ github.run_number }}.exe.sha256
           else
-            for filename in OpenLens-${{ env.LENS_VERSION }}*; do shasum -a 256 ${filename} | tee ${filename}.sha256 ; done
+            for filename in OpenLens-${{ env.LENS_VERSION }}.${{ github.run_number }}*; do shasum -a 256 ${filename} | tee ${filename}.sha256 ; done
           fi
         shell: bash
         working-directory: lens/open-lens/dist
@@ -119,13 +96,13 @@ jobs:
           name: OpenLens-${{ matrix.os }}
           retention-days: 5
           path: |
-            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}*.dmg
-            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}*.AppImage
-            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}*.deb
-            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}*.rpm
-            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}*.zip
-            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.exe
-            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}*.sha256
+            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.${{ github.run_number }}*.dmg
+            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.${{ github.run_number }}*.AppImage
+            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.${{ github.run_number }}*.deb
+            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.${{ github.run_number }}*.rpm
+            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.${{ github.run_number }}*.zip
+            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.${{ github.run_number }}.exe
+            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.${{ github.run_number }}*.sha256
 
       - name: Generate Changelog
         run: curl -s https://api.github.com/repos/lensapp/lens/releases/latest | jq -r 'select(.prerelease == false) | .body[0:]' > ${{ github.workspace }}-CHANGELOG.txt
@@ -133,26 +110,26 @@ jobs:
         uses: softprops/action-gh-release@v0.1.15
         if: github.ref == 'refs/heads/main'
         with:
-          tag_name: v${{ env.LENS_VERSION }}
+          tag_name: v${{ env.LENS_VERSION }}.${{ github.run_number }}
           body_path: ${{ github.workspace }}-CHANGELOG.txt
           files: |
-            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}*.dmg
-            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}*.AppImage
-            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}*.deb
-            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}*.rpm
-            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}*.zip
-            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.exe
-            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}*.sha256
+            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.${{ github.run_number }}*.dmg
+            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.${{ github.run_number }}*.AppImage
+            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.${{ github.run_number }}*.deb
+            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.${{ github.run_number }}*.rpm
+            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.${{ github.run_number }}*.zip
+            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.${{ github.run_number }}.exe
+            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.${{ github.run_number }}*.sha256
       - name: Latest
         uses: softprops/action-gh-release@v0.1.15
         if: github.ref == 'refs/heads/main'
         with:
           tag_name: Latest
           files: |
-            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}*.dmg
-            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}*.AppImage
-            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}*.deb
-            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}*.rpm
-            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}*.zip
-            lens/open-lens/dist/OpenLens.Setup.${{ env.LENS_VERSION }}.exe
+            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.${{ github.run_number }}*.dmg
+            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.${{ github.run_number }}*.AppImage
+            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.${{ github.run_number }}*.deb
+            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.${{ github.run_number }}*.rpm
+            lens/open-lens/dist/OpenLens-${{ env.LENS_VERSION }}.${{ github.run_number }}*.zip
+            lens/open-lens/dist/OpenLens.Setup.${{ env.LENS_VERSION }}.${{ github.run_number }}.exe
             lens/open-lens/dist/lates*.yml