diff --git a/dockerfiles/dockerfile.simplatform-amd64 b/dockerfiles/dockerfile.simplatform-amd64
index d360d8d..0c34527 100644
--- a/dockerfiles/dockerfile.simplatform-amd64
+++ b/dockerfiles/dockerfile.simplatform-amd64
@@ -1,4 +1,4 @@
-FROM ghcr.io/galasa-dev/openjdk:11-jdk
+FROM ghcr.io/galasa-dev/openjdk:17
 
 RUN mkdir /galasa
 
diff --git a/galasa-simbank-tests/dev.galasa.simbank.manager/build-example.gradle b/galasa-simbank-tests/dev.galasa.simbank.manager/build-example.gradle
index 289527e..7ec3d45 100644
--- a/galasa-simbank-tests/dev.galasa.simbank.manager/build-example.gradle
+++ b/galasa-simbank-tests/dev.galasa.simbank.manager/build-example.gradle
@@ -3,8 +3,11 @@ plugins {
     id 'biz.aQute.bnd.builder' version '7.1.0'
 }
 
-sourceCompatibility = '11'
-targetCompatibility = '11'
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
 
 group = '%%prefix%%'
 version = '0.1.0'
diff --git a/galasa-simbank-tests/dev.galasa.simbank.manager/pom-example.xml b/galasa-simbank-tests/dev.galasa.simbank.manager/pom-example.xml
index 124c313..c89eb32 100644
--- a/galasa-simbank-tests/dev.galasa.simbank.manager/pom-example.xml
+++ b/galasa-simbank-tests/dev.galasa.simbank.manager/pom-example.xml
@@ -11,9 +11,9 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>11</java.version>
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
+		<java.version>17</java.version>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
 		<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
 		<unpackBundle>true</unpackBundle>
 	</properties>
diff --git a/galasa-simbank-tests/dev.galasa.simbank.tests/build-example.gradle b/galasa-simbank-tests/dev.galasa.simbank.tests/build-example.gradle
index 7162628..788b84f 100644
--- a/galasa-simbank-tests/dev.galasa.simbank.tests/build-example.gradle
+++ b/galasa-simbank-tests/dev.galasa.simbank.tests/build-example.gradle
@@ -3,8 +3,11 @@ plugins {
     id 'biz.aQute.bnd.builder' version '7.1.0'
 }
 
-sourceCompatibility = '11'
-targetCompatibility = '11'
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
 
 group = '%%prefix%%'
 version = '0.1.0'
diff --git a/galasa-simbank-tests/dev.galasa.simbank.tests/pom-example.xml b/galasa-simbank-tests/dev.galasa.simbank.tests/pom-example.xml
index 02a2696..0585def 100644
--- a/galasa-simbank-tests/dev.galasa.simbank.tests/pom-example.xml
+++ b/galasa-simbank-tests/dev.galasa.simbank.tests/pom-example.xml
@@ -11,9 +11,9 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>11</java.version>
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
+		<java.version>17</java.version>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
 		<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
 		<unpackBundle>true</unpackBundle>
 	</properties>
diff --git a/galasa-simbank-tests/pom.xml b/galasa-simbank-tests/pom.xml
index 83b69f0..3007793 100644
--- a/galasa-simbank-tests/pom.xml
+++ b/galasa-simbank-tests/pom.xml
@@ -59,9 +59,9 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>11</java.version>
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
+		<java.version>17</java.version>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
 		<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
 
 		<unpackBundle>true</unpackBundle>
diff --git a/galasa-simplatform-application/galasa-simplatform-webapp/Dockerfile b/galasa-simplatform-application/galasa-simplatform-webapp/Dockerfile
index a895b28..76f9fa3 100644
--- a/galasa-simplatform-application/galasa-simplatform-webapp/Dockerfile
+++ b/galasa-simplatform-application/galasa-simplatform-webapp/Dockerfile
@@ -1,4 +1,4 @@
-FROM tomcat:8.5.82-jre11-temurin
+FROM tomcat:9-jre17-temurin
 
 ADD target/galasa-simplatform-webapp.war  /usr/local/tomcat/webapps/
 EXPOSE 8080
diff --git a/galasa-simplatform-application/pom.xml b/galasa-simplatform-application/pom.xml
index 5bd739b..ba9256b 100644
--- a/galasa-simplatform-application/pom.xml
+++ b/galasa-simplatform-application/pom.xml
@@ -56,9 +56,9 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>11</java.version>
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
+		<java.version>17</java.version>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
 		<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
 		
 		<gpg.skip>true</gpg.skip>