diff --git a/.github/workflows/BitMono.CLI.yaml b/.github/workflows/BitMono.CLI.yaml
index 763f34f4..57f99993 100644
--- a/.github/workflows/BitMono.CLI.yaml
+++ b/.github/workflows/BitMono.CLI.yaml
@@ -49,22 +49,22 @@ jobs:
         run: sudo apt-get install zip
 
       - name: Zip artifacts
-        run: "cd ./src/BitMono.CLI/bin/Release/${{ matrix.target-framework }}/${{ matrix.runtime }} && zip -qq -r ./BitMono-v${{ github.ref_name }}-CLI-${{ matrix.target-framework }}-${{ matrix.runtime }}.zip *"
+        run: "cd ./src/BitMono.CLI/bin/Release/${{ matrix.target-framework }}/${{ matrix.runtime }} && zip -qq -r ./BitMono-v${{ steps.project-build.outputs.version }}-CLI-${{ matrix.target-framework }}-${{ matrix.runtime }}.zip *"
 
       - name: Upload build
         uses: actions/upload-artifact@v3 # Do not use v4 as it is not working properly, see: https://github.com/actions/upload-artifact/issues/478
         with:
-          name: BitMono-v${{ github.ref_name }}-CLI-${{ matrix.target-framework }}-${{ matrix.runtime }}
-          path: "./src/BitMono.CLI/bin/Release/${{ matrix.target-framework }}/${{ matrix.runtime }}/BitMono-v${{ github.ref_name }}-CLI-${{ matrix.target-framework }}-${{ matrix.runtime }}.zip"
+          name: BitMono-v${{ steps.project-build.outputs.version }}-CLI-${{ matrix.target-framework }}-${{ matrix.runtime }}
+          path: "./src/BitMono.CLI/bin/Release/${{ matrix.target-framework }}/${{ matrix.runtime }}/BitMono-v${{ steps.project-build.outputs.version }}-CLI-${{ matrix.target-framework }}-${{ matrix.runtime }}.zip"
           if-no-files-found: error
 
       - name: Create Release
         if: github.event_name == 'create' && github.event.ref_type == 'tag'
         uses: ncipollo/release-action@v1.14.0
         with:
-          name: BitMono Release v${{ github.ref_name }}
-          tag: v${{ github.ref_name }}
-          artifacts: "./src/BitMono.CLI/bin/Release/${{ matrix.target-framework }}/${{ matrix.runtime }}/BitMono-v${{ github.ref_name }}-CLI-${{ matrix.target-framework }}-${{ matrix.runtime }}.zip"
+          name: BitMono Release v${{ steps.project-build.outputs.version }}
+          tag: v${{ steps.project-build.outputs.version }}
+          artifacts: "./src/BitMono.CLI/bin/Release/${{ matrix.target-framework }}/${{ matrix.runtime }}/BitMono-v${{ steps.project-build.outputs.version }}-CLI-${{ matrix.target-framework }}-${{ matrix.runtime }}.zip"
           token: ${{ secrets.PAT }}
           prerelease: ${{ steps.project-build.outputs.is_prerelease }}
           allowUpdates: true