diff --git a/cli/build.gradle.kts b/cli/build.gradle.kts
index 897819c0c44fb..7c84ced190c62 100644
--- a/cli/build.gradle.kts
+++ b/cli/build.gradle.kts
@@ -41,12 +41,13 @@ graal {
     graalVersion(libs.versions.graal.get())
     javaVersion("17")
 
+    // Build a standalone native executable or report a failure.
     option("--no-fallback")
 
     // Work-around for:
-    // "com.oracle.graal.pointsto.constraints.UnresolvedElementException:
-    //  Discovered unresolved type during parsing: android.os.Build$VERSION"
-    option("--allow-incomplete-classpath")
+    // "WARNING: Unknown module: org.graalvm.nativeimage.llvm specified to --add-exports"
+    option("-J--add-modules")
+    option("-JALL-SYSTEM")
 
     // Work-around for:
     // "Error: Classes that should be initialized at run time got initialized during image building"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1d356aebbde0b..73fd1c3fdbd29 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -28,7 +28,7 @@ exposed = "0.38.2"
 flexmark = "0.64.0"
 freemarker = "2.3.31"
 # @keep this version which is only being used via get().
-graal = "22.1.0"
+graal = "22.2.0"
 greenmail = "1.6.9"
 hikari = "5.0.1"
 hoplite = "2.4.0"