diff --git a/apps/flipcash/app/build.gradle.kts b/apps/flipcash/app/build.gradle.kts
index 03be09caa..321bfc974 100644
--- a/apps/flipcash/app/build.gradle.kts
+++ b/apps/flipcash/app/build.gradle.kts
@@ -46,7 +46,11 @@ val skipExpensiveReleaseTasks = providers.gradleProperty("skipExpensiveReleaseTa
 android {
     // static namespace
     namespace = appNamespace
-    compileSdk = libs.versions.android.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.android.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.android.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         versionCode = Packaging.Flipcash.versionCode ?: gitVersionCode()
diff --git a/apps/flipcash/benchmark/build.gradle.kts b/apps/flipcash/benchmark/build.gradle.kts
index a70dd8008..a6f6a0291 100644
--- a/apps/flipcash/benchmark/build.gradle.kts
+++ b/apps/flipcash/benchmark/build.gradle.kts
@@ -7,7 +7,11 @@ val contributorsSigningConfig = ContributorsSignatory(rootDir)
 
 android {
     namespace = "com.flipcash.benchmark"
-    compileSdk = libs.versions.android.compileSdk.get().toInt()
+    compileSdk {
+        version = release(libs.versions.android.compileSdk.get().toInt()) {
+            minorApiLevel = libs.versions.android.compileSdkMinor.get().toInt()
+        }
+    }
 
     defaultConfig {
         minSdk = 29
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
index ef11545d9..afeed6c4f 100644
--- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@@ -25,11 +25,16 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
 
             val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
             val compileSdkVersion = libs.findVersion("android-compileSdk").get().requiredVersion.toInt()
+            val compileSdkMinorVersion = libs.findVersion("android-compileSdkMinor").get().requiredVersion.toInt()
             val minSdkVersion = libs.findVersion("android-minSdk").get().requiredVersion.toInt()
             val javaVersion = libs.findVersion("android-java").get().requiredVersion
 
             extensions.configure<LibraryExtension> {
-                compileSdk = compileSdkVersion
+                compileSdk {
+                    version = release(compileSdkVersion) {
+                        minorApiLevel = compileSdkMinorVersion
+                    }
+                }
 
                 defaultConfig {
                     minSdk = minSdkVersion
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 03f82a95f..a3a4f73a9 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,6 @@
 [versions]
 android-compileSdk = "37"
+android-compileSdkMinor = "2"
 android-minSdk = "29"
 android-targetSdk = "37"
 android-java = "21"
diff --git a/kmp/shared-core/build.gradle.kts b/kmp/shared-core/build.gradle.kts
index fa9490a92..32f46615f 100644
--- a/kmp/shared-core/build.gradle.kts
+++ b/kmp/shared-core/build.gradle.kts
@@ -24,7 +24,11 @@ val spmPackageDir = findProperty("spmRepoDir") as String?
 kotlin {
     android {
         namespace = "com.flipcash.shared"
-        compileSdk = 37
+        compileSdk {
+            version = release(libs.versions.android.compileSdk.get().toInt()) {
+                minorApiLevel = libs.versions.android.compileSdkMinor.get().toInt()
+            }
+        }
         minSdk = 29
     }
     
diff --git a/libs/codes/kikcode/build.gradle.kts b/libs/codes/kikcode/build.gradle.kts
index c108aeb86..b2d926844 100644
--- a/libs/codes/kikcode/build.gradle.kts
+++ b/libs/codes/kikcode/build.gradle.kts
@@ -13,7 +13,11 @@ testFixtures {
 kotlin {
     android {
         namespace = "com.getcode.codes.kikcode"
-        compileSdk = 37
+        compileSdk {
+            version = release(libs.versions.android.compileSdk.get().toInt()) {
+                minorApiLevel = libs.versions.android.compileSdkMinor.get().toInt()
+            }
+        }
         minSdk = 29
         withHostTest {}
     }
diff --git a/libs/encryption/base58/build.gradle.kts b/libs/encryption/base58/build.gradle.kts
index 01b0d3880..143d07f8f 100644
--- a/libs/encryption/base58/build.gradle.kts
+++ b/libs/encryption/base58/build.gradle.kts
@@ -13,7 +13,11 @@ testFixtures {
 kotlin {
     android {
         namespace = "com.getcode.encryption.base58"
-        compileSdk = 37
+        compileSdk {
+            version = release(libs.versions.android.compileSdk.get().toInt()) {
+                minorApiLevel = libs.versions.android.compileSdkMinor.get().toInt()
+            }
+        }
         minSdk = 29
         withHostTest {}
     }
diff --git a/libs/encryption/ed25519/build.gradle.kts b/libs/encryption/ed25519/build.gradle.kts
index fd2ef0fae..38a7c5cec 100644
--- a/libs/encryption/ed25519/build.gradle.kts
+++ b/libs/encryption/ed25519/build.gradle.kts
@@ -75,7 +75,11 @@ appleTargetDefs.forEach { target ->
 kotlin {
     android {
         namespace = "com.getcode.encryption.ed25519"
-        compileSdk = 37
+        compileSdk {
+            version = release(libs.versions.android.compileSdk.get().toInt()) {
+                minorApiLevel = libs.versions.android.compileSdkMinor.get().toInt()
+            }
+        }
         minSdk = 29
         withHostTest {}
     }
diff --git a/libs/encryption/hmac/build.gradle.kts b/libs/encryption/hmac/build.gradle.kts
index 9bf5f8b55..258a914a1 100644
--- a/libs/encryption/hmac/build.gradle.kts
+++ b/libs/encryption/hmac/build.gradle.kts
@@ -6,7 +6,11 @@ plugins {
 kotlin {
     android {
         namespace = "com.getcode.encryption.hmac"
-        compileSdk = 37
+        compileSdk {
+            version = release(libs.versions.android.compileSdk.get().toInt()) {
+                minorApiLevel = libs.versions.android.compileSdkMinor.get().toInt()
+            }
+        }
         minSdk = 29
         withHostTest {}
     }
diff --git a/libs/encryption/mnemonic/build.gradle.kts b/libs/encryption/mnemonic/build.gradle.kts
index fe1049a4f..fa0c0dd62 100644
--- a/libs/encryption/mnemonic/build.gradle.kts
+++ b/libs/encryption/mnemonic/build.gradle.kts
@@ -13,7 +13,11 @@ testFixtures {
 kotlin {
     android {
         namespace = "com.getcode.encryption.mnemonic"
-        compileSdk = 37
+        compileSdk {
+            version = release(libs.versions.android.compileSdk.get().toInt()) {
+                minorApiLevel = libs.versions.android.compileSdkMinor.get().toInt()
+            }
+        }
         minSdk = 29
         withHostTest {}
         withDeviceTest {}
diff --git a/libs/encryption/sha256/build.gradle.kts b/libs/encryption/sha256/build.gradle.kts
index b6a586a0b..adfcd4938 100644
--- a/libs/encryption/sha256/build.gradle.kts
+++ b/libs/encryption/sha256/build.gradle.kts
@@ -6,7 +6,11 @@ plugins {
 kotlin {
     android {
         namespace = "com.getcode.encryption.sha256"
-        compileSdk = 37
+        compileSdk {
+            version = release(libs.versions.android.compileSdk.get().toInt()) {
+                minorApiLevel = libs.versions.android.compileSdkMinor.get().toInt()
+            }
+        }
         minSdk = 29
         withHostTest {}
     }
diff --git a/libs/encryption/sha512/build.gradle.kts b/libs/encryption/sha512/build.gradle.kts
index cc1432385..038470ad6 100644
--- a/libs/encryption/sha512/build.gradle.kts
+++ b/libs/encryption/sha512/build.gradle.kts
@@ -6,7 +6,11 @@ plugins {
 kotlin {
     android {
         namespace = "com.getcode.encryption.sha512"
-        compileSdk = 37
+        compileSdk {
+            version = release(libs.versions.android.compileSdk.get().toInt()) {
+                minorApiLevel = libs.versions.android.compileSdkMinor.get().toInt()
+            }
+        }
         minSdk = 29
         withHostTest {}
     }
diff --git a/libs/encryption/utils/build.gradle.kts b/libs/encryption/utils/build.gradle.kts
index b6da12b8d..6b5bc632f 100644
--- a/libs/encryption/utils/build.gradle.kts
+++ b/libs/encryption/utils/build.gradle.kts
@@ -6,7 +6,11 @@ plugins {
 kotlin {
     android {
         namespace = "com.getcode.encryption.utils"
-        compileSdk = 37
+        compileSdk {
+            version = release(libs.versions.android.compileSdk.get().toInt()) {
+                minorApiLevel = libs.versions.android.compileSdkMinor.get().toInt()
+            }
+        }
         minSdk = 29
         withHostTest {}
     }