diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 70af04d54..78715ebe2 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -170,13 +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
              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.apk
+            path: platforms/android/app/build/outputs/apk/debug/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
+        
+        - 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
 
         - name: remove keystore and build.json
           run: |
@@ -218,7 +233,8 @@
             name: ${{ env.UPDATED_VERSION }}
             tag_name: ${{ env.UPDATED_VERSION }} 
             files: |
-              platforms/android/app/build/outputs/apk/debug/app-debug.apk
+              platforms/android/app/build/outputs/apk/debug/app-debug-normal.apk
+              platforms/android/app/build/outputs/apk/debug/app-debug-fdroid.apk
             body: |
               Automated Nightly (pre-release) Releases for Today