diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index a347eafe..eebfe9c1 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -47,7 +47,7 @@ jobs:
     - name: Set up openJDK version
       uses: actions/setup-java@v5
       with:
-        java-version: 21
+        java-version: 25
         distribution: 'zulu'  # =openJDK
     - name: Setup gradle
       uses: gradle/actions/setup-gradle@v4
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 63573b1e..5162d64c 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -22,7 +22,7 @@ on:
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: kit-data-manager/Typed-PID-Maker # repo name != app name in our case!
-  jdk: 21
+  jdk: 25
   distro: 'temurin'
   DOCKER_PLATFORMS: linux/amd64,linux/arm64
 
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 5a68113d..dd842bec 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         operating-system: [ubuntu-latest, macOS-latest, windows-latest]
-        jdk: [ 21 ]  # (open)JDK releases
+        jdk: [ 25 ]  # (open)JDK releases
 
     steps:
     - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
@@ -40,10 +40,10 @@ jobs:
     - name: Build and Test with Gradle
       run: ./gradlew -Dprofile=verbose build
     - name: Do one Coveralls test report
-      if: matrix.operating-system == 'ubuntu-latest' && matrix.jdk == 21
+      if: matrix.operating-system == 'ubuntu-latest' && matrix.jdk == 25
       run: ./gradlew jacocoTestReport coveralls
     - name: Docker build and test
-      if: matrix.operating-system == 'ubuntu-latest' && matrix.jdk == 21
+      if: matrix.operating-system == 'ubuntu-latest' && matrix.jdk == 25
       run: |
         curl --location --remote-name https://github.com/Orange-OpenSource/hurl/releases/download/4.0.0/hurl_4.0.0_amd64.deb
         sudo dpkg -i hurl_4.0.0_amd64.deb
diff --git a/README.md b/README.md
index 9027d502..18725c62 100644
--- a/README.md
+++ b/README.md
@@ -106,7 +106,7 @@ All other configuration properties affect only the `uniquely-generated-string`.
 
 > Note: Alternatively, you can use the docker image.
 
-**Required**: Java SE Development Kit 21 (or openjdk 21) or higher
+**Required**: Java SE Development Kit 25 (or openjdk 25) or higher
 
 - Building (with tests): `./gradlew clean build`
 - Building (with verbose test output) `./gradlew -Dprofile=verbose clean build`
diff --git a/build.gradle b/build.gradle
index af39a26e..377cebfd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -89,7 +89,7 @@ dependencies {
 
     implementation("net.handle:handle-client:9.3.2")
 
-    testImplementation(platform('org.junit:junit-bom:5.13.4'))
+    testImplementation(platform('org.junit:junit-bom:5.14.4'))
 	testImplementation('org.junit.jupiter:junit-jupiter')
     testImplementation('org.junit.jupiter:junit-jupiter-params')
 
diff --git a/docker/Dockerfile-build-in-image b/docker/Dockerfile-build-in-image
index 83f330c4..e7d246b6 100644
--- a/docker/Dockerfile-build-in-image
+++ b/docker/Dockerfile-build-in-image
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21 AS build-typid
+FROM eclipse-temurin:25 AS build-typid
 LABEL maintainer="webmaster@datamanager.kit.edu"
 LABEL stage=build
 RUN mkdir -p /app/
@@ -9,7 +9,7 @@ RUN ./gradlew build -x test --stacktrace && \
 
 
 # Create a clean, minimal image
-FROM eclipse-temurin:21 AS typed-pid-maker
+FROM eclipse-temurin:25 AS typed-pid-maker
 LABEL maintainer="webmaster@datamanager.kit.edu"
 LABEL stage=run
 
diff --git a/docker/Dockerfile-reuse-local-build b/docker/Dockerfile-reuse-local-build
index f64446b2..50876dc6 100644
--- a/docker/Dockerfile-reuse-local-build
+++ b/docker/Dockerfile-reuse-local-build
@@ -1,5 +1,5 @@
 # Create a clean, minimal image
-FROM eclipse-temurin:21 AS typed-pid-maker
+FROM eclipse-temurin:25 AS typed-pid-maker
 LABEL maintainer="webmaster@datamanager.kit.edu"
 LABEL stage=run