diff --git a/build.gradle b/build.gradle
index f1ede302156..c133a6fefb9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,8 +17,8 @@ buildscript {
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.18.0'
         classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.13.0'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:3.1.0'
-        classpath 'com.palantir.gradle.jdks:gradle-jdks:0.48.0'
-        classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.15.0'
+        classpath 'com.palantir.gradle.jdks:gradle-jdks:0.53.0'
+        classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.16.0'
         classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.50.0'
         classpath 'com.palantir.metricschema:gradle-metric-schema:0.32.0'
         classpath 'com.palantir.sls-packaging:gradle-sls-packaging:7.13.0'
diff --git a/gradle/gradle-jdks-setup.jar b/gradle/gradle-jdks-setup.jar
index 6f3e775a6c5..f1b8b4d170c 100644
Binary files a/gradle/gradle-jdks-setup.jar and b/gradle/gradle-jdks-setup.jar differ
diff --git a/gradle/gradle-jdks-setup.sh b/gradle/gradle-jdks-setup.sh
index f8cd657820e..fe7d9122171 100755
--- a/gradle/gradle-jdks-setup.sh
+++ b/gradle/gradle-jdks-setup.sh
@@ -74,6 +74,7 @@ gradle_daemon_jdk_distribution_local_path=$(read_value "$APP_GRADLE_DIR"/jdks/"$
 "$GRADLE_JDKS_HOME"/"$gradle_daemon_jdk_distribution_local_path"/bin/java -cp "$APP_GRADLE_DIR"/gradle-jdks-setup.jar com.palantir.gradle.jdks.setup.GradleJdkInstallationSetup daemonSetup "$APP_HOME" "$GRADLE_JDKS_HOME/$gradle_daemon_jdk_distribution_local_path"
 
 # [Used by ./gradlew only] Setting the Gradle Daemon Java Home to the JDK distribution
-set -- "-Dorg.gradle.java.home=$GRADLE_JDKS_HOME/$gradle_daemon_jdk_distribution_local_path" "$@"
+export GRADLE_DAEMON_JDK="$GRADLE_JDKS_HOME/$gradle_daemon_jdk_distribution_local_path"
+set -- "-Dorg.gradle.java.home=$GRADLE_DAEMON_JDK" "$@"
 
 cleanup
diff --git a/gradle/jdks/11/linux-glibc/aarch64/download-url b/gradle/jdks/11/linux-glibc/aarch64/download-url
index b6229d7e941..1c27d849adc 100644
--- a/gradle/jdks/11/linux-glibc/aarch64/download-url
+++ b/gradle/jdks/11/linux-glibc/aarch64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/11.0.24.8.1/amazon-corretto-11.0.24.8.1-linux-aarch64.tar.gz
+https://corretto.aws/downloads/resources/11.0.25.9.1/amazon-corretto-11.0.25.9.1-linux-aarch64.tar.gz
diff --git a/gradle/jdks/11/linux-glibc/aarch64/local-path b/gradle/jdks/11/linux-glibc/aarch64/local-path
index 664fc73f967..0d759e87e7b 100644
--- a/gradle/jdks/11/linux-glibc/aarch64/local-path
+++ b/gradle/jdks/11/linux-glibc/aarch64/local-path
@@ -1 +1 @@
-amazon-corretto-11.0.24.8.1
+amazon-corretto-11.0.25.9.1
diff --git a/gradle/jdks/11/linux-glibc/x86-64/download-url b/gradle/jdks/11/linux-glibc/x86-64/download-url
index aa310f036d1..d540634a604 100644
--- a/gradle/jdks/11/linux-glibc/x86-64/download-url
+++ b/gradle/jdks/11/linux-glibc/x86-64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/11.0.24.8.1/amazon-corretto-11.0.24.8.1-linux-x64.tar.gz
+https://corretto.aws/downloads/resources/11.0.25.9.1/amazon-corretto-11.0.25.9.1-linux-x64.tar.gz
diff --git a/gradle/jdks/11/linux-glibc/x86-64/local-path b/gradle/jdks/11/linux-glibc/x86-64/local-path
index 664fc73f967..0d759e87e7b 100644
--- a/gradle/jdks/11/linux-glibc/x86-64/local-path
+++ b/gradle/jdks/11/linux-glibc/x86-64/local-path
@@ -1 +1 @@
-amazon-corretto-11.0.24.8.1
+amazon-corretto-11.0.25.9.1
diff --git a/gradle/jdks/11/linux-glibc/x86/download-url b/gradle/jdks/11/linux-glibc/x86/download-url
index d504a5eb8fa..49a678042d6 100644
--- a/gradle/jdks/11/linux-glibc/x86/download-url
+++ b/gradle/jdks/11/linux-glibc/x86/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/11.0.24.8.1/amazon-corretto-11.0.24.8.1-linux-i386.tar.gz
+https://corretto.aws/downloads/resources/11.0.25.9.1/amazon-corretto-11.0.25.9.1-linux-i386.tar.gz
diff --git a/gradle/jdks/11/linux-glibc/x86/local-path b/gradle/jdks/11/linux-glibc/x86/local-path
index 664fc73f967..0d759e87e7b 100644
--- a/gradle/jdks/11/linux-glibc/x86/local-path
+++ b/gradle/jdks/11/linux-glibc/x86/local-path
@@ -1 +1 @@
-amazon-corretto-11.0.24.8.1
+amazon-corretto-11.0.25.9.1
diff --git a/gradle/jdks/11/linux-musl/aarch64/download-url b/gradle/jdks/11/linux-musl/aarch64/download-url
index 65ddd140088..53c13116516 100644
--- a/gradle/jdks/11/linux-musl/aarch64/download-url
+++ b/gradle/jdks/11/linux-musl/aarch64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/11.0.24.8.1/amazon-corretto-11.0.24.8.1-alpine-linux-aarch64.tar.gz
+https://corretto.aws/downloads/resources/11.0.25.9.1/amazon-corretto-11.0.25.9.1-alpine-linux-aarch64.tar.gz
diff --git a/gradle/jdks/11/linux-musl/aarch64/local-path b/gradle/jdks/11/linux-musl/aarch64/local-path
index 664fc73f967..0d759e87e7b 100644
--- a/gradle/jdks/11/linux-musl/aarch64/local-path
+++ b/gradle/jdks/11/linux-musl/aarch64/local-path
@@ -1 +1 @@
-amazon-corretto-11.0.24.8.1
+amazon-corretto-11.0.25.9.1
diff --git a/gradle/jdks/11/linux-musl/x86-64/download-url b/gradle/jdks/11/linux-musl/x86-64/download-url
index 3ccb9056216..e6c67cf1a81 100644
--- a/gradle/jdks/11/linux-musl/x86-64/download-url
+++ b/gradle/jdks/11/linux-musl/x86-64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/11.0.24.8.1/amazon-corretto-11.0.24.8.1-alpine-linux-x64.tar.gz
+https://corretto.aws/downloads/resources/11.0.25.9.1/amazon-corretto-11.0.25.9.1-alpine-linux-x64.tar.gz
diff --git a/gradle/jdks/11/linux-musl/x86-64/local-path b/gradle/jdks/11/linux-musl/x86-64/local-path
index 664fc73f967..0d759e87e7b 100644
--- a/gradle/jdks/11/linux-musl/x86-64/local-path
+++ b/gradle/jdks/11/linux-musl/x86-64/local-path
@@ -1 +1 @@
-amazon-corretto-11.0.24.8.1
+amazon-corretto-11.0.25.9.1
diff --git a/gradle/jdks/11/macos/aarch64/download-url b/gradle/jdks/11/macos/aarch64/download-url
index b1f3be55936..0bcc8e79aab 100644
--- a/gradle/jdks/11/macos/aarch64/download-url
+++ b/gradle/jdks/11/macos/aarch64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/11.0.24.8.1/amazon-corretto-11.0.24.8.1-macosx-aarch64.tar.gz
+https://corretto.aws/downloads/resources/11.0.25.9.1/amazon-corretto-11.0.25.9.1-macosx-aarch64.tar.gz
diff --git a/gradle/jdks/11/macos/aarch64/local-path b/gradle/jdks/11/macos/aarch64/local-path
index 664fc73f967..0d759e87e7b 100644
--- a/gradle/jdks/11/macos/aarch64/local-path
+++ b/gradle/jdks/11/macos/aarch64/local-path
@@ -1 +1 @@
-amazon-corretto-11.0.24.8.1
+amazon-corretto-11.0.25.9.1
diff --git a/gradle/jdks/11/macos/x86-64/download-url b/gradle/jdks/11/macos/x86-64/download-url
index 69bbff5febe..0af3ae7e06c 100644
--- a/gradle/jdks/11/macos/x86-64/download-url
+++ b/gradle/jdks/11/macos/x86-64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/11.0.24.8.1/amazon-corretto-11.0.24.8.1-macosx-x64.tar.gz
+https://corretto.aws/downloads/resources/11.0.25.9.1/amazon-corretto-11.0.25.9.1-macosx-x64.tar.gz
diff --git a/gradle/jdks/11/macos/x86-64/local-path b/gradle/jdks/11/macos/x86-64/local-path
index 664fc73f967..0d759e87e7b 100644
--- a/gradle/jdks/11/macos/x86-64/local-path
+++ b/gradle/jdks/11/macos/x86-64/local-path
@@ -1 +1 @@
-amazon-corretto-11.0.24.8.1
+amazon-corretto-11.0.25.9.1
diff --git a/gradle/jdks/11/windows/x86-64/download-url b/gradle/jdks/11/windows/x86-64/download-url
index 280a48946c3..e497899f830 100644
--- a/gradle/jdks/11/windows/x86-64/download-url
+++ b/gradle/jdks/11/windows/x86-64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/11.0.24.8.1/amazon-corretto-11.0.24.8.1-windows-x64-jdk.zip
+https://corretto.aws/downloads/resources/11.0.25.9.1/amazon-corretto-11.0.25.9.1-windows-x64-jdk.zip
diff --git a/gradle/jdks/11/windows/x86-64/local-path b/gradle/jdks/11/windows/x86-64/local-path
index 664fc73f967..0d759e87e7b 100644
--- a/gradle/jdks/11/windows/x86-64/local-path
+++ b/gradle/jdks/11/windows/x86-64/local-path
@@ -1 +1 @@
-amazon-corretto-11.0.24.8.1
+amazon-corretto-11.0.25.9.1
diff --git a/gradle/jdks/11/windows/x86/download-url b/gradle/jdks/11/windows/x86/download-url
index cdb4c2f9bcb..60270dbc617 100644
--- a/gradle/jdks/11/windows/x86/download-url
+++ b/gradle/jdks/11/windows/x86/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/11.0.24.8.1/amazon-corretto-11.0.24.8.1-windows-i386-jdk.zip
+https://corretto.aws/downloads/resources/11.0.25.9.1/amazon-corretto-11.0.25.9.1-windows-i386-jdk.zip
diff --git a/gradle/jdks/11/windows/x86/local-path b/gradle/jdks/11/windows/x86/local-path
index 664fc73f967..0d759e87e7b 100644
--- a/gradle/jdks/11/windows/x86/local-path
+++ b/gradle/jdks/11/windows/x86/local-path
@@ -1 +1 @@
-amazon-corretto-11.0.24.8.1
+amazon-corretto-11.0.25.9.1
diff --git a/gradle/jdks/17/linux-glibc/aarch64/download-url b/gradle/jdks/17/linux-glibc/aarch64/download-url
index d4343579a15..e8041c074cc 100644
--- a/gradle/jdks/17/linux-glibc/aarch64/download-url
+++ b/gradle/jdks/17/linux-glibc/aarch64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/17.0.12.7.1/amazon-corretto-17.0.12.7.1-linux-aarch64.tar.gz
+https://corretto.aws/downloads/resources/17.0.13.11.1/amazon-corretto-17.0.13.11.1-linux-aarch64.tar.gz
diff --git a/gradle/jdks/17/linux-glibc/aarch64/local-path b/gradle/jdks/17/linux-glibc/aarch64/local-path
index b55ee1d37f9..edac2a827af 100644
--- a/gradle/jdks/17/linux-glibc/aarch64/local-path
+++ b/gradle/jdks/17/linux-glibc/aarch64/local-path
@@ -1 +1 @@
-amazon-corretto-17.0.12.7.1
+amazon-corretto-17.0.13.11.1
diff --git a/gradle/jdks/17/linux-glibc/x86-64/download-url b/gradle/jdks/17/linux-glibc/x86-64/download-url
index f321979d0f9..5de2c8bb097 100644
--- a/gradle/jdks/17/linux-glibc/x86-64/download-url
+++ b/gradle/jdks/17/linux-glibc/x86-64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/17.0.12.7.1/amazon-corretto-17.0.12.7.1-linux-x64.tar.gz
+https://corretto.aws/downloads/resources/17.0.13.11.1/amazon-corretto-17.0.13.11.1-linux-x64.tar.gz
diff --git a/gradle/jdks/17/linux-glibc/x86-64/local-path b/gradle/jdks/17/linux-glibc/x86-64/local-path
index b55ee1d37f9..edac2a827af 100644
--- a/gradle/jdks/17/linux-glibc/x86-64/local-path
+++ b/gradle/jdks/17/linux-glibc/x86-64/local-path
@@ -1 +1 @@
-amazon-corretto-17.0.12.7.1
+amazon-corretto-17.0.13.11.1
diff --git a/gradle/jdks/17/linux-musl/aarch64/download-url b/gradle/jdks/17/linux-musl/aarch64/download-url
index ef000db4bbc..17747719be3 100644
--- a/gradle/jdks/17/linux-musl/aarch64/download-url
+++ b/gradle/jdks/17/linux-musl/aarch64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/17.0.12.7.1/amazon-corretto-17.0.12.7.1-alpine-linux-aarch64.tar.gz
+https://corretto.aws/downloads/resources/17.0.13.11.1/amazon-corretto-17.0.13.11.1-alpine-linux-aarch64.tar.gz
diff --git a/gradle/jdks/17/linux-musl/aarch64/local-path b/gradle/jdks/17/linux-musl/aarch64/local-path
index b55ee1d37f9..edac2a827af 100644
--- a/gradle/jdks/17/linux-musl/aarch64/local-path
+++ b/gradle/jdks/17/linux-musl/aarch64/local-path
@@ -1 +1 @@
-amazon-corretto-17.0.12.7.1
+amazon-corretto-17.0.13.11.1
diff --git a/gradle/jdks/17/linux-musl/x86-64/download-url b/gradle/jdks/17/linux-musl/x86-64/download-url
index 65cf11f0b3d..8bc6ab5e4bf 100644
--- a/gradle/jdks/17/linux-musl/x86-64/download-url
+++ b/gradle/jdks/17/linux-musl/x86-64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/17.0.12.7.1/amazon-corretto-17.0.12.7.1-alpine-linux-x64.tar.gz
+https://corretto.aws/downloads/resources/17.0.13.11.1/amazon-corretto-17.0.13.11.1-alpine-linux-x64.tar.gz
diff --git a/gradle/jdks/17/linux-musl/x86-64/local-path b/gradle/jdks/17/linux-musl/x86-64/local-path
index b55ee1d37f9..edac2a827af 100644
--- a/gradle/jdks/17/linux-musl/x86-64/local-path
+++ b/gradle/jdks/17/linux-musl/x86-64/local-path
@@ -1 +1 @@
-amazon-corretto-17.0.12.7.1
+amazon-corretto-17.0.13.11.1
diff --git a/gradle/jdks/17/macos/aarch64/download-url b/gradle/jdks/17/macos/aarch64/download-url
index a9610398f3b..6da4b67807e 100644
--- a/gradle/jdks/17/macos/aarch64/download-url
+++ b/gradle/jdks/17/macos/aarch64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/17.0.12.7.1/amazon-corretto-17.0.12.7.1-macosx-aarch64.tar.gz
+https://corretto.aws/downloads/resources/17.0.13.11.1/amazon-corretto-17.0.13.11.1-macosx-aarch64.tar.gz
diff --git a/gradle/jdks/17/macos/aarch64/local-path b/gradle/jdks/17/macos/aarch64/local-path
index b55ee1d37f9..edac2a827af 100644
--- a/gradle/jdks/17/macos/aarch64/local-path
+++ b/gradle/jdks/17/macos/aarch64/local-path
@@ -1 +1 @@
-amazon-corretto-17.0.12.7.1
+amazon-corretto-17.0.13.11.1
diff --git a/gradle/jdks/17/macos/x86-64/download-url b/gradle/jdks/17/macos/x86-64/download-url
index a083a304634..2f5b0570472 100644
--- a/gradle/jdks/17/macos/x86-64/download-url
+++ b/gradle/jdks/17/macos/x86-64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/17.0.12.7.1/amazon-corretto-17.0.12.7.1-macosx-x64.tar.gz
+https://corretto.aws/downloads/resources/17.0.13.11.1/amazon-corretto-17.0.13.11.1-macosx-x64.tar.gz
diff --git a/gradle/jdks/17/macos/x86-64/local-path b/gradle/jdks/17/macos/x86-64/local-path
index b55ee1d37f9..edac2a827af 100644
--- a/gradle/jdks/17/macos/x86-64/local-path
+++ b/gradle/jdks/17/macos/x86-64/local-path
@@ -1 +1 @@
-amazon-corretto-17.0.12.7.1
+amazon-corretto-17.0.13.11.1
diff --git a/gradle/jdks/17/windows/x86-64/download-url b/gradle/jdks/17/windows/x86-64/download-url
index 8f22f957653..bc0df773160 100644
--- a/gradle/jdks/17/windows/x86-64/download-url
+++ b/gradle/jdks/17/windows/x86-64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/17.0.12.7.1/amazon-corretto-17.0.12.7.1-windows-x64-jdk.zip
+https://corretto.aws/downloads/resources/17.0.13.11.1/amazon-corretto-17.0.13.11.1-windows-x64-jdk.zip
diff --git a/gradle/jdks/17/windows/x86-64/local-path b/gradle/jdks/17/windows/x86-64/local-path
index b55ee1d37f9..edac2a827af 100644
--- a/gradle/jdks/17/windows/x86-64/local-path
+++ b/gradle/jdks/17/windows/x86-64/local-path
@@ -1 +1 @@
-amazon-corretto-17.0.12.7.1
+amazon-corretto-17.0.13.11.1
diff --git a/gradle/jdks/21/linux-glibc/aarch64/download-url b/gradle/jdks/21/linux-glibc/aarch64/download-url
index ab51f6db37a..4310614160a 100644
--- a/gradle/jdks/21/linux-glibc/aarch64/download-url
+++ b/gradle/jdks/21/linux-glibc/aarch64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/21.0.4.7.1/amazon-corretto-21.0.4.7.1-linux-aarch64.tar.gz
+https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-linux-aarch64.tar.gz
diff --git a/gradle/jdks/21/linux-glibc/aarch64/local-path b/gradle/jdks/21/linux-glibc/aarch64/local-path
index 7865953940d..4c19e3acf98 100644
--- a/gradle/jdks/21/linux-glibc/aarch64/local-path
+++ b/gradle/jdks/21/linux-glibc/aarch64/local-path
@@ -1 +1 @@
-amazon-corretto-21.0.4.7.1
+amazon-corretto-21.0.5.11.1
diff --git a/gradle/jdks/21/linux-glibc/x86-64/download-url b/gradle/jdks/21/linux-glibc/x86-64/download-url
index 214ea712191..25c31a53879 100644
--- a/gradle/jdks/21/linux-glibc/x86-64/download-url
+++ b/gradle/jdks/21/linux-glibc/x86-64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/21.0.4.7.1/amazon-corretto-21.0.4.7.1-linux-x64.tar.gz
+https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-linux-x64.tar.gz
diff --git a/gradle/jdks/21/linux-glibc/x86-64/local-path b/gradle/jdks/21/linux-glibc/x86-64/local-path
index 7865953940d..4c19e3acf98 100644
--- a/gradle/jdks/21/linux-glibc/x86-64/local-path
+++ b/gradle/jdks/21/linux-glibc/x86-64/local-path
@@ -1 +1 @@
-amazon-corretto-21.0.4.7.1
+amazon-corretto-21.0.5.11.1
diff --git a/gradle/jdks/21/linux-musl/aarch64/download-url b/gradle/jdks/21/linux-musl/aarch64/download-url
index 0eb5091b358..90d966e8a9b 100644
--- a/gradle/jdks/21/linux-musl/aarch64/download-url
+++ b/gradle/jdks/21/linux-musl/aarch64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/21.0.4.7.1/amazon-corretto-21.0.4.7.1-alpine-linux-aarch64.tar.gz
+https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-alpine-linux-aarch64.tar.gz
diff --git a/gradle/jdks/21/linux-musl/aarch64/local-path b/gradle/jdks/21/linux-musl/aarch64/local-path
index 7865953940d..4c19e3acf98 100644
--- a/gradle/jdks/21/linux-musl/aarch64/local-path
+++ b/gradle/jdks/21/linux-musl/aarch64/local-path
@@ -1 +1 @@
-amazon-corretto-21.0.4.7.1
+amazon-corretto-21.0.5.11.1
diff --git a/gradle/jdks/21/linux-musl/x86-64/download-url b/gradle/jdks/21/linux-musl/x86-64/download-url
index 421fdc33f8b..a507d2cd45f 100644
--- a/gradle/jdks/21/linux-musl/x86-64/download-url
+++ b/gradle/jdks/21/linux-musl/x86-64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/21.0.4.7.1/amazon-corretto-21.0.4.7.1-alpine-linux-x64.tar.gz
+https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-alpine-linux-x64.tar.gz
diff --git a/gradle/jdks/21/linux-musl/x86-64/local-path b/gradle/jdks/21/linux-musl/x86-64/local-path
index 7865953940d..4c19e3acf98 100644
--- a/gradle/jdks/21/linux-musl/x86-64/local-path
+++ b/gradle/jdks/21/linux-musl/x86-64/local-path
@@ -1 +1 @@
-amazon-corretto-21.0.4.7.1
+amazon-corretto-21.0.5.11.1
diff --git a/gradle/jdks/21/macos/aarch64/download-url b/gradle/jdks/21/macos/aarch64/download-url
index 03a669f5a09..2ab7620eb20 100644
--- a/gradle/jdks/21/macos/aarch64/download-url
+++ b/gradle/jdks/21/macos/aarch64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/21.0.4.7.1/amazon-corretto-21.0.4.7.1-macosx-aarch64.tar.gz
+https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-macosx-aarch64.tar.gz
diff --git a/gradle/jdks/21/macos/aarch64/local-path b/gradle/jdks/21/macos/aarch64/local-path
index 7865953940d..4c19e3acf98 100644
--- a/gradle/jdks/21/macos/aarch64/local-path
+++ b/gradle/jdks/21/macos/aarch64/local-path
@@ -1 +1 @@
-amazon-corretto-21.0.4.7.1
+amazon-corretto-21.0.5.11.1
diff --git a/gradle/jdks/21/macos/x86-64/download-url b/gradle/jdks/21/macos/x86-64/download-url
index 4c3d36c468c..376401edcf0 100644
--- a/gradle/jdks/21/macos/x86-64/download-url
+++ b/gradle/jdks/21/macos/x86-64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/21.0.4.7.1/amazon-corretto-21.0.4.7.1-macosx-x64.tar.gz
+https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-macosx-x64.tar.gz
diff --git a/gradle/jdks/21/macos/x86-64/local-path b/gradle/jdks/21/macos/x86-64/local-path
index 7865953940d..4c19e3acf98 100644
--- a/gradle/jdks/21/macos/x86-64/local-path
+++ b/gradle/jdks/21/macos/x86-64/local-path
@@ -1 +1 @@
-amazon-corretto-21.0.4.7.1
+amazon-corretto-21.0.5.11.1
diff --git a/gradle/jdks/21/windows/x86-64/download-url b/gradle/jdks/21/windows/x86-64/download-url
index 3d3b6cfa14e..3f0337483ca 100644
--- a/gradle/jdks/21/windows/x86-64/download-url
+++ b/gradle/jdks/21/windows/x86-64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/21.0.4.7.1/amazon-corretto-21.0.4.7.1-windows-x64-jdk.zip
+https://corretto.aws/downloads/resources/21.0.5.11.1/amazon-corretto-21.0.5.11.1-windows-x64-jdk.zip
diff --git a/gradle/jdks/21/windows/x86-64/local-path b/gradle/jdks/21/windows/x86-64/local-path
index 7865953940d..4c19e3acf98 100644
--- a/gradle/jdks/21/windows/x86-64/local-path
+++ b/gradle/jdks/21/windows/x86-64/local-path
@@ -1 +1 @@
-amazon-corretto-21.0.4.7.1
+amazon-corretto-21.0.5.11.1
diff --git a/gradlew b/gradlew
index 54730ed6fad..bc3293511ef 100755
--- a/gradlew
+++ b/gradlew
@@ -68,6 +68,8 @@ if [ -f gradle/gradle-jdks-setup.sh ]; then
         echo "Failed to set up JDK, running gradle/gradle-jdks-setup.sh failed with non-zero exit code"
         exit 1
     fi
+    # Setting JAVA_HOME to the gradle daemon to make sure gradlew uses this jdk for `JAVACMD`
+    JAVA_HOME="$GRADLE_DAEMON_JDK"
 fi
 # <<< Gradle JDK setup <<<
 
diff --git a/settings.gradle b/settings.gradle
index 036cb36331c..cb2aa8d71bb 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,7 +4,7 @@ buildscript {
         gradlePluginPortal() { metadataSources { mavenPom(); ignoreGradleMetadataRedirection() } }
     }
     dependencies {
-        classpath 'com.palantir.gradle.jdks:gradle-jdks-settings:0.48.0'
+        classpath 'com.palantir.gradle.jdks:gradle-jdks-settings:0.53.0'
     }
 }
 plugins {