diff --git a/plugins/NDK-Installer/build.gradle.kts b/plugins/NDK-Installer/build.gradle.kts
index 63dbd404..0d9ad4e7 100644
--- a/plugins/NDK-Installer/build.gradle.kts
+++ b/plugins/NDK-Installer/build.gradle.kts
@@ -24,8 +24,8 @@ android {
         applicationId = "org.appdevforall.ndkinstaller"
         minSdk = 26
         targetSdk = 36
-        versionCode = 2
-        versionName = "1.1.0"
+        versionCode = 3
+        versionName = "1.1.1"
     }
 
     buildTypes {
diff --git a/plugins/NDK-Installer/src/main/assets/templates/ndk/app/build.gradle.kts.peb b/plugins/NDK-Installer/src/main/assets/templates/ndk/app/build.gradle.kts.peb
index 1c4e1b3d..ced0de35 100644
--- a/plugins/NDK-Installer/src/main/assets/templates/ndk/app/build.gradle.kts.peb
+++ b/plugins/NDK-Installer/src/main/assets/templates/ndk/app/build.gradle.kts.peb
@@ -3,9 +3,6 @@ import java.io.FileInputStream
 
 plugins {
 id("com.android.application") version "${{AGP_VERSION}}" 
-${% if LANGUAGE == 'kotlin' %}
-        kotlin("android") version "${{KOTLIN_VERSION}}"
-${% endif %} 
 }
 
 val keystorePropsFile = rootProject.file("release.properties")
@@ -136,10 +133,10 @@ android {
     
     configurations.all {
         resolutionStrategy {
-            // Force the use of Kotlin stdlib 1.9.22 for all modules
-            force("org.jetbrains.kotlin:kotlin-stdlib:1.9.22")
-            force("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.22")
-            force("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.22")
+            // Force the use of Kotlin stdlib for all modules
+            force("org.jetbrains.kotlin:kotlin-stdlib:${{KOTLIN_VERSION}}")
+            force("org.jetbrains.kotlin:kotlin-stdlib-jdk7:${{KOTLIN_VERSION}}")
+            force("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${{KOTLIN_VERSION}}")
     
             // Force specific AndroidX versions to avoid conflicts
             force("androidx.collection:collection:1.4.2")
@@ -157,9 +154,11 @@ tasks.withType<JavaCompile> {
 
 
 ${% if LANGUAGE == 'kotlin' %}
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-      kotlinOptions.jvmTarget = "${{JAVA_TARGET}}"
+kotlin {
+    compilerOptions {
+        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget("${{JAVA_TARGET}}"))
     }
+}
 ${% endif %}
 
 dependencies {
diff --git a/plugins/NDK-Installer/src/main/assets/templates/ndk/build.gradle.kts.peb b/plugins/NDK-Installer/src/main/assets/templates/ndk/build.gradle.kts.peb
index 77c988b8..1d603c39 100644
--- a/plugins/NDK-Installer/src/main/assets/templates/ndk/build.gradle.kts.peb
+++ b/plugins/NDK-Installer/src/main/assets/templates/ndk/build.gradle.kts.peb
@@ -1,4 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${{KOTLIN_VERSION}}")
+    }
+}
+
 plugins {
     id("com.android.application") apply false version "${{AGP_VERSION}}"
     id("com.android.library") apply false version "${{AGP_VERSION}}"