diff --git a/platform/android/MapLibreAndroid/build.gradle b/platform/android/MapLibreAndroid/build.gradle
index 95701d360..9e8fa0888 100644
--- a/platform/android/MapLibreAndroid/build.gradle
+++ b/platform/android/MapLibreAndroid/build.gradle
@@ -126,10 +126,15 @@ android {
     buildFeatures {
         buildConfig true
     }
-}
 
-kotlin {
-    jvmToolchain(17)
+    compileOptions {
+        sourceCompatibility = 11
+        targetCompatibility = 11
+    }
+
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 licenseReport {
diff --git a/platform/android/gradle/libs.versions.toml b/platform/android/gradle/libs.versions.toml
index 544758c4b..d9a0cf51b 100644
--- a/platform/android/gradle/libs.versions.toml
+++ b/platform/android/gradle/libs.versions.toml
@@ -1,6 +1,5 @@
 [versions]
 mapLibreServices = "6.0.1"
-maplibreGestures = "0.0.1"
 appCompat = "1.7.0"
 constraintLayout = "2.1.4"
 interpolator = "1.0.0"
@@ -40,7 +39,7 @@ kotlinxCoroutinesCore = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-cor
 kotlinxCoroutinesTest = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutines" }
 kotlinxCoroutinesAndroid = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" }
 maplibreJavaGeoJSON = { group = "org.maplibre.gl", name = "android-sdk-geojson", version.ref = "mapLibreServices" }
-maplibreGestures = { group = "org.maplibre.gl", name = "maplibre-android-gestures", version.ref = "maplibreGestures" }
+maplibreGestures = { group = "org.maplibre.gl", name = "maplibre-android-gestures", version = "0.0.3" }
 maplibreJavaTurf = { group = "org.maplibre.gl", name = "android-sdk-turf", version.ref = "mapLibreServices" }
 
 junit = { group = "junit", name = "junit", version.ref = "junit" }
diff --git a/platform/android/settings.gradle b/platform/android/settings.gradle
index afd803053..3fff1e300 100644
--- a/platform/android/settings.gradle
+++ b/platform/android/settings.gradle
@@ -1,3 +1,7 @@
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+}
+
 include ':MapLibreAndroid', ':MapLibreAndroidTestApp', ':MapLibreAndroidLint'
 
 rootProject.name = "MapLibre Native for Android"
diff --git a/render-test/android/settings.gradle b/render-test/android/settings.gradle
index ae45cfc13..fcc7a2492 100644
--- a/render-test/android/settings.gradle
+++ b/render-test/android/settings.gradle
@@ -1,3 +1,7 @@
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+}
+
 rootProject.name = "androidRenderTest"
 
 include ":app"
\ No newline at end of file
diff --git a/test/android/settings.gradle b/test/android/settings.gradle
index b9725fc93..ef689b098 100644
--- a/test/android/settings.gradle
+++ b/test/android/settings.gradle
@@ -1,3 +1,7 @@
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+}
+
 rootProject.name = "androidCppUnitTests"
 
 include ':app'