diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
index 0c5cc94d..de5c352f 100644
--- a/.github/workflows/ant.yml
+++ b/.github/workflows/ant.yml
@@ -150,10 +150,10 @@ jobs:
     needs: build
     strategy: 
       matrix: 
-        jdk: [8, 11, 17, 21, 23]
+        jdk: [8, 11, 17, 21, 25]
         tool: 
           - {name: "maven",  cmd: "mvn compile"}
-          - {name: "gradle", cmd: "gradle assemble"}
+          - {name: "gradle", cmd: "gradle assemble", buildArgs: {"25": "--build-arg gradle=9.1.0"}}
           - {name: "ant",    cmd: "ant dist"}
           - {name: "bazel",  cmd: "bazel build //:ProjectRunner"}
       fail-fast: false
@@ -170,7 +170,7 @@ jobs:
         
       - name: Build container
         working-directory: ./docker
-        run: docker build --build-arg jdk=${{ matrix.jdk }} -t $IMAGE_NAME -f ${{ matrix.tool.name }}/Dockerfile .
+        run: docker build --build-arg jdk=${{ matrix.jdk }} ${{ matrix.tool.buildArgs[matrix.jdk] }} -t $IMAGE_NAME -f ${{ matrix.tool.name }}/Dockerfile .
         
       - name: Compile in container
         run: docker run --entrypoint="" -v $(pwd)/lombok.jar:/workspace/lombok.jar $IMAGE_NAME /bin/bash -c "cd classpath; ${{ matrix.tool.cmd }}"
@@ -180,7 +180,7 @@ jobs:
     needs: build
     strategy: 
       matrix: 
-        jdk: [8, 11, 17, 21, 23]
+        jdk: [8, 11, 17, 21, 25]
         dir: [compileTests]
       fail-fast: false
     
diff --git a/docker/ant/files/jdk-23/classpath/build.xml b/docker/ant/files/jdk-25/classpath/build.xml
similarity index 100%
rename from docker/ant/files/jdk-23/classpath/build.xml
rename to docker/ant/files/jdk-25/classpath/build.xml
diff --git a/docker/ant/files/jdk-23/modules/build.xml b/docker/ant/files/jdk-25/modules/build.xml
similarity index 100%
rename from docker/ant/files/jdk-23/modules/build.xml
rename to docker/ant/files/jdk-25/modules/build.xml
diff --git a/docker/maven/files/jdk-23/classpath/pom.xml b/docker/maven/files/jdk-25/classpath/pom.xml
similarity index 98%
rename from docker/maven/files/jdk-23/classpath/pom.xml
rename to docker/maven/files/jdk-25/classpath/pom.xml
index 52df5b57..b96de94f 100644
--- a/docker/maven/files/jdk-23/classpath/pom.xml
+++ b/docker/maven/files/jdk-25/classpath/pom.xml
@@ -7,7 +7,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>23</java.version>
+        <java.version>25</java.version>
     </properties>
 
     <build>
diff --git a/docker/maven/files/jdk-23/modules/pom.xml b/docker/maven/files/jdk-25/modules/pom.xml
similarity index 98%
rename from docker/maven/files/jdk-23/modules/pom.xml
rename to docker/maven/files/jdk-25/modules/pom.xml
index 8c673a42..f822c186 100644
--- a/docker/maven/files/jdk-23/modules/pom.xml
+++ b/docker/maven/files/jdk-25/modules/pom.xml
@@ -7,7 +7,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>23</java.version>
+        <java.version>25</java.version>
     </properties>
 
     <build>
diff --git a/docker/provision/jdk/java-23.sh b/docker/provision/jdk/java-23.sh
deleted file mode 100755
index 5c489e28..00000000
--- a/docker/provision/jdk/java-23.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-apt-get update && apt-get install -y wget
-wget https://download.java.net/java/GA/jdk23/3c5b90190c68498b986a97f276efd28a/37/GPL/openjdk-23_linux-x64_bin.tar.gz -O jdk.tar.gz
-tar -xzf jdk.tar.gz -C /opt/
-mv /opt/jdk-23 /opt/jdk
diff --git a/docker/provision/jdk/java-25.sh b/docker/provision/jdk/java-25.sh
new file mode 100755
index 00000000..a7d923d2
--- /dev/null
+++ b/docker/provision/jdk/java-25.sh
@@ -0,0 +1,4 @@
+apt-get update && apt-get install -y wget
+wget https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jdk_x64_linux_hotspot_25_36.tar.gz -O jdk.tar.gz
+tar -xzf jdk.tar.gz -C /opt/
+mv /opt/jdk-25+36 /opt/jdk
\ No newline at end of file