diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d6b3d1fd..76129589 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,7 +4,7 @@ on:
       - master
 
 env:
-  JAVA_VERSION: 22.0.2+9
+  JAVA_VERSION: 23+37
   GRADLE_OPTS: -Dorg.gradle.daemon=false
 
 jobs:
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 04033778..ccc64cca 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -9,5 +9,5 @@
   </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="FrameworkDetectionExcludesConfiguration" detection-enabled="false" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_22" default="true" project-jdk-name="22" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_23" default="true" project-jdk-name="23" project-jdk-type="JavaSDK" />
 </project>
diff --git a/.idea/runConfigurations/ControllerBuddy__autostart_client.xml b/.idea/runConfigurations/ControllerBuddy__autostart_client.xml
index f420dc33..ed6bb45f 100644
--- a/.idea/runConfigurations/ControllerBuddy__autostart_client.xml
+++ b/.idea/runConfigurations/ControllerBuddy__autostart_client.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="ControllerBuddy -autostart client" type="Application" factoryName="Application">
-    <option name="ALTERNATIVE_JRE_PATH" value="22" />
+    <option name="ALTERNATIVE_JRE_PATH" value="23" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="MAIN_CLASS_NAME" value="de.bwravencl.controllerbuddy.gui.Main" />
     <module name="ControllerBuddy.main" />
diff --git a/.idea/runConfigurations/ControllerBuddy__autostart_local.xml b/.idea/runConfigurations/ControllerBuddy__autostart_local.xml
index 16091d02..881c0441 100644
--- a/.idea/runConfigurations/ControllerBuddy__autostart_local.xml
+++ b/.idea/runConfigurations/ControllerBuddy__autostart_local.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="ControllerBuddy -autostart local" type="Application" factoryName="Application">
-    <option name="ALTERNATIVE_JRE_PATH" value="22" />
+    <option name="ALTERNATIVE_JRE_PATH" value="23" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="MAIN_CLASS_NAME" value="de.bwravencl.controllerbuddy.gui.Main" />
     <module name="ControllerBuddy.main" />
diff --git a/.idea/runConfigurations/ControllerBuddy__autostart_server.xml b/.idea/runConfigurations/ControllerBuddy__autostart_server.xml
index 947c455f..20e34ad5 100644
--- a/.idea/runConfigurations/ControllerBuddy__autostart_server.xml
+++ b/.idea/runConfigurations/ControllerBuddy__autostart_server.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="ControllerBuddy -autostart server" type="Application" factoryName="Application">
-    <option name="ALTERNATIVE_JRE_PATH" value="22" />
+    <option name="ALTERNATIVE_JRE_PATH" value="23" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="MAIN_CLASS_NAME" value="de.bwravencl.controllerbuddy.gui.Main" />
     <module name="ControllerBuddy.main" />
diff --git a/.idea/runConfigurations/ControllerBuddy__de_DE_.xml b/.idea/runConfigurations/ControllerBuddy__de_DE_.xml
index 129a4e97..c888e765 100644
--- a/.idea/runConfigurations/ControllerBuddy__de_DE_.xml
+++ b/.idea/runConfigurations/ControllerBuddy__de_DE_.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="ControllerBuddy (de-DE)" type="Application" factoryName="Application">
-    <option name="ALTERNATIVE_JRE_PATH" value="22" />
+    <option name="ALTERNATIVE_JRE_PATH" value="23" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="MAIN_CLASS_NAME" value="de.bwravencl.controllerbuddy.gui.Main" />
     <module name="ControllerBuddy.main" />
diff --git a/.idea/runConfigurations/ControllerBuddy__en_US_.xml b/.idea/runConfigurations/ControllerBuddy__en_US_.xml
index eab04291..bde885ef 100644
--- a/.idea/runConfigurations/ControllerBuddy__en_US_.xml
+++ b/.idea/runConfigurations/ControllerBuddy__en_US_.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="ControllerBuddy (en-US)" type="Application" factoryName="Application">
-    <option name="ALTERNATIVE_JRE_PATH" value="22" />
+    <option name="ALTERNATIVE_JRE_PATH" value="23" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="MAIN_CLASS_NAME" value="de.bwravencl.controllerbuddy.gui.Main" />
     <module name="ControllerBuddy.main" />
diff --git a/.idea/runConfigurations/ControllerBuddy__help.xml b/.idea/runConfigurations/ControllerBuddy__help.xml
index ec60e83e..4e92587a 100644
--- a/.idea/runConfigurations/ControllerBuddy__help.xml
+++ b/.idea/runConfigurations/ControllerBuddy__help.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="ControllerBuddy -help" type="Application" factoryName="Application">
-    <option name="ALTERNATIVE_JRE_PATH" value="22" />
+    <option name="ALTERNATIVE_JRE_PATH" value="23" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="MAIN_CLASS_NAME" value="de.bwravencl.controllerbuddy.gui.Main" />
     <module name="ControllerBuddy.main" />
diff --git a/build.gradle b/build.gradle
index 554a803b..b1c12c76 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,7 +32,7 @@ application {
 }
 
 ext {
-	javaLanguageVersion = JavaLanguageVersion.of(22)
+	javaLanguageVersion = JavaLanguageVersion.of(23)
 
 	def launcher = javaToolchains.launcherFor {
 		languageVersion.set(javaLanguageVersion)