diff --git a/.github/workflows/dependency-check-maven.yml b/.github/workflows/dependency-check-maven.yml
index 50a02df..3a77608 100644
--- a/.github/workflows/dependency-check-maven.yml
+++ b/.github/workflows/dependency-check-maven.yml
@@ -14,11 +14,11 @@ jobs:
         with:
           ref: develop
 
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: '21'
+          java-version: '25'
           cache: maven
 
       - name: Execute OWASP dependency check
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
index a5fe2fb..0bd16a8 100644
--- a/.github/workflows/develop.yml
+++ b/.github/workflows/develop.yml
@@ -15,11 +15,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: '21'
+          java-version: '25'
           cache: maven
       - name: Fail build if version contains SNAPSHOT
         run: |
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e52d858..2a9bbd0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,11 +14,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 21
+      - name: Set up JDK 25
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: '21'
+          java-version: '25'
           cache: maven
       - run: echo "VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
       - run: echo "BUILD_VERSION=${VERSION%-SNAPSHOT}" >> $GITHUB_ENV
diff --git a/oc-sso-query/pom.xml b/oc-sso-query/pom.xml
index 48109d1..0d0aa3f 100644
--- a/oc-sso-query/pom.xml
+++ b/oc-sso-query/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>oc-sso-query-parent</artifactId>
         <groupId>nl.kennisnet.services</groupId>
-        <version>2.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index d825070..39b9fda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <groupId>nl.kennisnet.services</groupId>
     <artifactId>oc-sso-query-parent</artifactId>
     <packaging>pom</packaging>
-    <version>2.5.1-SNAPSHOT</version>
+    <version>2.6.0-SNAPSHOT</version>
     <modules>
         <module>oc-sso-query</module>
         <module>release</module>
@@ -41,12 +41,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>4.0.7</version>
+        <version>4.1.1</version>
     </parent>
 
     <properties>
+        <project.build.outputTimestamp>${maven.build.timestamp}</project.build.outputTimestamp>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>21</java.version>
+        <java.version>25</java.version>
         <jacoco.version>0.8.13</jacoco.version>
         <maven.deploy.skip>true</maven.deploy.skip>
         <dependency-check-maven.version>12.2.2</dependency-check-maven.version>
@@ -58,6 +59,8 @@
         <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
         <maven-scm.version>1.11.2</maven-scm.version>
         <sonar-maven-plugin.version>5.5.0.6356</sonar-maven-plugin.version>
+        <freemarker.version>2.3.35</freemarker.version> <!-- Temporary fix for CVE-2026-84939 -->
+        <tomcat.version>11.0.25</tomcat.version> <!-- Temporary fix for CVE-2026-65183(8.1), CVE-2026-65905(9.8), CVE-2026-66422(8.1), CVE-2026-68525(9.1), CVE-2026-68569(8.1), CVE-2026-65182(9.1), CVE-2026-65637(9.8) -->
     </properties>
 
     <distributionManagement>
@@ -77,6 +80,13 @@
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
                 </configuration>
             </plugin>
             <plugin>
@@ -210,31 +220,4 @@
         </developer>
     </developers>
 
-    <contributors>
-        <contributor>
-            <name>Aram Mutlu</name>
-            <organization>Stichting Kennisnet</organization>
-            <roles>
-                <role>Developer</role>
-            </roles>
-            <email>A.Mutlu@kennisnet.nl</email>
-        </contributor>
-        <contributor>
-            <name>Vincent Jong</name>
-            <organization>Stichting Kennisnet</organization>
-            <roles>
-                <role>Developer</role>
-            </roles>
-            <email>V.Jong@kennisnet.nl</email>
-        </contributor>
-        <contributor>
-            <name>Tim Poot</name>
-            <organization>Stichting Kennisnet</organization>
-            <roles>
-                <role>Developer</role>
-            </roles>
-            <email>T.Poot@kennisnet.nl</email>
-        </contributor>
-    </contributors>
-
 </project>
\ No newline at end of file
diff --git a/release/pom.xml b/release/pom.xml
index cdb4ca7..d3a4bf5 100644
--- a/release/pom.xml
+++ b/release/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>nl.kennisnet.services</groupId>
         <artifactId>oc-sso-query-parent</artifactId>
-        <version>2.5.1-SNAPSHOT</version>
+        <version>2.6.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -31,7 +31,7 @@
     <properties>
         <!-- A list of all the previous versions in reverse order, separated by a comma separator -->
         <!-- The current version is automatically added in the release-notes-all overview. -->
-        <versions>2.5.0</versions>
+        <versions>2.6.0,2.5.0</versions>
         <maven.deploy.skip>false</maven.deploy.skip>
     </properties>
 
diff --git a/release/src/site/markdown/docs/2.6.0/release-notes.md b/release/src/site/markdown/docs/2.6.0/release-notes.md
new file mode 100644
index 0000000..46e81cf
--- /dev/null
+++ b/release/src/site/markdown/docs/2.6.0/release-notes.md
@@ -0,0 +1,25 @@
+# OC SSO Query Service - Release Notes
+
+| Field                      | Value                   |
+|:---------------------------|:------------------------|
+| Application                | OC SSO Query Service    |
+| Version                    | 2.6.0                   |
+| Changes since version      | 2.5.0                   |
+| Release date               | 09-10-2026 (dd-mm-yyyy) |
+| Delivery type              | Full release            |
+
+## Changes
+
+| #        | Description                   |
+|:---------|:------------------------------|
+| ENT-5521 | Build release SSO Query 2.6.0 |
+
+As of version 2.6.0 of OC SSO Query Service the minimum required Java version is 25.
+
+## Configuration changes
+
+None.
+
+## Known vulnerabilities
+
+At the time of build, the application contains no known vulnerabilities with a CVE score of 7 or higher.
diff --git a/release/src/site/markdown/docs/installation-manual.md b/release/src/site/markdown/docs/installation-manual.md
index 716229d..eb955a2 100644
--- a/release/src/site/markdown/docs/installation-manual.md
+++ b/release/src/site/markdown/docs/installation-manual.md
@@ -2,12 +2,12 @@
 
 The OC SSO Query Service uses:
 
-- OpenJDK 21
+- OpenJDK 25
 - Spring Boot 4
 
-## OpenJDK 21
+## OpenJDK 25
 
-The version of Java used is OpenJDK 21.x.
+The version of Java used is OpenJDK 25.x.
 
 ### Environment specific configuration files