diff --git a/.idea/misc.xml b/.idea/misc.xml
index f67f9f5d8..89dc5b1d5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,8 +4,8 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="corretto-21 (2)" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="corretto-21" project-jdk-type="JavaSDK" />
   <component name="SuppressKotlinCodeStyleNotification">
     <option name="disableForAll" value="true" />
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/.sdkmanrc b/.sdkmanrc
index 69ea05372..dab5f6d6b 100644
--- a/.sdkmanrc
+++ b/.sdkmanrc
@@ -1,3 +1,3 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=21.0.3-amzn
+java=21.0.4-amzn
diff --git a/doc/contributors-guide/modules/ROOT/pages/coder/setup-environment.adoc b/doc/contributors-guide/modules/ROOT/pages/coder/setup-environment.adoc
index 519a3951f..b34b1923f 100644
--- a/doc/contributors-guide/modules/ROOT/pages/coder/setup-environment.adoc
+++ b/doc/contributors-guide/modules/ROOT/pages/coder/setup-environment.adoc
@@ -10,9 +10,15 @@
 Starting with IntelliJ 2024.2, JDK 21 is required to build the plugin, as IntelliJ 2024.2 uses JDK 21. The runtime version of the plugin is still compatible with JDK 17.
 https://blog.jetbrains.com/idea/2024/05/intellij-idea-2024-2-eap-2/[See the JDK 21 announcement in the JetBrains blog for details].
 
-The AsciiDoc plugin uses only language features of Java 11 to allow the built plugin to run with earlier versions of IntelliJ as well.
+The AsciiDoc plugin uses only language features of Java 17 to allow the built plugin to run with earlier versions of IntelliJ as well.
 
-JetBrains recommends https://docs.aws.amazon.com/corretto/latest/corretto-17-ug/downloads-list.html[Amazon Corretto JDK] for development, but other distributions based on OpenJDK should work as well.
+JetBrains recommends https://docs.aws.amazon.com/corretto/latest/corretto-21-ug/downloads-list.html[Amazon Corretto JDK] for development, but other distributions based on OpenJDK should work as well.
+
+== Setup IntelliJ
+
+In IntelliJ, go to menu:File[Project Structure... > Project Settings > Project > SDK] and select `coretto-21` as the JDK.
+
+== Setup Gradle
 
 For the Gradle build tool to pick up the Java version, point the environment variable `JAVA_HOME` to the folder with the JDK:
 
@@ -26,7 +32,7 @@ export JAVA_HOME=...
 JAVA_HOME=c:\workspace\...
 ----
 
-== Verify the environment
+=== Verify the Gradle environment
 
 Developers can check their environment using the following command in the root folder of the project:
 
@@ -54,7 +60,7 @@ Revision:     ...
 Kotlin:       ...
 Groovy:       ...
 Ant:          ...
-JVM:          17.0.x (Amazon.com Inc. 17.0....)
+JVM:          21.0.x (Amazon.com Inc. 21.0....)
 OS:           ...
 ----