diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 346f83f96..0caa5a292 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,10 +24,10 @@ jobs:
             -   uses: actions/setup-java@v4
                 with:
                     distribution: 'temurin'
-                    java-version: '21'
+                    java-version: '23'
             -   name: Pre-commit checks
                 uses: pre-commit/action@v3.0.1
-            -   name: pre-commit-ci-lite
+            -   name: pre-commit-c-lite
                 uses: pre-commit-ci/lite-action@v1.1.0
                 if: always()
     build:
@@ -40,11 +40,11 @@ jobs:
             max-parallel: 1
         steps:
             -   uses: actions/checkout@v4.1.6
-            -   name: Set up JDK 21
+            -   name: Set up JDK 23
                 uses: actions/setup-java@v4.2.1
                 with:
                     distribution: 'temurin'
-                    java-version: 21
+                    java-version: 23
                     architecture: x64
                     cache: 'maven'
             -   name: Build with Maven
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 238f5cba4..883d6f0da 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,11 +15,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 21
+      - name: Set up JDK 23
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version: 23
           architecture: x64
           cache: 'maven'
 
@@ -116,11 +116,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up JDK 21
+      - name: Set up JDK 23
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version: 23
           architecture: x64
 
       - name: Set version to next snapshot
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 54ea4f461..f6ea94ad6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -28,12 +28,12 @@ jobs:
                 with:
                     python-version: '3.7'
                     architecture: x64
-            # Uses an action to add JDK 21 to the VM (and mvn?)
-            -   name: set up JDK 21
+            # Uses an action to add JDK 23 to the VM (and mvn?)
+            -   name: set up JDK 23
                 uses: actions/setup-java@v4.2.1
                 with:
                     distribution: 'temurin'
-                    java-version: 21
+                    java-version: 23
                     architecture: x64
                     cache: 'maven'
             -   uses: BSFishy/pip-action@v1
diff --git a/Dockerfile b/Dockerfile
index 12077a033..c110ae3c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # We need JDK as some of the lessons needs to be able to compile Java code
-FROM docker.io/eclipse-temurin:21-jdk-jammy
+FROM docker.io/eclipse-temurin:23-jdk-noble
 
 LABEL name="WebGoat: A deliberately insecure Web Application"
 LABEL maintainer="WebGoat team"
diff --git a/Dockerfile_desktop b/Dockerfile_desktop
index b0149f483..1f56d2758 100644
--- a/Dockerfile_desktop
+++ b/Dockerfile_desktop
@@ -33,14 +33,14 @@ RUN \
   *) ARCH=unknown;; \
  esac && \
  echo "oeps == ${ARCH}==" && \
- curl -L https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_"${ARCH}"_linux_hotspot_21.0.3_9.tar.gz -o java.tar.gz && \
+ curl -L https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.1%2B11/OpenJDK23U-jre_"${ARCH}"_linux_hotspot_23.0.1_11.tar.gz -o java.tar.gz && \
  tar zfxv java.tar.gz && \
  rm -rf java.tar.gz && \
  chmod +x /config/start_webgoat.sh && \
  chmod +x /config/start_zap.sh && \
- echo "JAVA_HOME=/config/jdk-21.0.3+9-jre/" >> .bash_aliases && \
+ echo "JAVA_HOME=/config/jdk-23.0.1+11/" >> .bash_aliases && \
  echo "PATH=$PATH:$JAVA_HOME/bin" >> .bash_aliases
 
-ENV JAVA_HOME=/config/jdk-21.0.3+9-jre
+ENV JAVA_HOME=/config/jdk-23.0.1+11
 
 WORKDIR /config/Desktop
diff --git a/README.md b/README.md
index ffb686331..3efa8e7ac 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # WebGoat: A deliberately insecure Web Application
 
 [![Build](https://github.com/WebGoat/WebGoat/actions/workflows/build.yml/badge.svg?branch=develop)](https://github.com/WebGoat/WebGoat/actions/workflows/build.yml)
-[![java-jdk](https://img.shields.io/badge/java%20jdk-21-green.svg)](https://jdk.java.net/)
+[![java-jdk](https://img.shields.io/badge/java%20jdk-23-green.svg)](https://jdk.java.net/)
 [![OWASP Labs](https://img.shields.io/badge/OWASP-Lab%20project-f7b73c.svg)](https://owasp.org/projects/)
 [![GitHub release](https://img.shields.io/github/release/WebGoat/WebGoat.svg)](https://github.com/WebGoat/WebGoat/releases/latest)
 [![Gitter](https://badges.gitter.im/OWASPWebGoat/community.svg)](https://gitter.im/OWASPWebGoat/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
diff --git a/pom.xml b/pom.xml
index e02dbbab6..7e438d78b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,20 +74,22 @@
     <commons-text.version>1.13.0</commons-text.version>
     <guava.version>33.3.1-jre</guava.version>
     <jacoco.version>0.8.11</jacoco.version>
-    <java.version>21</java.version>
+    <java.version>23</java.version>
     <jaxb.version>2.3.1</jaxb.version>
     <jjwt.version>0.9.1</jjwt.version>
     <jose4j.version>0.9.3</jose4j.version>
     <jquery.version>3.7.1</jquery.version>
     <jsoup.version>1.18.3</jsoup.version>
-    <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
+    <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
     <maven-failsafe-plugin.version>2.22.0</maven-failsafe-plugin.version>
     <maven-jar-plugin.version>3.1.2</maven-jar-plugin.version>
     <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
     <maven-source-plugin.version>3.1.0</maven-source-plugin.version>
     <maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
-    <maven.compiler.source>21</maven.compiler.source>
-    <maven.compiler.target>21</maven.compiler.target>
+    <maven.compiler.proc>full</maven.compiler.proc>
+    <maven.compiler.source>23</maven.compiler.source>
+    <maven.compiler.target>23</maven.compiler.target>
+
     <pmd.version>3.15.0</pmd.version>
     <!-- Use UTF-8 Encoding -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -229,6 +231,7 @@
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
+      <version>1.18.36</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>