diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 534ea4f308..9b4579638e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -105,50 +105,47 @@ jobs:
           checksum -f="./dist/bw-linux-${env:PACKAGE_VERSION}.zip" `
             -t sha256 | Out-File -Encoding ASCII ./dist/bw-linux-sha256-${env:PACKAGE_VERSION}.txt
 
-      - name: Debug Files
-        run: dir ./dist
-
       - name: Publish windows zip to GitHub
         uses: actions/upload-artifact@v2
         with:
-          name: bw-windows-${{ env.PACKAGE_NAME }}.zip
-          path: ./dist/bw-windows-${{ env.PACKAGE_NAME }}.zip
+          name: bw-windows-${{ env.PACKAGE_VERSION }}.zip
+          path: ./dist/bw-windows-${{ env.PACKAGE_VERSION }}.zip
 
       - name: Publish windows checksum to GitHub
         uses: actions/upload-artifact@v2
         with:
-          name: bw-windows-sha256-${{ env.PACKAGE_NAME }}.txt
-          path: ./dist/bw-windows-sha256-${{ env.PACKAGE_NAME }}.txt
+          name: bw-windows-sha256-${{ env.PACKAGE_VERSION }}.txt
+          path: ./dist/bw-windows-sha256-${{ env.PACKAGE_VERSION }}.txt
 
       - name: Publish macos zip to GitHub
         uses: actions/upload-artifact@v2
         with:
-          name: bw-macos-${{ env.PACKAGE_NAME }}.zip
-          path: ./dist/bw-macos-${{ env.PACKAGE_NAME }}.zip
+          name: bw-macos-${{ env.PACKAGE_VERSION }}.zip
+          path: ./dist/bw-macos-${{ env.PACKAGE_VERSION }}.zip
 
       - name: Publish macos checksum to GitHub
         uses: actions/upload-artifact@v2
         with:
-          name: bw-macos-sha256-${{ env.PACKAGE_NAME }}.txt
-          path: ./dist/bw-macos-sha256-${{ env.PACKAGE_NAME }}.txt
+          name: bw-macos-sha256-${{ env.PACKAGE_VERSION }}.txt
+          path: ./dist/bw-macos-sha256-${{ env.PACKAGE_VERSION }}.txt
 
       - name: Publish linux zip to GitHub
         uses: actions/upload-artifact@v2
         with:
-          name: bw-linux-${{ env.PACKAGE_NAME }}.zip
-          path: ./dist/bw-linux-${{ env.PACKAGE_NAME }}.zip
+          name: bw-linux-${{ env.PACKAGE_VERSION }}.zip
+          path: ./dist/bw-linux-${{ env.PACKAGE_VERSION }}.zip
 
       - name: Publish linux checksum to GitHub
         uses: actions/upload-artifact@v2
         with:
-          name: bw-linux-sha256-${{ env.PACKAGE_NAME }}.txt
-          path: ./dist/bw-linux-sha256-${{ env.PACKAGE_NAME }}.txt
+          name: bw-linux-sha256-${{ env.PACKAGE_VERSION }}.txt
+          path: ./dist/bw-linux-sha256-${{ env.PACKAGE_VERSION }}.txt
 
       - name: Publish Chocolatey CLI
         uses: actions/upload-artifact@v2
         with: 
-          name: bitwarden-cli.${{ env.PACKAGE_NAME }}.nupkg
-          path: ./dist/chocolatey/bitwarden-cli.${{ env.PACKAGE_NAME }}.nupkg
+          name: bitwarden-cli.${{ env.PACKAGE_VERSION }}.nupkg
+          path: ./dist/chocolatey/bitwarden-cli.${{ env.PACKAGE_VERSION }}.nupkg
 
 
   publish_windows: