diff --git a/gradle.properties b/gradle.properties
index 08293866a8d..18399ccf06c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -41,7 +41,7 @@ signing.element.nightly.keyPassword=Secret
 
 # Customise the Lint version to use a more recent version than the one bundled with AGP
 # https://googlesamples.github.io/android-custom-lint-rules/usage/newer-lint.md.html
-android.experimental.lint.version=8.12.2
+# android.experimental.lint.version=8.12.2
 
 # Enable test fixture for all modules by default
 android.experimental.enableTestFixtures=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b5dc5ecd558..0825c5049e0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,8 @@
 
 [versions]
 # Project
-android_gradle_plugin = "8.12.2"
+# We cannot use 8.12.+ since it breaks F-Droid build (see https://github.com/element-hq/element-x-android/issues/3420#issuecomment-3199571010)
+android_gradle_plugin = "8.11.1"
 # When updateing this, please also update the version in the file ./idea/kotlinc.xml
 kotlin = "2.2.10"
 kotlinpoet = "2.2.0"