diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 78715ebe2..74f61c144 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -170,28 +170,28 @@
           run: |
              node utils/storage_manager.mjs y
              npm run build paid dev apk
-             mv platforms/android/app/build/outputs/apk/debug/app-debug.apk platforms/android/app/build/outputs/apk/debug/app-debug-normal.apk
+             mv platforms/android/app/build/outputs/apk/debug/app-debug.apk /tmp/app-debug-normal.apk
              echo "VERSION: $UPDATED_VERSION" >> $GITHUB_STEP_SUMMARY
              
         - name: Upload APK Artifact
           uses: actions/upload-artifact@v4
           with:
             name: app-debug-${{ env.GIT_COMMIT }}
-            path: platforms/android/app/build/outputs/apk/debug/app-debug-normal.apk
+            path: /tmp/app-debug-normal.apk
         
         - name: Run npm build paid dev apk fdroid (for F-Droid)
           if: ${{ !inputs.is_PR }}
           run: |
             node utils/storage_manager.mjs y
             npm run build paid dev apk fdroid
-            mv platforms/android/app/build/outputs/apk/debug/app-debug.apk platforms/android/app/build/outputs/apk/debug/app-debug-fdroid.apk
+            mv platforms/android/app/build/outputs/apk/debug/app-debug.apk /tmp/app-debug-fdroid.apk
         
         - name: Upload APK Artifact
           uses: actions/upload-artifact@v4
           if: ${{ !inputs.is_PR }}
           with:
             name: app-debug-fdroid-${{ env.GIT_COMMIT }}
-            path: platforms/android/app/build/outputs/apk/debug/app-debug-fdroid.apk
+            path: /tmp/app-debug-fdroid.apk
 
         - name: remove keystore and build.json
           run: |
@@ -226,15 +226,15 @@
         - name: Release Nightly Version
 #          Only run this step, if not called from another workflow. And a previous step is successful with releasedRequired=true
           id: release
-          if: ${{ ! inputs.skip_tagging_and_releases && success() && env.releaseRequired == 'true' }}
+          if: ${{ ! inputs.skip_tagging_and_releases && success() && env.releaseRequired == 'true' && !inputs.is_PR }}
           uses: softprops/action-gh-release@v2
           with:
             prerelease: true
             name: ${{ env.UPDATED_VERSION }}
             tag_name: ${{ env.UPDATED_VERSION }} 
             files: |
-              platforms/android/app/build/outputs/apk/debug/app-debug-normal.apk
-              platforms/android/app/build/outputs/apk/debug/app-debug-fdroid.apk
+              /tmp/app-debug-normal.apk
+              /tmp/app-debug-fdroid.apk
             body: |
               Automated Nightly (pre-release) Releases for Today