diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3dfb2b43..71113c20 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,7 +5,7 @@ on:
 
 env:
   JAVA_DISTRIBUTION: zulu
-  JAVA_VERSION: 20.0.2+9
+  JAVA_VERSION: 21.0.0+35
   GRADLE_OPTS: -Dorg.gradle.daemon=false
 
 jobs:
diff --git a/.idea/misc.xml b/.idea/misc.xml
index f12b0ff0..cd340bda 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,5 +8,5 @@
     <pattern value="de.bwravencl.controllerbuddy.input.driver.IDriverBuilder" hierarchically="true" />
   </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_20" default="true" project-jdk-name="20" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 202a9ae5..cd92f245 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,8 +17,8 @@ plugins {
 version = Grgit.open(dir: projectDir).describe(longDescr: true).replaceFirst(Pattern.quote('-'), '.').replaceFirst(Pattern.quote('-g'), '-')
 
 java {
-	sourceCompatibility = JavaVersion.VERSION_20
-	targetCompatibility = JavaVersion.VERSION_20
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
 }
 
 base {
@@ -42,8 +42,6 @@ ext {
 	tmpDir = layout.buildDirectory.dir('tmp')
 	runtimeDir = tmpDir.map { it.dir('runtime') }
 
-	enablePreviewJvmArg = '--enable-preview'
-
 	linuxAddOpensValue = "java.desktop/sun.awt.X11=${project.application.mainModule.get()}"
 	linuxJvmArgs = [
 		"--add-opens=$linuxAddOpensValue"
@@ -362,15 +360,11 @@ tasks.spotlessXml.dependsOn copyGameControllerDB
 compileJava {
 	dependsOn generateModuleInfo, generateVersion
 	source generateVersion.outputs.files, sourceSets.main.java
-	options.compilerArgs += [
-		'-Xlint:deprecation',
-		enablePreviewJvmArg
-	]
+	options.compilerArgs += '-Xlint:deprecation'
 	options.encoding = 'UTF-8'
 }
 
 run {
-	jvmArgs += enablePreviewJvmArg
 	if (os.linux)
 		jvmArgs += linuxJvmArgs
 }
@@ -429,9 +423,7 @@ tasks.register('jpackage', Exec) {
 		"Copyright ${new Date().format('yyyy')} Matteo Hausner",
 		'--vendor',
 		'Matteo Hausner',
-		'--verbose',
-		'--java-options',
-		enablePreviewJvmArg
+		'--verbose'
 	]
 	if (os.linux)
 		linuxJvmArgs.each { commandLineParts.addAll(['--java-options', it]) }