diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index eb7c4ccef8..3d0fd1c174 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -38,14 +38,19 @@ jobs:
         gpg -d --passphrase "${PASSWORD}" --batch keystore.properties.asc > keystore.properties
         echo "${{ secrets.LOCAL_PROPERTIES }}" > local.properties.asc
         gpg -d --passphrase "${PASSWORD}" --batch local.properties.asc > local.properties
-    - name:
-      run: |
-        pwd
-        ls
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
       run: ./gradlew assembleGithubRelease assembleLargeRelease assemblePlayRelease uploadBugsnagGithub-releaseMapping uploadBugsnagLarge-releaseMapping uploadBugsnagPlay-releaseMapping
+    #https://github.com/actions/upload-artifact
+    - uses: actions/upload-artifact@v3
+      with:
+        name: Mapping files
+        path: app/build/outputs/mapping/**/mapping.txt
+    - uses: actions/upload-artifact@v3
+      with:
+        name: APK files
+        path: app/build/outputs/apk/**/release/*.apk
     - name: Upload to BitBucket
       run: |
         ./gradlew upload -Ptarget=play-preview
diff --git a/app/build.gradle b/app/build.gradle
index 55f2f475e6..7c08aadd44 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -338,17 +338,18 @@ android {
             variant.buildConfigField "String", "MXTOOLBOX_URI", "\"\""
 
         // $JAVA_HOME/bin/java -jar ~/Android/Sdk/tools/proguard/lib/retrace.jar ~/email/app/schemas/mapping/FairEmail-v1.nnn-github-release-mapping.txt
+
         if (variant.getBuildType().isMinifyEnabled())
             variant.assembleProvider.get().doLast {
                 for (file in variant.getMappingFileProvider().get().files) {
                     if (file != null && file.exists()) {
-                        exec {
-                            commandLine 'curl',
-                                    '-o', '/dev/null',
-                                    '-X', 'POST', "https://M66B:" + localProperties.getProperty("bb.pwd", "") + "@api.bitbucket.org/2.0/repositories/M66B/fairemail-test/downloads",
-                                    '--form', "files=@" + file + ";" +
-                                    "filename=FairEmail-v1." + getVersionCode() + getRevision() + "-" + variant.baseName + "-mapping.txt"
-                        }
+                        //exec {
+                        //    commandLine 'curl',
+                        //            '-o', '/dev/null',
+                        //            '-X', 'POST', "https://M66B:" + localProperties.getProperty("bb.pwd", "") + "@api.bitbucket.org/2.0/repositories/M66B/fairemail-test/downloads",
+                        //            '--form', "files=@" + file + ";" +
+                        //            "filename=FairEmail-v1." + getVersionCode() + getRevision() + "-" + variant.baseName + "-mapping.txt"
+                        //}
 
                         def dir = "${rootDir}/app/schemas/mapping"
                         def name = "$archivesBaseName-$variant.baseName-$file.name"