diff --git a/apps/flipcash/app/build.gradle.kts b/apps/flipcash/app/build.gradle.kts
index a93d9373c..0b018dfcd 100644
--- a/apps/flipcash/app/build.gradle.kts
+++ b/apps/flipcash/app/build.gradle.kts
@@ -14,11 +14,17 @@ plugins {
     alias(libs.plugins.firebase.perf)
     alias(libs.plugins.bugsnag.gradle)
     alias(libs.plugins.secrets)
-    alias(libs.plugins.versioning)
     id("org.jetbrains.kotlin.plugin.compose")
     alias(libs.plugins.kover)
 }
 
+fun gitVersionCode(): Int {
+    val result = providers.exec {
+        commandLine("git", "rev-list", "--count", "HEAD")
+    }.standardOutput.asText.get().trim()
+    return result.toInt().also { println("VersionCode $it") }
+}
+
 val contributorsSigningConfig = ContributorsSignatory(rootProject)
 val appNamespace = "${Gradle.flipcashNamespace}.app.android"
 
@@ -28,7 +34,7 @@ android {
     compileSdk = Android.compileSdkVersion
 
     defaultConfig {
-        versionCode = Packaging.Flipcash.versionCode ?: versioning.getVersionCode()
+        versionCode = Packaging.Flipcash.versionCode ?: gitVersionCode()
         versionName = Packaging.Flipcash.versionName
         applicationId = appNamespace
         minSdk = Android.minSdkVersion
@@ -54,6 +60,7 @@ android {
     buildFeatures {
         buildConfig = true
         compose = true
+        resValues = true
     }
 
     buildTypes {
@@ -101,11 +108,6 @@ configurations.all {
     exclude(group = "com.google.firebase", module = "firebase-crashlytics")
 }
 
-versioning {
-    excludeBuildTypes = "debug"
-    keepOriginalBundleFile = true
-}
-
 bugsnag {
     variants {
         release {
diff --git a/build.gradle.kts b/build.gradle.kts
index 5de7b82cf..4fc8ea41d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -29,7 +29,6 @@ plugins {
     alias(libs.plugins.bugsnag.android) apply false
     alias(libs.plugins.bugsnag.gradle) apply false
     alias(libs.plugins.secrets) apply false
-    alias(libs.plugins.versioning) apply false
     alias(libs.plugins.navigation.safeargs) apply false
     alias(libs.plugins.protobuf) apply false
     alias(libs.plugins.androidx.room) apply false
diff --git a/gradle.properties b/gradle.properties
index 72118171d..b4a1e5c7e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -36,4 +36,9 @@ android.nonTransitiveRClass=false
 android.defaults.buildfeatures.usestaticrclass=true
 # Enables Kotlin compilation for Android testFixtures source sets
 android.experimental.enableTestFixturesKotlinSupport=true
-android.suppressUnsupportedOptionWarnings=android.suppressUnsupportedOptionWarnings,android.experimental.enableTestFixturesKotlinSupport
\ No newline at end of file
+android.suppressUnsupportedOptionWarnings=android.suppressUnsupportedOptionWarnings,android.experimental.enableTestFixturesKotlinSupport
+android.uniquePackageNames=false
+android.dependency.useConstraints=true
+android.r8.strictFullModeForKeepRules=false
+android.builtInKotlin=false
+android.newDsl=false
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 83dfea930..190f4577b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ kotlinx-serialization = "1.11.0"
 kotlinx-datetime = "0.7.1"
 
 kover = "0.9.8"
-agp = "8.9.3"
+agp = "9.1.1"
 google-services = "4.4.4"
 
 androidx-appcompat = "1.7.1"
@@ -97,7 +97,6 @@ archCore = "2.2.0"
 screenshot = "0.0.1-alpha14"
 
 secrets-gradle-plugin = "2.0.1"
-versioning-gradle-plugin = "2.4.0"
 firebase-perf-plugin = "2.0.2"
 uiToolingPreview = "1.11.0"
 uiTooling = "1.11.0"
@@ -334,7 +333,6 @@ firebase-perf = { id = "com.google.firebase.firebase-perf", version.ref = "fireb
 bugsnag-android = { id = "com.bugsnag.android.gradle", version.ref = "bugsnag-agp" }
 bugsnag-gradle = { id = "com.bugsnag.gradle", version.ref = "bugsnag-gradle-plugin" }
 secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secrets-gradle-plugin" }
-versioning = { id = "de.nanogiants.android-versioning", version.ref = "versioning-gradle-plugin" }
 navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "androidx-navigation" }
 protobuf = { id = "com.google.protobuf", version.ref = "protobuf-plugin" }
 androidx-room = { id = "androidx.room", version.ref = "androidx-room" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e427f2fec..336219e78 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue May 13 10:46:03 EDT 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/vendor/opencv/sdk/build.gradle b/vendor/opencv/sdk/build.gradle
index 7ae218d8b..b9ee98119 100644
--- a/vendor/opencv/sdk/build.gradle
+++ b/vendor/opencv/sdk/build.gradle
@@ -110,8 +110,6 @@ android {
         minSdkVersion Android.minSdkVersion
         targetSdkVersion Android.targetSdkVersion
 
-        versionCode openCVersionCode
-        versionName openCVersionName
 
         externalNativeBuild {
             cmake {
@@ -142,7 +140,7 @@ android {
                 doNotStrip '**/*.so'  // controlled by OpenCV CMake scripts
             }
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.txt'
         }
     }