diff --git a/.github/workflows/create-release-on-tag.yml b/.github/workflows/create-release-on-tag.yml
index 0a1398d3..7101173f 100644
--- a/.github/workflows/create-release-on-tag.yml
+++ b/.github/workflows/create-release-on-tag.yml
@@ -30,7 +30,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: 'maven'
 
       - name: Extract project version from Maven
diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index f7d34ccd..a3813f40 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -23,7 +23,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: 'maven'
       - name: Display Maven version
         run: ./mvnw -v
@@ -42,7 +42,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: 'maven'
       - name: OWASP Dependency Check
         run: ./mvnw -ntp org.owasp:dependency-check-maven:check -DfailBuildOnCVSS=7.0 -DnvdApiKeyEnvironmentVariable=NVD_API_KEY
diff --git a/pom.xml b/pom.xml
index 13603de7..437f0010 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
-		<java.version>17</java.version>
+		<java.version>21</java.version>
 		<docker.image>fakesmtp</docker.image>
 
         <error-prone.version>2.42.0</error-prone.version>