diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
index 08e4e030..3093e241 100644
--- a/.github/workflows/maven.yaml
+++ b/.github/workflows/maven.yaml
@@ -1,5 +1,5 @@
 env:
-  JAVA_VERSION: 17
+  JAVA_VERSION: 21
   REGISTRY: ghcr.io
   TZ: Europe/Berlin
 
diff --git a/refarch-gateway/pom.xml b/refarch-gateway/pom.xml
index df508e76..4b91ea75 100644
--- a/refarch-gateway/pom.xml
+++ b/refarch-gateway/pom.xml
@@ -18,7 +18,9 @@
     <name>refarch-gateway</name>
 
     <properties>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
 
         <jvm.options>-Dorg.conscrypt.native.workdir=$(pwd)</jvm.options>
         <jacoco.version>0.8.12</jacoco.version>