diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e3fcdf63a..f93be3544 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -444,7 +444,12 @@ jobs:
 
           # MSIX only allows numbers in their versions,
           # so we need to use another clear identifier
-          $version = ("${{ github.run_number }}").Substring(0, 3)
+          $runNumber = "${{ github.run_number }}"
+          if ($runNumber.Length -gt 3) {
+            $version = $runNumber.Substring(($runNumber.Length - 3))
+          } else {
+            $version = $runNumber
+          }
 
           Copy-Item ${{ github.workspace }}\program_info\prismlauncher_*x*.png .
           (Get-Content ${{ github.workspace }}\program_info\AppxManifest.xml) `
@@ -631,7 +636,13 @@ jobs:
       - name: Set Appx version
         shell: pwsh
         run: |
-          $version = ("${{ github.run_number }}").Substring(0, 3)
+          $runNumber = "${{ github.run_number }}"
+          if ($runNumber.Length -gt 3) {
+            $version = $runNumber.Substring(($runNumber.Length - 3))
+          } else {
+            $version = $runNumber
+          }
+
           "APPX_VERSION=${{ env.PRISM_VERSION }}.0.$version" >> $env:GITHUB_ENV
 
       - name: Create Bundle Staging Directory
@@ -655,7 +666,7 @@ jobs:
       - name: Create MSIXBundle
         shell: pwsh
         run: |
-          makeappx.exe bundle /d ${{ env.BUNDLE_STAGING }} /p ${{ env.BUNDLE_STAGING }}\prismlauncher-${{ env.APPX_VERSION }}.msixbundle
+          makeappx.exe bundle /bv ${{ env.APPX_VERSION }} /d ${{ env.BUNDLE_STAGING }} /p ${{ env.BUNDLE_STAGING }}\prismlauncher-${{ env.APPX_VERSION }}.msixbundle
 
       - name: Update AppInstaller File
         shell: pwsh