diff --git a/backdrop/build.gradle.kts b/backdrop/build.gradle.kts
index e07c802..e2b048d 100644
--- a/backdrop/build.gradle.kts
+++ b/backdrop/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -23,17 +21,8 @@ android {
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
-    }
     kotlin {
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_21
-            freeCompilerArgs.addAll(
-                "-jvm-default=no-compatibility",
-            )
-        }
+        jvmToolchain(21)
     }
     buildFeatures {
         compose = true
diff --git a/catalog/build.gradle.kts b/catalog/build.gradle.kts
index b34bfd3..51bd7e4 100644
--- a/catalog/build.gradle.kts
+++ b/catalog/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
@@ -28,15 +26,10 @@ android {
             vcsInfo.include = false
         }
     }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
-    }
     kotlin {
+        jvmToolchain(21)
         compilerOptions {
-            jvmTarget = JvmTarget.JVM_21
             freeCompilerArgs.addAll(
-                "-jvm-default=no-compatibility",
                 "-Xlambdas=class"
             )
         }