diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 8f4cea0a55..a097e0ecba 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -31,9 +31,10 @@ jobs:
           sed 's/CHANGES\.md/CHANGES_NIGHTLY\.md/' towncrier.toml.bak > towncrier.toml
           rm towncrier.toml.bak
           yes n | towncrier build --version nightly
-      - name: Build and upload Nightly bundle
+      - name: Build and upload Nightly application
         run: |
-          ./gradlew bundleNightly appDistributionUploadNightly $CI_GRADLE_ARG_PROPERTIES
+#         ./gradlew bundleNightly appDistributionUploadNightly $CI_GRADLE_ARG_PROPERTIES
+          ./gradlew assembleNightly appDistributionUploadNightly $CI_GRADLE_ARG_PROPERTIES
         env:
           ELEMENT_ANDROID_MAPTILER_API_KEY: ${{ secrets.MAPTILER_KEY }}
           ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}
@@ -45,11 +46,11 @@ jobs:
       - name: Additionally upload Nightly APK to browserstack for testing
         continue-on-error: true # don't block anything by this upload failing (for now)
         run: |
-          ./gradlew assembleNightly $CI_GRADLE_ARG_PROPERTIES
+#          ./gradlew assembleNightly $CI_GRADLE_ARG_PROPERTIES
           curl -u "$BROWSERSTACK_USERNAME:$BROWSERSTACK_PASSWORD" -X POST "https://api-cloud.browserstack.com/app-automate/upload" -F "file=@app/build/outputs/apk/nightly/app-universal-nightly.apk" -F "custom_id=element-x-android-nightly"
         env:
-          ELEMENT_ANDROID_MAPTILER_API_KEY: ${{ secrets.MAPTILER_KEY }}
-          ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}
-          ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
+#          ELEMENT_ANDROID_MAPTILER_API_KEY: ${{ secrets.MAPTILER_KEY }}
+#          ELEMENT_ANDROID_MAPTILER_LIGHT_MAP_ID: ${{ secrets.MAPTILER_LIGHT_MAP_ID }}
+#          ELEMENT_ANDROID_MAPTILER_DARK_MAP_ID: ${{ secrets.MAPTILER_DARK_MAP_ID }}
           BROWSERSTACK_USERNAME: ${{ secrets.ELEMENT_ANDROID_BROWSERSTACK_USERNAME }}
           BROWSERSTACK_PASSWORD: ${{ secrets.ELEMENT_ANDROID_BROWSERSTACK_ACCESS_KEY }}
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 79d6af8307..19bb2ea84b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -124,8 +124,13 @@ android {
             }
 
             firebaseAppDistribution {
-                artifactType = "AAB"
-                artifactPath = "$rootDir/app/build/outputs/bundle/nightly/app-nightly.aab"
+                artifactType = "APK"
+                // We upload the universal APK to fix this error:
+                // "App Distribution found more than 1 output file for this variant.
+                // Please contact firebase-support@google.com for help using APK splits with App Distribution."
+                artifactPath = "$rootDir/app/build/outputs/apk/nightly/app-universal-nightly.apk"
+                // artifactType = "AAB"
+                // artifactPath = "$rootDir/app/build/outputs/bundle/nightly/app-nightly.aab"
                 // This file will be generated by the GitHub action
                 releaseNotesFile = "CHANGES_NIGHTLY.md"
                 groups = "external-testers"