diff --git a/.github/workflows/ci-dependency-check.yml b/.github/workflows/ci-dependency-check.yml
index c1dbf27..40ba06b 100644
--- a/.github/workflows/ci-dependency-check.yml
+++ b/.github/workflows/ci-dependency-check.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/setup-java@v2
         with:
-          java-version: 17
+          java-version: 21
           distribution: adopt
       - uses: actions/checkout@v2
         with:
diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
index ef4e986..71f8414 100644
--- a/.github/workflows/ci-main.yml
+++ b/.github/workflows/ci-main.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: adopt
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/ci-pull-request.yml b/.github/workflows/ci-pull-request.yml
index 6604214..24479c0 100644
--- a/.github/workflows/ci-pull-request.yml
+++ b/.github/workflows/ci-pull-request.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/setup-java@v2
         with:
-          java-version: 17
+          java-version: 21
           distribution: adopt
       - uses: actions/checkout@v2
         with:
diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml
index eb49f05..208caba 100644
--- a/.github/workflows/ci-release.yml
+++ b/.github/workflows/ci-release.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: adopt
       - uses: actions/checkout@v4
         with:
diff --git a/Dockerfile b/Dockerfile
index 4b57ed3..259034c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jre
+FROM eclipse-temurin:21-jre
 
 WORKDIR /
 
diff --git a/README.md b/README.md
index fb5f5a6..de46b41 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ The TNG Key Distribution Service is part of the national backends of the partici
 
 ### Prerequisites
 
-- [Open JDK 17](https://openjdk.java.net)
+- [Open JDK 21](https://openjdk.java.net)
 - [Maven](https://maven.apache.org)
 - [Docker](https://www.docker.com)
 - An installation of the [TNG](https://github.com/worldhealthorganization/smart-trust-network-gateway)
diff --git a/pom.xml b/pom.xml
index 7973785..c79a35a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-starter-parent</artifactId>
-        <version>2023.0.1</version>
+        <version>2023.0.2</version>
     </parent>
 
     <groupId>tng.trustnetwork.keydistribution</groupId>
@@ -24,9 +24,9 @@
 
     <properties>
         <!-- java -->
-        <java.version>17</java.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <java.version>21</java.version>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <!-- charset -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>eu.europa.ec.dgc</groupId>
             <artifactId>ddcc-gateway-lib</artifactId>
-            <version>2.0.2</version>
+            <version>2.1.0</version>
         </dependency>
         <!-- Spring Boot Dependencies -->
         <dependency>