diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 927b8fc17d..84199a860e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -111,44 +111,58 @@ jobs:
       - name: Publish windows zip to GitHub
         uses: actions/upload-artifact@v2
         with:
-          name: bw-windows-${{ PACKAGE_VERSION }}.zip
-          path: ./dist/bw-windows-${{ PACKAGE_VERSION }}.zip
+          name: bw-windows-${{ env.pkg-version }}.zip
+          path: ./dist/bw-windows-${{ env.pkg-version }}.zip
+        env:
+          pkg-version: $PACKAGE_VERSION
 
       - name: Publish windows checksum to GitHub
         uses: actions/upload-artifact@v2
         with:
-          name: bw-windows-sha256-${{ PACKAGE_VERSION }}.txt
-          path: ./dist/bw-windows-sha256-${{ PACKAGE_VERSION }}.txt
+          name: bw-windows-sha256-${{ env.pkg-version }}.txt
+          path: ./dist/bw-windows-sha256-${{ env.pkg-version }}.txt
+        env:
+          pkg-version: $PACKAGE_VERSION
 
       - name: Publish macos zip to GitHub
         uses: actions/upload-artifact@v2
         with:
-          name: bw-macos-${{ PACKAGE_VERSION }}.zip
-          path: ./dist/bw-macos-${{ PACKAGE_VERSION }}.zip
+          name: bw-macos-${{ env.pkg-version }}.zip
+          path: ./dist/bw-macos-${{ env.pkg-version }}.zip
+        env:
+          pkg-version: $PACKAGE_VERSION
 
       - name: Publish macos checksum to GitHub
         uses: actions/upload-artifact@v2
         with:
-          name: bw-macos-sha256-${{ PACKAGE_VERSION }}.txt
-          path: ./dist/bw-macos-sha256-${{ PACKAGE_VERSION }}.txt
+          name: bw-macos-sha256-${{ env.pkg-version }}.txt
+          path: ./dist/bw-macos-sha256-${{ env.pkg-version }}.txt
+        env:
+          pkg-version: $PACKAGE_VERSION
 
       - name: Publish linux zip to GitHub
         uses: actions/upload-artifact@v2
         with:
-          name: bw-linux-${{ PACKAGE_VERSION }}.zip
-          path: ./dist/bw-linux-${{ PACKAGE_VERSION }}.zip
+          name: bw-linux-${{ env.pkg-version }}.zip
+          path: ./dist/bw-linux-${{ env.pkg-version }}.zip
+        env:
+          pkg-version: $PACKAGE_VERSION
 
       - name: Publish linux checksum to GitHub
         uses: actions/upload-artifact@v2
         with:
-          name: bw-linux-sha256-${{ PACKAGE_VERSION }}.txt
-          path: ./dist/bw-linux-sha256-${{ PACKAGE_VERSION }}.txt
+          name: bw-linux-sha256-${{ env.pkg-version }}.txt
+          path: ./dist/bw-linux-sha256-${{ env.pkg-version }}.txt
+        env:
+          pkg-version: $PACKAGE_VERSION
 
       - name: Publish Chocolatey CLI
         uses: actions/upload-artifact@v2
         with: 
-          name: bitwarden-cli.${{ PACKAGE_VERSION }}.nupkg
-          path: ./dist/chocolatey/bitwarden-cli.${{ PACKAGE_VERSION }}.nupkg
+          name: bitwarden-cli.${{ env.pkg-version }}.nupkg
+          path: ./dist/chocolatey/bitwarden-cli.${{ env.pkg-version }}.nupkg
+        env:
+          pkg-version: $PACKAGE_VERSION
 
 
   publish_windows: