diff --git a/Dockerfile b/Dockerfile
index d2c6d84a..1c15c598 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,13 +3,13 @@ RUN mkdir -p /home/gradle/cache_home
 ENV GRADLE_USER_HOME /home/gradle/cache_home
 COPY build.gradle /home/gradle/src/
 WORKDIR /home/gradle/src
-RUN gradle -b build.gradle clean build -i --stacktrace
+RUN gradle clean build -i --stacktrace
 
 FROM gradle:jdk21 AS build
 COPY --from=cache /home/gradle/cache_home /home/gradle/.gradle
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
-RUN gradle --no-daemon -b build.gradle bootJar -i --stacktrace
+RUN gradle --no-daemon bootJar -i --stacktrace
 
 FROM eclipse-temurin:21-jre-jammy
 
diff --git a/build.gradle b/build.gradle
index f1c8087b..965bb2d9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,19 +13,28 @@ apply plugin: 'checkstyle'
 apply plugin: 'org.springframework.boot'
 
 group = 'uk.nhs.digital.nhsconnect.nhais'
-sourceCompatibility = '21'
 
-mainClassName = 'uk.nhs.digital.nhsconnect.nhais.IntegrationAdaptorNhaisApplication'
+
+java {
+	toolchain {
+		languageVersion = JavaLanguageVersion.of(21)
+	}
+}
+
+application {
+	mainClass = 'uk.nhs.digital.nhsconnect.nhais.IntegrationAdaptorNhaisApplication'
+}
+
 
 repositories {
 	mavenCentral()
 }
 
 sourceSets {
-    intTest {
+	intTest {
 		compileClasspath += sourceSets.main.output
 		runtimeClasspath += sourceSets.main.output
-    }
+	}
 
 	recepResponder {
 		compileClasspath += sourceSets.main.output
@@ -67,9 +76,9 @@ dependencies {
 		exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
 	}
 
-    testImplementation "org.testcontainers:testcontainers:1.21.1"
-    testImplementation group: 'org.awaitility', name: 'awaitility', version: '4.3.0'
-    testImplementation("org.assertj:assertj-core:3.27.3")
+	testImplementation "org.testcontainers:testcontainers:1.21.1"
+	testImplementation group: 'org.awaitility', name: 'awaitility', version: '4.3.0'
+	testImplementation("org.assertj:assertj-core:3.27.3")
 }
 
 test {
@@ -79,24 +88,27 @@ test {
 }
 
 jacocoTestReport {
-    dependsOn test // tests are required to run before generating the report
+	dependsOn test // tests are required to run before generating the report
 }
 
-task componentTest(type: Test) {
+tasks.register('componentTest', Test) {
 	useJUnitPlatform() {
 		includeTags 'component'
+
+		testClassesDirs = testing.suites.test.sources.output.classesDirs
+		classpath = testing.suites.test.sources.runtimeClasspath
 	}
 }
 
-task integrationTest(type: Test) {
+tasks.register('integrationTest', Test) {
 	useJUnitPlatform() {
 		description = 'Runs integration tests.'
 		group = 'verification'
 
 		testClassesDirs = sourceSets.intTest.output.classesDirs
 		classpath = sourceSets.intTest.runtimeClasspath
-		shouldRunAfter test
 	}
+	shouldRunAfter test
 }
 
 check.dependsOn componentTest
diff --git a/docker-compose.lb.override.yml b/docker-compose.lb.override.yml
index b194a697..ec5bf737 100644
--- a/docker-compose.lb.override.yml
+++ b/docker-compose.lb.override.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   nhais-lb:
     image: nginx:latest
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 9ba17e03..88d65361 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   nhais:
     ports:
diff --git a/docker-compose.yml b/docker-compose.yml
index 7b96e1ee..54f1e5a7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   nhais:
     image: local/nhais:${BUILD_TAG}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7cf08140..c524e399 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME