diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 40cb4a4fb0d..ec0012e2b74 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -31,9 +31,9 @@
         // Install java.
         // See https://github.com/devcontainers/features/tree/main/src/java#options for details.
         "ghcr.io/devcontainers/features/java:1": {
-            "version": "24.0.1-tem",
+            "version": "24.0.1-amzn",
             "installGradle": false,
-            "jdkDistro": "Temurin"
+            "jdkDistro": "Corretto"
         }
     }
 }
diff --git a/.sdkmanrc b/.sdkmanrc
index 96a3a721b32..a278eb41eb8 100644
--- a/.sdkmanrc
+++ b/.sdkmanrc
@@ -1,2 +1,2 @@
-java=24.0.1-tem
+java=24.0.1-amzn
 #visualvm=2.1.10