diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 9a7643d8..14397eb4 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -24,7 +24,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v5
       with:
-        java-version: 21
+        java-version: 25
         distribution: 'sapmachine'
     - name: Build with Maven
       run: mvn -ntp -B clean install
diff --git a/mta-multi-tenant.yaml b/mta-multi-tenant.yaml
index 1293b234..50631f6d 100644
--- a/mta-multi-tenant.yaml
+++ b/mta-multi-tenant.yaml
@@ -22,7 +22,7 @@ modules:
       SPRING_PROFILES_ACTIVE: cloud,sandbox
       CDS_MULTITENANCY_APPUI_TENANTSEPARATOR: "-"
       JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jre.SAPMachineJRE']"
-      JBP_CONFIG_SAP_MACHINE_JRE: '{ version: 21.+ }'
+      JBP_CONFIG_SAP_MACHINE_JRE: '{ version: 25.+ }'
     build-parameters:
       builder: custom
       commands:
diff --git a/mta-single-tenant.yaml b/mta-single-tenant.yaml
index e7252ba0..07d0692a 100644
--- a/mta-single-tenant.yaml
+++ b/mta-single-tenant.yaml
@@ -21,7 +21,7 @@ modules:
     properties:
         SPRING_PROFILES_ACTIVE: cloud,sandbox
         JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jre.SAPMachineJRE']"
-        JBP_CONFIG_SAP_MACHINE_JRE: '{ version: 21.+ }'
+        JBP_CONFIG_SAP_MACHINE_JRE: '{ version: 25.+ }'
     build-parameters:
       builder: custom
       commands:
diff --git a/pom.xml b/pom.xml
index 0c3717c8..56aef290 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
 		<revision>1.0.0-SNAPSHOT</revision>
 
 		<!-- DEPENDENCIES VERSION -->
-		<jdk.version>21</jdk.version>
+		<jdk.version>25</jdk.version>
 		<cds.services.version>4.4.2</cds.services.version>
 		<cloud.sdk.version>5.24.0</cloud.sdk.version>
 		<xsuaa.version>3.6.5</xsuaa.version>