diff --git a/android/plugins/leakcanary2/build.gradle b/android/plugins/leakcanary2/build.gradle
index bfc6c47a2..32193b02c 100644
--- a/android/plugins/leakcanary2/build.gradle
+++ b/android/plugins/leakcanary2/build.gradle
@@ -20,7 +20,7 @@ android {
     }
 
     dependencies {
-        compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION"
+        compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
         implementation project(':android')
         compileOnly deps.leakcanary2
         compileOnly deps.jsr305
diff --git a/android/plugins/retrofit2-protobuf/build.gradle b/android/plugins/retrofit2-protobuf/build.gradle
index e0efdc12c..6e772bfd8 100644
--- a/android/plugins/retrofit2-protobuf/build.gradle
+++ b/android/plugins/retrofit2-protobuf/build.gradle
@@ -20,7 +20,7 @@ android {
     }
 
     dependencies {
-        implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION"
+        implementation "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
         implementation project(':android')
         implementation project(':network-plugin')
         implementation deps.protobuf
diff --git a/android/tutorial/build.gradle b/android/tutorial/build.gradle
index 3e30f807d..11a588072 100644
--- a/android/tutorial/build.gradle
+++ b/android/tutorial/build.gradle
@@ -39,7 +39,7 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
     implementation "androidx.appcompat:appcompat:1.4.1"
     implementation "androidx.core:core-ktx:1.8.0"
 
diff --git a/build.gradle b/build.gradle
index 1e847855a..6ba047029 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,7 +54,7 @@ ext {
 
 ext.deps = [
         // Kotlin support
-        kotlinStdLibrary   : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION",
+        kotlinStdLibrary   : "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION",
         kotlinCoroutinesAndroid : "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4",
         // Android support
         supportAnnotations : "androidx.annotation:annotation:$ANDROIDX_VERSION",
diff --git a/gradle.properties b/gradle.properties
index d6753cf50..ab7a51f31 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,7 +26,7 @@ KOTLIN_VERSION=1.6.20
 # Gradle internals
 org.gradle.internal.repository.max.retries=10
 org.gradle.internal.repository.initial.backoff=1250
-org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
+org.gradle.jvmargs=-Xmx2g -Xms512m -XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled
 systemProp.org.gradle.internal.http.connectionTimeout=120000
 systemProp.org.gradle.internal.http.socketTimeout=120000