diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index b36c5831..ca4a8f3d 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -24,8 +24,8 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v4
       with:
-        java-version: 17
-        distribution: 'sapmachine'
+        java-version: 21
+        distribution: sapmachine
 
     - name: Build with Maven
       run: mvn -ntp -B clean install
diff --git a/mta.yaml b/mta.yaml
index 39b88f1f..870ac9c8 100644
--- a/mta.yaml
+++ b/mta.yaml
@@ -17,7 +17,7 @@ modules:
     properties:
         SPRING_PROFILES_ACTIVE: cloud
         JBP_CONFIG_COMPONENTS: '{jres: ["JavaBuildpack::Jre::SapMachineJRE"]}'
-        JBP_CONFIG_SAP_MACHINE_JRE: '{ jre: { version: "17.+" } }'
+        JBP_CONFIG_SAP_MACHINE_JRE: '{ jre: { version: "21.+" } }'
         # We do not want cfenv to configure the DataSource for us
         # cfenv uses names of the services, so this variable must be adapted if needed
         # as CFENV_SERVICE_[service-name]_ENABLED
diff --git a/pom.xml b/pom.xml
index 431dc5ca..5899f95d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,12 +15,12 @@
 		<revision>1.0.0-SNAPSHOT</revision>
 
 		<!-- DEPENDENCIES VERSION -->
-		<jdk.version>17</jdk.version>
-		<cds.services.version>3.5.0</cds.services.version>
+		<jdk.version>21</jdk.version>
+		<cds.services.version>3.6.0</cds.services.version>
 		<spring.boot.version>3.4.0</spring.boot.version>
 		<cf-java-logging-support.version>3.8.4</cf-java-logging-support.version>
 
-		<cds.cdsdk-version>8.5.0</cds.cdsdk-version>
+		<cds.cdsdk-version>8.6.1</cds.cdsdk-version>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>