diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 8922017df1..683b499ea4 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -51,7 +51,7 @@ jobs:
     - name: Setup Java JDK
       uses: actions/setup-java@v3
       with:
-        java-version: 17
+        java-version: 25
         distribution: 'zulu'
 
     # Initializes the CodeQL tools for scanning.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a5efa596ec..d96df78687 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -9,10 +9,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK 25
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '25'
         distribution: 'zulu'
 
     - name: Build and Run Unit Tests
diff --git a/.github/workflows/pull-request-build.yml b/.github/workflows/pull-request-build.yml
index 36810ef1d3..9e4f50067a 100644
--- a/.github/workflows/pull-request-build.yml
+++ b/.github/workflows/pull-request-build.yml
@@ -12,10 +12,10 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     
-    - name: Set up JDK 17
+    - name: Set up JDK 25
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '25'
         distribution: 'zulu'
         
     - name: Cache Maven packages
diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml
index 6da9a34afe..75e284574d 100644
--- a/.github/workflows/sonar-scan.yml
+++ b/.github/workflows/sonar-scan.yml
@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK 25
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '25'
         distribution: 'zulu'
 
     - name: Build and Analyze Code Coverage
diff --git a/README.md b/README.md
index b0e8c70cde..991574a317 100644
--- a/README.md
+++ b/README.md
@@ -48,9 +48,9 @@ The result from the build of this component is a WAR file which is the deployabl
 *WARNING*: With [Issue 117](https://github.com/cloudfoundry-incubator/multiapps-cli-plugin/issues/117) the master branch of this repository as well as other artifacts will be renamed. Adaptation to any CI/CD infrastructure & scripts will be required.
 
 ## Build tools
-All components are built with Java 17 and [Apache Maven](http://maven.apache.org/), version `3.9.6` or newer. 
+All components are built with Java 25 and [Apache Maven](http://maven.apache.org/), version `3.9.6` or newer. 
 
-Make sure that your Maven is configured to use Java 17 by configuring the `JAVA_HOME` env to point to the correct Java JDK.
+Make sure that your Maven is configured to use Java 25 by configuring the `JAVA_HOME` env to point to the correct Java JDK.
 ## Compiling and Packaging
 To build all components, run the following command from the root directory of the project:
 ```
diff --git a/multiapps-controller-web/manifests/manifest.yml b/multiapps-controller-web/manifests/manifest.yml
index 29f072d8ce..fd5e11285d 100644
--- a/multiapps-controller-web/manifests/manifest.yml
+++ b/multiapps-controller-web/manifests/manifest.yml
@@ -16,7 +16,7 @@ applications:
       XS_TYPE: CF
       DB_TYPE: POSTGRESQL
       CATALINA_OPTS: "-Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true"
-      JBP_CONFIG_SAP_MACHINE_JRE: '{ jre: { version: "17.+" } }'
+      JBP_CONFIG_SAP_MACHINE_JRE: '{ jre: { version: "25.+" } }'
       JBP_CONFIG_TOMCAT: '{ tomcat: { version: 10.+ } }'
       JBP_CONFIG_COMPONENTS: '{jres: ["JavaBuildpack::Jre::SapMachineJRE"]}'
       JAVA_OPTS: '-XX:+HeapDumpOnOutOfMemoryError -XX:MaxDirectMemorySize=192m -Xshare:off -XX:MaxMetaspaceSize=300m -XX:+ErrorFileToStdout -XX:TrimNativeHeapInterval=10000 -Dio.netty.noPreferDirect=true -Dio.netty.maxDirectMemory=0'
diff --git a/pom.xml b/pom.xml
index c4e1cd608e..ee4e5aee0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,8 +118,8 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.14.1</version>
                     <configuration>
-                        <source>17</source>
-                        <target>17</target>
+                        <source>25</source>
+                        <target>25</target>
                         <annotationProcessorPaths>
                             <!-- Necessary to generate immutable classes and xml configuration to recognize alicloud implementation in jclouds
                             generated file should be inside multiapps-controller-persistence/target/classes/META-INF/services -->