diff --git a/developer-information.md b/developer-information.md
index e79317bdf..fddf05a0d 100644
--- a/developer-information.md
+++ b/developer-information.md
@@ -2,7 +2,7 @@
 
 ## Requirements:
 
-* JDK 17 - We develop the adaptor in Java with Spring Boot
+* JDK 21 - We develop the adaptor in Java with Spring Boot
 * Docker
 * Version 38.2 of the SNOMED CT UK Edition monolith zip file.
   See [First Installation](./OPERATING.md#populating-the-snomed-database) for instructions on how to download.
diff --git a/docker/common-modules/Dockerfile b/docker/common-modules/Dockerfile
index 8828430b8..716ec41ee 100755
--- a/docker/common-modules/Dockerfile
+++ b/docker/common-modules/Dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:8.8-jdk17 AS build
+FROM gradle:8.8-jdk21 AS build
 COPY --chown=gradle:gradle settings.gradle /home/gradle/service/
 COPY --chown=gradle:gradle ./common /home/gradle/service/common
 COPY --chown=gradle:gradle ./db-connector /home/gradle/service/db-connector
diff --git a/docker/db-migration/Dockerfile b/docker/db-migration/Dockerfile
index 9165d91d9..3086fbd3f 100755
--- a/docker/db-migration/Dockerfile
+++ b/docker/db-migration/Dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:8.8-jdk17
+FROM gradle:8.8-jdk21
 
 COPY --chown=gradle:gradle settings.gradle /home/gradle/service/
 COPY --chown=gradle:gradle ./common /home/gradle/service/common
diff --git a/docker/gp2gp-translator/Dockerfile b/docker/gp2gp-translator/Dockerfile
index e32a46cfa..fead354ff 100755
--- a/docker/gp2gp-translator/Dockerfile
+++ b/docker/gp2gp-translator/Dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:8.8-jdk17 AS build
+FROM gradle:8.8-jdk21 AS build
 COPY --chown=gradle:gradle settings.gradle /home/gradle/service/
 COPY --chown=gradle:gradle ./gp2gp-translator /home/gradle/service/gp2gp-translator
 COPY --chown=gradle:gradle ./common /home/gradle/service/common
@@ -9,7 +9,7 @@ COPY --chown=gradle:gradle ./config /home/gradle/service/config
 WORKDIR /home/gradle/service/gp2gp-translator
 RUN gradle --build-cache bootJar
 
-FROM eclipse-temurin:17-jre-jammy
+FROM eclipse-temurin:21-jre-jammy
 
 EXPOSE 8085
 
diff --git a/docker/gpc-facade/Dockerfile b/docker/gpc-facade/Dockerfile
index 9fc63f6d6..05d89b8ea 100755
--- a/docker/gpc-facade/Dockerfile
+++ b/docker/gpc-facade/Dockerfile
@@ -1,4 +1,4 @@
-FROM gradle:8.8-jdk17 AS build
+FROM gradle:8.8-jdk21 AS build
 COPY --chown=gradle:gradle settings.gradle /home/gradle/service/
 COPY --chown=gradle:gradle ./gpc-api-facade /home/gradle/service/gpc-api-facade
 COPY --chown=gradle:gradle ./common /home/gradle/service/common
@@ -8,7 +8,7 @@ COPY --chown=gradle:gradle ./config /home/gradle/service/config
 WORKDIR /home/gradle/service/gpc-api-facade
 RUN gradle --build-cache bootJar
 
-FROM eclipse-temurin:17-jre-jammy
+FROM eclipse-temurin:21-jre-jammy
 
 EXPOSE 8081
 
diff --git a/getting-started-with-windows.md b/getting-started-with-windows.md
index 3d92bbbd5..16ac2a03a 100644
--- a/getting-started-with-windows.md
+++ b/getting-started-with-windows.md
@@ -73,7 +73,7 @@ Before cloning the project, we need to create a `.gitconfig` file.
    run in order (inside the Ubuntu terminal)
 
    ```
-   sudo apt install openjdk-17-jdk
+   sudo apt install openjdk-21-jdk
    sudo apt update
    ```
 7. Now we need to configure JAVA_HOME variable
@@ -93,15 +93,13 @@ Before cloning the project, we need to create a `.gitconfig` file.
    sudo update-alternatives --config java
    sudo apt update
    ```
-11. Use this command to check if JAVA17 is installed
+11. Use this command to check if JAVA21 is installed
    ```
    java -version   
    ```
 12. You should be presented with this:
    ```
-   openjdk version "17.0.7" 2023-04-18
-   OpenJDK Runtime Environment (build 17.0.7+7-Ubuntu-0ubuntu122.04.2)
-   OpenJDK 64-Bit Server VM (build 17.0.7+7-Ubuntu-0ubuntu122.04.2, mixed mode, sharing)
+   openjdk version "21.0.0"
    ```
 
 13. To install unzip run in the Ubuntu Terminal
diff --git a/test-suite/docker/activemq/Dockerfile b/test-suite/docker/activemq/Dockerfile
index 5034f6bdf..86d4221eb 100644
--- a/test-suite/docker/activemq/Dockerfile
+++ b/test-suite/docker/activemq/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:17-jdk-alpine
+FROM openjdk:21-jdk-alpine
 
 ENV ACTIVEMQ_VERSION 5.16.3
 ENV ACTIVEMQ apache-activemq-$ACTIVEMQ_VERSION
diff --git a/test-suite/docker/mock-spine-mhs-outbound/DockerFile b/test-suite/docker/mock-spine-mhs-outbound/DockerFile
index 99dc58618..f2223f893 100644
--- a/test-suite/docker/mock-spine-mhs-outbound/DockerFile
+++ b/test-suite/docker/mock-spine-mhs-outbound/DockerFile
@@ -1,4 +1,4 @@
-FROM gradle:7.2.0-jdk17 AS build
+FROM gradle:7.2.0-jdk21 AS build
 
 COPY --chown=gradle:gradle ../mock-spine-mhs-outbound /home/gradle/mock-spine-mhs-outbound
 
@@ -10,7 +10,7 @@ FROM build AS package
 
 RUN gradle --build-cache bootJar
 
-FROM eclipse-temurin:17-jre
+FROM eclipse-temurin:21-jre
 
 EXPOSE 8086
 EXPOSE 8443