diff --git a/apps/mobile/native/android/app/build.gradle b/apps/mobile/native/android/app/build.gradle
index 065b696f6..a51efc12a 100644
--- a/apps/mobile/native/android/app/build.gradle
+++ b/apps/mobile/native/android/app/build.gradle
@@ -139,6 +139,11 @@ def reactNativeArchitectures() {
     return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
 
+def fdroidBuild() {
+    def value = project.getProperties().get("fdroidBuild")
+    return value ? value : false
+}
+
 def getNpmVersion() {
     def inputFile = file("$rootDir/../../package.json")
     def jsonPackage = new JsonSlurper().parseText(inputFile.text)
@@ -280,18 +285,20 @@ android {
             def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
-                output.versionCodeOverride =
+                if (fdroidBuild()) {
+                    output.versionCodeOverride =
+                       defaultConfig.versionCode * 5 + versionCodes.get(abi)
+                    println("Version code: ${output.versionCodeOverride} for abi ${versionCodes.get(abi)}");
+                } else {
+                    output.versionCodeOverride =
                         versionCodes.get(abi) * 1048576 + defaultConfig.versionCode
+                }
+                
             }
 
         }
     }
 
-    
-    
-
-
-
 }
 
 dependencies {
diff --git a/apps/mobile/native/android/gradle.properties b/apps/mobile/native/android/gradle.properties
index e4f5d1d31..fc1dd323c 100644
--- a/apps/mobile/native/android/gradle.properties
+++ b/apps/mobile/native/android/gradle.properties
@@ -42,4 +42,7 @@ newArchEnabled=false
 
 # V8 Cache Mode Config
 # v8.cacheMode=none
-# v8.android.tools.dir=/home/ammarahm-ed/Repos/notesnook-mobile/node_modules/v8-android-jit-nointl/dist/tools/android
\ No newline at end of file
+# v8.android.tools.dir=/home/ammarahm-ed/Repos/notesnook-mobile/node_modules/v8-android-jit-nointl/dist/tools/android
+
+# fdroid
+fdroidBuild=false
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/10139.txt b/fastlane/metadata/android/en-US/changelogs/10139.txt
new file mode 100644
index 000000000..c41a5dc8c
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/10139.txt
@@ -0,0 +1,3 @@
+- Bug fixes
+
+Thank you for using Notesnook!
\ No newline at end of file