diff --git a/.github/workflows/buildAndDeploy.yml b/.github/workflows/buildAndDeploy.yml
index a0b89bb7d5..169e385280 100644
--- a/.github/workflows/buildAndDeploy.yml
+++ b/.github/workflows/buildAndDeploy.yml
@@ -88,13 +88,13 @@ jobs:
           ./gradlew desktop:zipLinuxFilesForJar
 
           # Copy JAR for final Github version deploy
-          cp desktop/build/libs/Unciv.jar deploy/Unciv.jar
+          mv desktop/build/libs/Unciv.jar deploy/Unciv.jar
 
       - name: Upload JAR
         uses: actions/upload-artifact@v3
         with:
           name: UncivJar
-          path: desktop/build/libs/Unciv.jar
+          path: deploy/Unciv.jar
 
       ## Server
 
@@ -171,6 +171,7 @@ jobs:
 ## Finalize
 
       - name: Check if this is a real release or a test version, for Github release
+        if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
         id: check-version-tag
         run: |
           if [[ ${{steps.tag.outputs.tag}} =~ [0-9]\.[0-9]+\.[0-9]+ ]]; then
@@ -267,6 +268,9 @@ jobs:
           unzip butler.zip
           chmod +x butler
 
+          mkdir -p desktop/build/libs
+          mv Unciv.jar desktop/build/libs
+
           wget -q -O packr-all-4.0.0.jar https://github.com/libgdx/packr/releases/download/4.0.0/packr-all-4.0.0.jar
           wget -q -O jre-linux-64.tar.gz https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz
           ./gradlew desktop:packrLinux64