diff --git a/JetLagged/app/build.gradle.kts b/JetLagged/app/build.gradle.kts
index 9406732898..4103207250 100644
--- a/JetLagged/app/build.gradle.kts
+++ b/JetLagged/app/build.gradle.kts
@@ -68,15 +68,15 @@ android {
             isDebuggable = false
         }
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = "17"
-    }
     buildFeatures {
         compose = true
         // Disable unused AGP features
diff --git a/JetNews/app/build.gradle.kts b/JetNews/app/build.gradle.kts
index f8bb76ed57..f9552acad3 100644
--- a/JetNews/app/build.gradle.kts
+++ b/JetNews/app/build.gradle.kts
@@ -59,6 +59,9 @@ android {
                     "proguard-rules.pro")
         }
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
@@ -77,10 +80,6 @@ android {
     }
 }
 
-kotlin {
-    jvmToolchain(17)
-}
-
 dependencies {
     val composeBom = platform(libs.androidx.compose.bom)
     implementation(composeBom)
diff --git a/Jetcaster/core/domain-testing/build.gradle.kts b/Jetcaster/core/domain-testing/build.gradle.kts
index 28c64e5809..19d9964324 100644
--- a/Jetcaster/core/domain-testing/build.gradle.kts
+++ b/Jetcaster/core/domain-testing/build.gradle.kts
@@ -23,15 +23,16 @@ android {
             )
         }
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
 }
-kotlin {
-    jvmToolchain(17)
-}
+
 dependencies {
     implementation(projects.core.domain)
 
diff --git a/Jetcaster/core/domain/build.gradle.kts b/Jetcaster/core/domain/build.gradle.kts
index a6803eda2b..bca3291357 100644
--- a/Jetcaster/core/domain/build.gradle.kts
+++ b/Jetcaster/core/domain/build.gradle.kts
@@ -25,15 +25,16 @@ android {
             )
         }
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
 }
-kotlin {
-    jvmToolchain(17)
-}
+
 dependencies {
     coreLibraryDesugaring(libs.core.jdk.desugaring)
     implementation(projects.core.data)
diff --git a/Jetcaster/glancewidget/build.gradle.kts b/Jetcaster/glancewidget/build.gradle.kts
index 28810bc577..bbcdbc36c5 100644
--- a/Jetcaster/glancewidget/build.gradle.kts
+++ b/Jetcaster/glancewidget/build.gradle.kts
@@ -24,7 +24,9 @@ android {
         compose = true
         buildConfig = true
     }
-
+    kotlinOptions {
+        jvmTarget = "17"
+    }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
@@ -36,9 +38,6 @@ android {
         }
     }
 }
-kotlin {
-    jvmToolchain(17)
-}
 
 dependencies {
 
diff --git a/Jetcaster/tv/build.gradle.kts b/Jetcaster/tv/build.gradle.kts
index 8a17d596a9..3ff7ae7b46 100644
--- a/Jetcaster/tv/build.gradle.kts
+++ b/Jetcaster/tv/build.gradle.kts
@@ -61,6 +61,9 @@ android {
             )
         }
     }
+    kotlinOptions {
+        jvmTarget = "17"
+    }
 
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
@@ -81,9 +84,7 @@ android {
         }
     }
 }
-kotlin {
-    jvmToolchain(17)
-}
+
 
 dependencies {
     implementation(libs.androidx.core.ktx)
diff --git a/Jetcaster/wear/build.gradle b/Jetcaster/wear/build.gradle
index 4b10f6f8e8..3142eacf67 100644
--- a/Jetcaster/wear/build.gradle
+++ b/Jetcaster/wear/build.gradle
@@ -54,6 +54,7 @@ android {
             includeAndroidResources true
         }
     }
+    
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_17.majorVersion
         freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn"
@@ -62,6 +63,7 @@ android {
     buildFeatures {
         compose true
     }
+    
     packagingOptions {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
@@ -69,9 +71,7 @@ android {
         }
     }
 }
-kotlin {
-    jvmToolchain(17)
-}
+
 dependencies {
 
 
diff --git a/Jetchat/app/build.gradle.kts b/Jetchat/app/build.gradle.kts
index f23f12439e..73855d119b 100644
--- a/Jetchat/app/build.gradle.kts
+++ b/Jetchat/app/build.gradle.kts
@@ -61,6 +61,9 @@ android {
         }
     }
 
+    kotlinOptions {
+        jvmTarget = "17"
+    }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
@@ -79,9 +82,6 @@ android {
     }
 }
 
-kotlin {
-    jvmToolchain(17)
-}
 dependencies {
     val composeBom = platform(libs.androidx.compose.bom)
     implementation(composeBom)
diff --git a/Jetsnack/app/build.gradle.kts b/Jetsnack/app/build.gradle.kts
index dd57a40578..6bf85b3809 100644
--- a/Jetsnack/app/build.gradle.kts
+++ b/Jetsnack/app/build.gradle.kts
@@ -73,13 +73,14 @@ android {
         }
     }
 
+    kotlinOptions {
+        jvmTarget = "17"
+    }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions { jvmTarget = "17" }
-
     buildFeatures {
         compose = true
     }
diff --git a/Reply/app/build.gradle.kts b/Reply/app/build.gradle.kts
index 7f9264dbcf..fe425fde09 100644
--- a/Reply/app/build.gradle.kts
+++ b/Reply/app/build.gradle.kts
@@ -93,9 +93,6 @@ android {
         compose = true
     }
 }
-kotlin {
-    jvmToolchain(17)
-}
 
 dependencies {
     val composeBom = platform(libs.androidx.compose.bom)