diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index b0320cf0..7507cbe5 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -46,11 +46,7 @@ jobs:
           mv dist/**/spotube-*-windows-setup.exe dist/Spotube-windows-x86_64-setup.exe
           Set-Variable -Name HASH -Value (Get-FileHash dist\Spotube-windows-x86_64-setup.exe).Hash
           sed -i "s/%{{WIN_SHA256}}%/$HASH/" choco-struct/tools/VERIFICATION.txt
-          make VERSION=${{ steps.tag.outputs.tag }} choco
-
-      # Rename the artifacts
-      - run: |
-          mv dist/**/spotube.${{ steps.tag.outputs.tag }}.nupkg dist/Spotube-windows-x86_64.nupkg
+          make choco
 
       # Publish to Chocolatey Repository
       - run: |
diff --git a/Makefile b/Makefile
index 6be3202f..08f45a28 100644
--- a/Makefile
+++ b/Makefile
@@ -47,8 +47,8 @@ inno:
 		 powershell .\build\iscc\iscc.exe scripts\windows-setup-creator.iss
 
 choco:
-			powershell cp dist\${VERSION}\spotube-${VERSION}+${VERSION}-windows-setup.exe choco-struct\tools
-			powershell choco pack .\choco-struct\spotube.nuspec  --outputdirectory dist\${VERSION}\
+			powershell cp dist\**\spotube-*-windows-setup.exe choco-struct\tools
+			powershell choco pack .\choco-struct\spotube.nuspec  --outputdirectory dist
 
 apk:
 		mv build/app/outputs/apk/release/app-release.apk build/Spotube-android-all-arch.apk