diff --git a/.github/workflows/run-check.yml b/.github/workflows/run-check.yml
index c0a7fd574..d7540d20e 100644
--- a/.github/workflows/run-check.yml
+++ b/.github/workflows/run-check.yml
@@ -37,7 +37,7 @@ jobs:
       - name: Build and Run Check
         # Run checks while excluding release-build tests, which are not configured to work properly
         # with the Compose testing library.
-        run: ./gradlew check -x testRelease koverXmlReportDebug
+        run: ./gradlew check -x testStandardRelease -x testFdroidRelease koverXmlReportStandardDebug
 
       - name: Danger
         env:
diff --git a/Dangerfile b/Dangerfile
index 188a5eec6..abc75df1a 100644
--- a/Dangerfile
+++ b/Dangerfile
@@ -1 +1 @@
-shroud.reportKover 'App', 'app/build/reports/kover/reportDebug.xml', 80, 80, false
+shroud.reportKover 'App', 'app/build/reports/kover/reportStandardDebug.xml', 80, 80, false
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index bc8a67ecd..9f7d06e28 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -49,6 +49,17 @@ android {
             )
         }
     }
+
+    flavorDimensions += listOf("mode")
+    productFlavors {
+        create("standard") {
+            dimension = "mode"
+        }
+        create("fdroid") {
+            dimension = "mode"
+        }
+    }
+
     compileOptions {
         sourceCompatibility(libs.versions.jvmTarget.get())
         targetCompatibility(libs.versions.jvmTarget.get())