diff --git a/.github/actions/package/action.yml b/.github/actions/package/action.yml
index 03ab509d2..a6d205b6d 100644
--- a/.github/actions/package/action.yml
+++ b/.github/actions/package/action.yml
@@ -54,8 +54,8 @@ runs:
       run: |
         SET RUNTIME=win-x64
 
-        cd ./distribution/windows/setup
-        ./distribution/windows/setup/build.bat
+        cd \distribution\windows\setup
+        \distribution\windows\setup\build.bat
 
     - name: Create Windows Installer (x86)
       if: ${{ inputs.platform == 'windows' }}
diff --git a/.github/actions/package/package.sh b/.github/actions/package/package.sh
index 7f19664d9..9cdcaee4c 100755
--- a/.github/actions/package/package.sh
+++ b/.github/actions/package/package.sh
@@ -8,7 +8,7 @@ framework="${FRAMEWORK:=net6.0}"
 for runtime in _artifacts/*
 do
   name="${runtime##*/}"
-  folderName="$runtime/$framework/Sonarr"
+  folderName="$runtime/$framework"
   sonarrFolder="$folderName/Sonarr"
     
   echo "Creating package for $name"
diff --git a/distribution/windows/setup/build.bat b/distribution/windows/setup/build.bat
index 6d7f64bef..6c205089e 100644
--- a/distribution/windows/setup/build.bat
+++ b/distribution/windows/setup/build.bat
@@ -3,8 +3,5 @@
 @REM SET BRANCH=develop
 @REM SET FRAMEWORK=net6.0
 @REM SET RUNTIME=win-x64
-echo ##teamcity[progressStart 'Building setup file']
-inno\ISCC.exe sonarr.iss
-echo ##teamcity[progressFinish 'Building setup file']
 
-echo ##teamcity[publishArtifacts 'distribution\windows\setup\output\*%RUNTIME%*.exe']
+inno\ISCC.exe sonarr.iss