diff --git a/.cirrus.yml b/.cirrus.yml
index da569ddb5..db71123fc 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -6,7 +6,7 @@ check_android_30_task:
   skip: "changesIncludeOnly('NOTICE.txt', 'LICENSE.txt', '**.{md,html}')"
 
   container:
-    image: ghcr.io/cirruslabs/android-sdk:34
+    image: ghcr.io/cirruslabs/android-sdk:36
     kvm: true
     cpu: 8
     memory: 24G
@@ -75,7 +75,7 @@ check_android_33_task:
   skip: "changesIncludeOnly('NOTICE.txt', 'LICENSE.txt', '**.{md,html}')"
 
   container:
-    image: ghcr.io/cirruslabs/android-sdk:34
+    image: ghcr.io/cirruslabs/android-sdk:36
     kvm: true
     cpu: 8
     memory: 24G
@@ -140,7 +140,7 @@ check_android_21_task:
   skip: "changesIncludeOnly('NOTICE.txt', 'LICENSE.txt', '**.{md,html}')"
 
   container:
-    image: ghcr.io/cirruslabs/android-sdk:34
+    image: ghcr.io/cirruslabs/android-sdk:36
     kvm: true
     cpu: 8
     memory: 24G
diff --git a/gradle.properties b/gradle.properties
index 737f17116..a162d3ba6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 org.gradle.caching=true
 
diff --git a/tutorial/build.gradle.kts b/tutorial/build.gradle.kts
index 5844ddda6..6bbe00bce 100644
--- a/tutorial/build.gradle.kts
+++ b/tutorial/build.gradle.kts
@@ -24,7 +24,7 @@ android {
 
     java {
         toolchain {
-            languageVersion.set(JavaLanguageVersion.of(11))
+            languageVersion.set(JavaLanguageVersion.of(17))
         }
     }
 }