diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index b65da824d..ec84749fe 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -14,10 +14,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - name: Set up JDK 17
+    - name: Set up JDK 25
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '25'
         distribution: 'temurin'
     - uses: actions/checkout@v4
     - name: Set up QEMU
diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml
index 4e5bcecc8..227241b4d 100644
--- a/.github/workflows/draft-release.yml
+++ b/.github/workflows/draft-release.yml
@@ -16,7 +16,7 @@ jobs:
   setup:
     runs-on: ubuntu-latest
     container:
-      image: maven:3.9.9-eclipse-temurin-17-focal
+      image: maven:3.9.14-eclipse-temurin-25
       options: --user 1001
 
     steps:
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 170a9c747..15495980c 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -21,7 +21,7 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: maven:3.8.7-eclipse-temurin-17-alpine
+    container: maven:3.9.14-eclipse-temurin-25
 
     steps:
     - uses: actions/checkout@v4
diff --git a/admin-ui/Dockerfile b/admin-ui/Dockerfile
index 4caf48430..2fea2258b 100644
--- a/admin-ui/Dockerfile
+++ b/admin-ui/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21-alpine
+FROM eclipse-temurin:25-alpine
 LABEL org.opencontainers.image.source https://github.com/tno/knowledge-engine
 LABEL org.opencontainers.image.description="Knowledge Engine: Admin UI"
 LABEL org.opencontainers.image.licenses=Apache-2.0
diff --git a/knowledge-directory/Dockerfile b/knowledge-directory/Dockerfile
index b507e577c..29f86b2a0 100644
--- a/knowledge-directory/Dockerfile
+++ b/knowledge-directory/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21-alpine
+FROM eclipse-temurin:25-alpine
 LABEL org.opencontainers.image.source https://github.com/tno/knowledge-engine
 LABEL org.opencontainers.image.description="Knowledge Engine: Knowledge Directory"
 LABEL org.opencontainers.image.licenses=Apache-2.0
diff --git a/pom.xml b/pom.xml
index 9d603f1d0..5dcd83bd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,8 +77,8 @@
 		<jersey3-version>3.1.11</jersey3-version>
 		<jackson-version>2.20.2</jackson-version>
 		<junit-jupiter-version>6.0.3</junit-jupiter-version>
-		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>17</maven.compiler.target>
+		<maven.compiler.source>25</maven.compiler.source>
+		<maven.compiler.target>25</maven.compiler.target>
 		<revision>1.4.1-SNAPSHOT</revision>
 	</properties>
 
diff --git a/smart-connector-rest-dist/Dockerfile b/smart-connector-rest-dist/Dockerfile
index bca11501e..38fe314d2 100644
--- a/smart-connector-rest-dist/Dockerfile
+++ b/smart-connector-rest-dist/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21-alpine
+FROM eclipse-temurin:25-alpine
 LABEL org.opencontainers.image.source https://github.com/tno/knowledge-engine
 LABEL org.opencontainers.image.description="Knowledge Engine: Smart Connector (with HTTP API)"
 LABEL org.opencontainers.image.licenses=Apache-2.0