diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 869c13ff..68c61209 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
       uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
       with:
         distribution: temurin
-        java-version: 18
+        java-version: 21
 
     - name: Run unit tests
       uses: gradle/gradle-build-action@87a9a15658c426a54dd469d4fc7dc1a73ca9d4a6 # v2.10.0
@@ -84,7 +84,7 @@ jobs:
       uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
       with:
         distribution: temurin
-        java-version: 18
+        java-version: 21
 
     - name: Decrypt secrets
       run: |
diff --git a/.github/workflows/code_quality_analysis.yml b/.github/workflows/code_quality_analysis.yml
index a91e60b7..d5368e25 100644
--- a/.github/workflows/code_quality_analysis.yml
+++ b/.github/workflows/code_quality_analysis.yml
@@ -28,7 +28,7 @@ jobs:
       uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
       with:
         distribution: temurin
-        java-version: 18
+        java-version: 21
 
     - name: Setup Gradle caching
       uses: gradle/gradle-build-action@87a9a15658c426a54dd469d4fc7dc1a73ca9d4a6 # v2.10.0
@@ -63,7 +63,7 @@ jobs:
         uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
         with:
           distribution: temurin
-          java-version: 18
+          java-version: 21
 
       - name: Setup Gradle caching
         uses: gradle/gradle-build-action@87a9a15658c426a54dd469d4fc7dc1a73ca9d4a6 # v2.10.0
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c5f27107..9150461c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,7 +25,7 @@ jobs:
       uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
       with:
         distribution: temurin
-        java-version: 18
+        java-version: 21
 
     - name: Set up Git author
       shell: bash
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
index 0fc91bde..51290b35 100644
--- a/build-logic/build.gradle.kts
+++ b/build-logic/build.gradle.kts
@@ -6,7 +6,7 @@
  */
 plugins { `kotlin-dsl` }
 
-kotlin.jvmToolchain { languageVersion.set(JavaLanguageVersion.of(17)) }
+kotlin.jvmToolchain { languageVersion.set(JavaLanguageVersion.of(21)) }
 
 gradlePlugin {
   plugins {
diff --git a/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/KotlinCommonPlugin.kt b/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/KotlinCommonPlugin.kt
index 542ffffb..10d7466f 100644
--- a/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/KotlinCommonPlugin.kt
+++ b/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/KotlinCommonPlugin.kt
@@ -49,6 +49,6 @@ class KotlinCommonPlugin : Plugin<Project> {
       )
 
     val JVM_TOOLCHAIN_ACTION =
-      Action<JavaToolchainSpec> { languageVersion.set(JavaLanguageVersion.of(17)) }
+      Action<JavaToolchainSpec> { languageVersion.set(JavaLanguageVersion.of(21)) }
   }
 }