diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ddb7375d46..9cb7227c4e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -176,6 +176,9 @@ jobs:
           VERSION_CODE: ${{ needs.prepare-build-info.outputs.APP_VERSION_CODE }}
         run: bundle exec fastlane internal
 
+      - name: List outputs
+        run: ls -R app/build/outputs/
+
       - name: Upload Google AAB artifact
         if: always()
         uses: actions/upload-artifact@v6
@@ -250,6 +253,9 @@ jobs:
           VERSION_CODE: ${{ needs.prepare-build-info.outputs.APP_VERSION_CODE }}
         run: bundle exec fastlane fdroid_build
 
+      - name: List outputs
+        run: ls -R app/build/outputs/
+
       - name: Upload F-Droid APK artifact
         uses: actions/upload-artifact@v6
         with:
diff --git a/build-logic/convention/src/main/kotlin/AnalyticsConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AnalyticsConventionPlugin.kt
index a5697cf9d7..5cf77fef06 100644
--- a/build-logic/convention/src/main/kotlin/AnalyticsConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AnalyticsConventionPlugin.kt
@@ -50,7 +50,7 @@ class AnalyticsConventionPlugin : Plugin<Project> {
             // This avoids iterating all tasks with a generic filter and improves configuration performance.
             plugins.withId("com.google.gms.google-services") {
                 tasks.configureEach {
-                    if (name.contains("fdroid", ignoreCase = true)) {
+                    if (name.contains("GoogleServices", ignoreCase = true) && name.contains("fdroid", ignoreCase = true)) {
                         enabled = false
                     }
                 }
@@ -58,7 +58,7 @@ class AnalyticsConventionPlugin : Plugin<Project> {
 
             plugins.withId("com.google.firebase.crashlytics") {
                 tasks.configureEach {
-                    if (name.contains("fdroid", ignoreCase = true)) {
+                    if (name.contains("Crashlytics", ignoreCase = true) && name.contains("fdroid", ignoreCase = true)) {
                         enabled = false
                     }
                 }
@@ -66,7 +66,7 @@ class AnalyticsConventionPlugin : Plugin<Project> {
 
             plugins.withId("com.datadoghq.dd-sdk-android-gradle-plugin") {
                 tasks.configureEach {
-                    if (name.contains("fdroid", ignoreCase = true)) {
+                    if ((name.contains("datadog", ignoreCase = true) || name.contains("uploadMapping", ignoreCase = true)) && name.contains("fdroid", ignoreCase = true)) {
                         enabled = false
                     }
                 }