diff --git a/.circleci/script/gen_ci.clj b/.circleci/script/gen_ci.clj
index 883bdf82..7fadc293 100644
--- a/.circleci/script/gen_ci.clj
+++ b/.circleci/script/gen_ci.clj
@@ -5,7 +5,7 @@
     [clojure.string :as str]
     [flatland.ordered.map :refer [ordered-map]]))
 
-(def graalvm-version "21.0.2")
+(def graalvm-version "22")
 
 (defn run
   ([cmd-name cmd]
@@ -122,7 +122,7 @@ java -jar \"$jar\" --config .build/bb.edn --deps-root . release-artifact \"$refl
 (defn unix
   [shorted? static? musl? arch executor-conf resource-class graalvm-home platform]
   (let [env              {:LEIN_ROOT         "true"
-                          :GRAALVM_VERSION   "21.0.2"
+                          :GRAALVM_VERSION   graalvm-version
                           :GRAALVM_HOME      graalvm-home
                           :BABASHKA_PLATFORM (if (= "mac" platform)
                                                "macos"
diff --git a/.cirrus.yml b/.cirrus.yml
index fb50a001..270c6925 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -5,7 +5,7 @@ task:
   skip: "changesIncludeOnly('logo/*', '**.md')"
   env:
     LEIN_ROOT: "true"
-    GRAALVM_VERSION: "21.0.2"
+    GRAALVM_VERSION: "22"
     GRAALVM_HOME: ${HOME}/graalvm-${GRAALVM_VERSION}/Contents/Home
     BABASHKA_PLATFORM: macos # used in release script
     BABASHKA_ARCH: aarch64
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b74bdbf4..5f35f824 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -102,7 +102,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       LEIN_ROOT: "true"
-      GRAALVM_VERSION: "21.0.2"
+      GRAALVM_VERSION: "22"
       BABASHKA_PLATFORM: ${{ matrix.name }} # used in release script
       BABASHKA_TEST_ENV: native
       BABASHKA_XMX: "-J-Xmx6500m"
@@ -126,7 +126,7 @@ jobs:
         if: "matrix.static == false"
         uses: graalvm/setup-graalvm@v1
         with:
-          java-version: '21.0.2'
+          java-version: '22'
           distribution: 'graalvm'
           components: 'native-image'
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -135,7 +135,7 @@ jobs:
         if: "matrix.static == true"
         uses: graalvm/setup-graalvm@v1
         with:
-          version: '21.0.2'
+          version: '22'
           distribution: 'graalvm'
           components: 'native-image'
           native-image-musl: true
diff --git a/Dockerfile b/Dockerfile
index 40873b80..d109f1ed 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ RUN apt update
 RUN apt install --no-install-recommends -yy build-essential zlib1g-dev
 WORKDIR "/opt"
 
-ENV GRAALVM_VERSION="21.0.2"
+ENV GRAALVM_VERSION="22"
 ARG TARGETARCH
 # Do not set those directly, use TARGETARCH instead
 ENV BABASHKA_ARCH=
diff --git a/appveyor.yml b/appveyor.yml
index a962e308..16dda71d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,8 +7,8 @@ image: Visual Studio 2022
 clone_folder: C:\projects\babashka
 
 environment:
-  GRAALVM_HOME: C:\projects\babashka\graalvm\graalvm-jdk-21.0.2+13.1
-  JAVA_HOME: C:\projects\babashka\graalvm\graalvm-jdk-21.0.2+13.1
+  GRAALVM_HOME: C:\projects\babashka\graalvm\graalvm-jdk-22+36.1
+  JAVA_HOME: C:\projects\babashka\graalvm\graalvm-jdk-22+36.1
   BABASHKA_XMX: "-J-Xmx5g"
 
 skip_commits:
@@ -44,7 +44,7 @@ clone_script:
 build_script:
 # TODO: Extract the zip by removing the top level folder to remove the hardcoded path for GRAALVM_HOME
 - cmd: >-
-    powershell -Command "if (Test-Path('graalvm')) { return } else { (New-Object Net.WebClient).DownloadFile('https://download.oracle.com/graalvm/21/archive/graalvm-jdk-21.0.2_windows-x64_bin.zip', 'graalvm.zip') }"
+    powershell -Command "if (Test-Path('graalvm')) { return } else { (New-Object Net.WebClient).DownloadFile('https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22_windows-x64_bin.zip', 'graalvm.zip') }"
 
     powershell -Command "if (Test-Path('graalvm')) { return } else { Expand-Archive graalvm.zip graalvm }"
 
diff --git a/script/install-graalvm b/script/install-graalvm
index c1a2c7f4..dd27675a 100755
--- a/script/install-graalvm
+++ b/script/install-graalvm
@@ -4,7 +4,7 @@ set -euo pipefail
 
 INSTALL_DIR="${1:-$HOME}"
 
-GRAALVM_VERSION="${GRAALVM_VERSION:-21.0.2}"
+GRAALVM_VERSION="${GRAALVM_VERSION:-22}"
 
 GRAALVM_PLATFORM=$BABASHKA_PLATFORM
 
@@ -19,14 +19,14 @@ esac
 
 GRAALVM_DIR_NAME="graalvm-$GRAALVM_VERSION"
 GRAALVM_FILENAME="graalvm-jdk-${GRAALVM_VERSION}_${GRAALVM_PLATFORM}-${GRAALVM_ARCH}_bin.tar.gz"
-DOWNLOAD_URL="https://download.oracle.com/graalvm/21/archive/${GRAALVM_FILENAME}"
+DOWNLOAD_URL="https://download.oracle.com/graalvm/22/archive/${GRAALVM_FILENAME}"
 
 pushd "$INSTALL_DIR" >/dev/null
 
 if ! [ -d "$GRAALVM_DIR_NAME" ]; then
     echo "Downloading GraalVM $GRAALVM_PLATFORM-$GRAALVM_ARCH-$GRAALVM_VERSION on '$PWD'..."
     echo "$DOWNLOAD_URL"
-    curl -LO "$DOWNLOAD_URL"
+    curl --fail -LO "$DOWNLOAD_URL"
     ls -la
     mkdir "$GRAALVM_DIR_NAME"
     tar xzvf "$GRAALVM_FILENAME" -C "$GRAALVM_DIR_NAME" --strip-components 1