diff --git a/Dockerfile b/Dockerfile
index 70272acf67..0934f7a60e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 ARG JAVA_OPTS="-Djava.security.egd=file:/dev/./urandom"
 # renovate: datasource=github-releases depName=microsoft/ApplicationInsights-Java
-ARG APP_INSIGHTS_AGENT_VERSION=3.5.4
+ARG APP_INSIGHTS_AGENT_VERSION=3.6.2
 ARG PLATFORM=""
 
 FROM hmctspublic.azurecr.io/base/java${PLATFORM}:21-distroless
diff --git a/build.gradle b/build.gradle
index d8be7d09a2..c5a5c19ab2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,21 +14,21 @@ plugins {
     id 'eclipse'
     id 'org.springframework.boot' version '2.7.18'
     id 'com.github.ben-manes.versions' version '0.51.0'
-    id 'io.spring.dependency-management' version '1.1.5'
-    id 'org.sonarqube' version '5.0.0.4638'
-    id 'com.github.kt3k.coveralls' version '2.8.2'
+    id 'io.spring.dependency-management' version '1.1.6'
+    id 'org.sonarqube' version '5.1.0.4882'
+    id 'com.github.kt3k.coveralls' version '2.12.2'
     id 'com.github.spacialcircumstances.gradle-cucumber-reporting' version '0.1.25'
-    id 'org.jetbrains.gradle.plugin.idea-ext' version '0.7'
+    id 'org.jetbrains.gradle.plugin.idea-ext' version '0.10'
     id 'info.solidsoft.pitest' version '1.15.0'
-    id 'uk.gov.hmcts.java' version '0.12.57'
-    id 'au.com.dius.pact' version '4.3.12'
-    id "org.jsonschema2pojo" version "1.2.1"
+    id 'uk.gov.hmcts.java' version '0.12.63'
+    id 'au.com.dius.pact' version '4.6.15'
+    id "org.jsonschema2pojo" version "1.2.2"
 }
 
 apply from: './gradle/suppress.gradle'
 
 def versions = [
-        pact_version    : '4.3.4',
+        pact_version    : '4.6.15',
 ]
 
 ext['spring-security.version'] = '5.7.11'
@@ -37,7 +37,7 @@ ext['jackson.version'] = '2.16.0'
 
 configurations {
     compileClasspath {
-        resolutionStrategy.force 'org.springframework.cloud:spring-cloud-starter:4.0.5'
+        resolutionStrategy.force 'org.springframework.cloud:spring-cloud-starter:4.1.4'
     }
 }
 
@@ -97,13 +97,13 @@ repositories {
 }
 
 ext {
-    junitJupiterVersion = '5.8.2'
-    junitVintageVersion = '5.8.2'
-    powermockVersion = '2.0.7'
-    reformLogging = '6.0.1'
-    appInsightsVersion = '2.4.1'
+    junitJupiterVersion = '5.11.3'
+    junitVintageVersion = '5.11.3'
+    powermockVersion = '2.0.9'
+    reformLogging = '6.1.7'
+    appInsightsVersion = '2.6.4'
     swagger2Version = '3.0.0'
-    hibernateVersion = '5.6.10.Final'
+    hibernateVersion = '5.6.15.Final'
     limits = [
             'instruction': 90,
             'branch'     : 85,
@@ -112,7 +112,7 @@ ext {
             'method'     : 90,
             'class'      : 98
     ]
-    springCloudVersion = '2021.0.3'
+    springCloudVersion = '2021.0.9'
 }
 
 java {
@@ -199,25 +199,25 @@ dependencies {
     }
 
 
-    implementation 'com.google.code.gson:gson:2.8.9'
+    implementation 'com.google.code.gson:gson:2.11.0'
     implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-openfeign', version: '3.1.9'
 
     implementation group: 'com.github.hmcts.java-logging', name: 'logging', version: reformLogging
     implementation group: 'com.microsoft.azure', name: 'applicationinsights-logging-logback', version: appInsightsVersion
     implementation group: 'com.microsoft.azure', name: 'applicationinsights-spring-boot-starter', version: appInsightsVersion
 
-    implementation 'org.mapstruct:mapstruct-jdk8:1.3.1.Final'
-    compileOnly 'org.projectlombok:lombok:1.18.34'
-    annotationProcessor 'org.mapstruct:mapstruct-processor:1.3.1.Final', 'org.projectlombok:lombok:1.18.34', 'org.projectlombok:lombok-mapstruct-binding:0.2.0'
-    testAnnotationProcessor 'org.mapstruct:mapstruct-processor:1.3.1.Final', 'org.projectlombok:lombok:1.18.34', 'org.projectlombok:lombok-mapstruct-binding:0.2.0'
+    implementation 'org.mapstruct:mapstruct-jdk8:1.6.3'
+    compileOnly 'org.projectlombok:lombok:1.18.36'
+    annotationProcessor 'org.mapstruct:mapstruct-processor:1.6.3', 'org.projectlombok:lombok:1.18.36', 'org.projectlombok:lombok-mapstruct-binding:0.2.0'
+    testAnnotationProcessor 'org.mapstruct:mapstruct-processor:1.6.3', 'org.projectlombok:lombok:1.18.36', 'org.projectlombok:lombok-mapstruct-binding:0.2.0'
 
-    testCompileOnly 'org.projectlombok:lombok:1.18.34'
-    testAnnotationProcessor 'org.projectlombok:lombok:1.18.34'
+    testCompileOnly 'org.projectlombok:lombok:1.18.36'
+    testAnnotationProcessor 'org.projectlombok:lombok:1.18.36'
 
     implementation('org.springframework.boot:spring-boot-starter-actuator')
 
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")
-    implementation('org.springframework.hateoas:spring-hateoas:1.5.5')
+    implementation('org.springframework.hateoas:spring-hateoas:1.5.6')
 
     implementation group: 'org.springframework.plugin', name: 'spring-plugin-core'
     implementation(group: 'org.springframework.boot', name: 'spring-boot-starter-jdbc') {
@@ -229,17 +229,17 @@ dependencies {
     implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
 
     implementation group: 'javax.inject', name: 'javax.inject', version: '1'
-    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.17.1'
-    implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13'
+    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0'
+    implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.24.1'
+    implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.14'
     implementation group: 'io.springfox', name: 'springfox-boot-starter', version: swagger2Version
 
     implementation "org.flywaydb:flyway-core:8.5.13"
-    implementation group: 'org.yaml', name: 'snakeyaml', version: '2.0'
-    implementation group: 'io.jsonwebtoken', name: 'jjwt', version:'0.9.1'
-    implementation group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: '4.0.3'
-    implementation group: 'com.github.hmcts', name: 'idam-java-client', version: '2.0.1'
-    implementation group: 'org.bouncycastle', name: 'bcpkix-jdk15to18', version: '1.77'
+    implementation group: 'org.yaml', name: 'snakeyaml', version: '2.3'
+    implementation group: 'io.jsonwebtoken', name: 'jjwt', version:'0.12.6'
+    implementation group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: '4.1.2'
+    implementation group: 'com.github.hmcts', name: 'idam-java-client', version: '2.1.1'
+    implementation group: 'org.bouncycastle', name: 'bcpkix-jdk15to18', version: '1.79'
 
     implementation group: 'org.springframework.security', name: 'spring-security-oauth2-client'
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-oauth2-resource-server', version: '2.7.18'
@@ -247,29 +247,29 @@ dependencies {
     implementation group: 'org.springframework.security', name: 'spring-security-oauth2-core'
     implementation group: 'org.springframework.security', name: 'spring-security-oauth2-jose'
 
-    implementation "io.github.openfeign:feign-httpclient:11.0"
+    implementation "io.github.openfeign:feign-httpclient:11.10"
 
-    implementation group: 'net.minidev', name: 'json-smart', version: '2.4.11'
+    implementation group: 'net.minidev', name: 'json-smart', version: '2.5.1'
 
-    implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.37.2'
-    implementation group: 'io.vavr', name: 'vavr', version: '0.10.4'
+    implementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.47'
+    implementation group: 'io.vavr', name: 'vavr', version: '0.10.5'
 
     testImplementation group: 'io.github.openfeign.form', name: 'feign-form', version: '3.8.0'
     implementation group: 'io.github.openfeign.form', name: 'feign-form-spring', version: '3.8.0'
 
-    implementation group: 'com.sun.mail', name: 'mailapi', version: '1.6.1'
+    implementation group: 'com.sun.mail', name: 'mailapi', version: '1.6.7'
     implementation group: 'commons-lang', name: 'commons-lang', version: '2.6'
-    implementation group: 'commons-validator', name: 'commons-validator', version: '1.6'
+    implementation group: 'commons-validator', name: 'commons-validator', version: '1.9.0'
     // CVE-2019-10086 force update of commons-beanutils.
     implementation group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4'
-    implementation group: 'com.jayway.jsonpath', name: 'json-path', version: '2.4.0'
+    implementation group: 'com.jayway.jsonpath', name: 'json-path', version: '2.9.0'
     implementation group: 'org.awaitility', name: 'awaitility', version: '3.1.6'
 
     // CVE-2021-28170
-    implementation "org.glassfish:jakarta.el:4.0.1"
+    implementation "org.glassfish:jakarta.el:4.0.2"
 
     implementation group: 'commons-fileupload', name: 'commons-fileupload', version: '1.5'
-    implementation group: 'commons-io', name: 'commons-io', version: '2.16.1'
+    implementation group: 'commons-io', name: 'commons-io', version: '2.17.0'
 
     // use the latest org.springframework.security
     implementation group: 'org.springframework.security', name: 'spring-security-core'
@@ -277,15 +277,15 @@ dependencies {
     implementation group: 'org.springframework.security', name: 'spring-security-web'
     implementation group: 'org.springframework.security', name: 'spring-security-crypto'
 
-    implementation group: 'com.vladmihalcea', name: 'hibernate-types-52', version: '2.9.13'
+    implementation group: 'com.vladmihalcea', name: 'hibernate-types-52', version: '2.21.1'
     implementation "org.hibernate:hibernate-core:${hibernateVersion}"
-    implementation group: 'org.apache.commons', name: 'commons-jexl3', version: '3.1'
-    implementation group: 'pl.jalokim.propertiestojson', name: 'java-properties-to-json', version: '5.1.3'
+    implementation group: 'org.apache.commons', name: 'commons-jexl3', version: '3.4.0'
+    implementation group: 'pl.jalokim.propertiestojson', name: 'java-properties-to-json', version: '5.3.0'
 
 //    FIXME 0.6 doesn't support jsonb; 0.7 doesn't work on Windows
 //    runtime group: 'com.impossibl.pgjdbc-ng', name: 'pgjdbc-ng', version: '0.6'
-    runtimeOnly group: 'org.postgresql', name: 'postgresql', version: '42.5.5'
-    runtimeOnly group: 'com.zaxxer', name: 'HikariCP', version: '4.0.2'
+    runtimeOnly group: 'org.postgresql', name: 'postgresql', version: '42.7.4'
+    runtimeOnly group: 'com.zaxxer', name: 'HikariCP', version: '4.0.3'
 
     implementation 'org.springframework.boot:spring-boot-starter-validation'
 
@@ -297,48 +297,48 @@ dependencies {
     testImplementation "org.flywaydb:flyway-core:8.5.13"
     testImplementation('org.springframework.boot:spring-boot-starter-test')
     testImplementation('org.springframework.cloud:spring-cloud-starter-contract-stub-runner')
-    testImplementation ('com.opentable.components:otj-pg-embedded:0.12.0')
-    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.22.0'
-    testImplementation group: 'org.assertj', name: 'assertj-vavr', version: '0.4.2'
-    testImplementation("org.testcontainers:postgresql:1.20.2")
-    testImplementation ('com.github.tomakehurst:wiremock-jre8:2.25.1')
-    testImplementation ('org.springframework.cloud:spring-cloud-contract-wiremock:2.2.4.RELEASE')
+    testImplementation ('com.opentable.components:otj-pg-embedded:0.13.4')
+    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.26.3'
+    testImplementation group: 'org.assertj', name: 'assertj-vavr', version: '0.4.3'
+    testImplementation("org.testcontainers:postgresql:1.20.3")
+    testImplementation ('com.github.tomakehurst:wiremock-jre8:2.35.2')
+    testImplementation ('org.springframework.cloud:spring-cloud-contract-wiremock:2.2.6.RELEASE')
     // To avoid compiler warnings about @API annotations in JUnit5 code.
-    testImplementation 'org.apiguardian:apiguardian-api:1.0.0'
+    testImplementation 'org.apiguardian:apiguardian-api:1.1.2'
     testImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"
     testImplementation "org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}"
     testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junitVintageVersion}"
-    testRuntimeOnly "org.junit.platform:junit-platform-commons:1.8.1"
-    testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.6.0'
-    testImplementation group:'org.mockito', name: 'mockito-junit-jupiter', version:'3.6.0'
+    testRuntimeOnly "org.junit.platform:junit-platform-commons:1.11.3"
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.12.4'
+    testImplementation group:'org.mockito', name: 'mockito-junit-jupiter', version:'3.12.4'
     testImplementation group: 'org.powermock', name: 'powermock-api-mockito2', version: powermockVersion
     testImplementation group: 'org.powermock', name: 'powermock-module-junit4', version: powermockVersion
-    testImplementation group: 'io.rest-assured', name: 'rest-assured', version: '4.3.0'
-    testImplementation group: 'com.xebialabs.restito', name: 'restito', version: '0.9.3'
+    testImplementation group: 'io.rest-assured', name: 'rest-assured', version: '4.5.1'
+    testImplementation group: 'com.xebialabs.restito', name: 'restito', version: '0.9.5'
     testImplementation 'io.github.openfeign:feign-jackson:9.7.0'
-    testImplementation group: 'org.testcontainers', name: 'elasticsearch', version: '1.20.2'
-    testImplementation group: 'org.testcontainers', name: 'junit-jupiter', version: '1.20.2'
-    testImplementation 'com.github.hmcts:fortify-client:1.3.0:all'
+    testImplementation group: 'org.testcontainers', name: 'elasticsearch', version: '1.20.3'
+    testImplementation group: 'org.testcontainers', name: 'junit-jupiter', version: '1.20.3'
+    testImplementation 'com.github.hmcts:fortify-client:1.4.5:all'
     testImplementation group: 'commons-lang', name: 'commons-lang', version: '2.6'
 
     // for sonar analysis
     testImplementation group: 'org.openid4java', name: 'openid4java', version: '1.0.0'
     // remove me once insights is in
-    implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.10'
-    implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.10'
+    implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.5.12'
+    implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.5.12'
 
     //excluding log4j-core which causes a vulnerability issue
     implementation(group: 'io.searchbox', name: 'jest', version: '6.3.1') {
         exclude group: 'org.apache.logging.log4j', module: 'log4j-core'
     }
-    implementation(group: 'org.elasticsearch', name: 'elasticsearch', version: '7.16.2') {
+    implementation(group: 'org.elasticsearch', name: 'elasticsearch', version: '7.17.25') {
         exclude group: 'org.apache.logging.log4j', module: 'log4j-api'
     }
-    implementation 'org.jooq:jool-java-8:0.9.14'
-    implementation 'com.github.hmcts:ccd-case-document-am-client:1.7.1'
+    implementation 'org.jooq:jool-java-8:0.9.15'
+    implementation 'com.github.hmcts:ccd-case-document-am-client:1.59'
 
-    testImplementation group: 'com.github.hmcts', name: 'ccd-test-definitions', version:  '7.22.3'
-    testImplementation group: 'com.github.hmcts', name: 'befta-fw', version: '9.0.2'
+    testImplementation group: 'com.github.hmcts', name: 'ccd-test-definitions', version:  '7.24.1-prerelease-CME-109-1'
+    testImplementation group: 'com.github.hmcts', name: 'befta-fw', version: '9.2.0'
 
     contractTestImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}"
     contractTestImplementation "org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}"
@@ -346,16 +346,16 @@ dependencies {
     contractTestImplementation group: 'au.com.dius.pact.provider', name: 'spring', version: versions.pact_version
     contractTestImplementation group: 'au.com.dius.pact.provider', name: 'junit5spring', version: versions.pact_version
     contractTestRuntimeOnly group: 'io.springfox', name: 'springfox-boot-starter', version: swagger2Version
-    contractTestImplementation group: 'io.vavr', name: 'vavr', version: '0.10.4'
+    contractTestImplementation group: 'io.vavr', name: 'vavr', version: '0.10.5'
     contractTestImplementation group: 'org.springframework.security', name: 'spring-security-oauth2-client'
     contractTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-oauth2-resource-server'
     contractTestImplementation group: 'org.springframework.security', name: 'spring-security-oauth2-resource-server'
     contractTestImplementation group: 'org.springframework.security', name: 'spring-security-oauth2-core'
     contractTestImplementation group: 'org.springframework.security', name: 'spring-security-oauth2-jose'
-    contractTestImplementation group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.6.1'
+    contractTestImplementation group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.6.4'
     contractTestImplementation group: 'javax.inject', name: 'javax.inject', version: '1'
-    contractTestImplementation group: 'com.github.hmcts', name: 'idam-java-client', version: '2.0.1'
-    contractTestImplementation('org.springframework.hateoas:spring-hateoas:1.5.5')
+    contractTestImplementation group: 'com.github.hmcts', name: 'idam-java-client', version: '2.1.1'
+    contractTestImplementation('org.springframework.hateoas:spring-hateoas:1.5.6')
     contractTestImplementation(group: 'io.searchbox', name: 'jest', version: '6.3.1') {
         exclude group: 'org.apache.logging.log4j', module: 'log4j-core'
     }
@@ -363,18 +363,18 @@ dependencies {
         exclude group: 'org.apache.tomcat', module: 'tomcat-jdbc'
     }
     contractTestImplementation("org.springframework.boot:spring-boot-starter-data-jpa")
-    contractTestImplementation group: 'org.apache.commons', name: 'commons-jexl3', version: '3.1'
-    contractTestImplementation(group: 'org.elasticsearch', name: 'elasticsearch', version: '7.16.2') {
+    contractTestImplementation group: 'org.apache.commons', name: 'commons-jexl3', version: '3.4.0'
+    contractTestImplementation(group: 'org.elasticsearch', name: 'elasticsearch', version: '7.17.25') {
         exclude group: 'org.apache.logging.log4j', module: 'log4j-api'
     }
-    contractTestImplementation 'com.github.hmcts:ccd-case-document-am-client:1.7.1'
-    contractTestAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.34'
+    contractTestImplementation 'com.github.hmcts:ccd-case-document-am-client:1.59'
+    contractTestAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.36'
     contractTestImplementation 'org.springframework.boot:spring-boot-starter-cache'
     contractTestImplementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
     aatImplementation group: 'commons-lang', name: 'commons-lang', version: '2.6'
-    aatImplementation group: 'io.rest-assured', name: 'rest-assured', version: '4.3.0'
-    aatImplementation group: 'org.projectlombok', name: 'lombok', version: '1.18.34'
-    aatAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.34'
+    aatImplementation group: 'io.rest-assured', name: 'rest-assured', version: '4.5.1'
+    aatImplementation group: 'org.projectlombok', name: 'lombok', version: '1.18.36'
+    aatAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: '1.18.36'
 }
 // end::dependencies[]
 
@@ -385,10 +385,10 @@ dependencyManagement {
 
     dependencies {
         // Versions prior to 30.0 vulnerable to CVE-2020-8908
-        dependency 'com.google.guava:guava:32.1.2-jre'
+        dependency 'com.google.guava:guava:32.1.3-jre'
 
         // CVE-2023-41080
-        dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.91') {
+        dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.97') {
             entry 'tomcat-embed-core'
             entry 'tomcat-embed-el'
             entry 'tomcat-embed-websocket'
@@ -399,14 +399,14 @@ dependencyManagement {
         }
 
         // Required for Embedded ES with Java 11
-        dependency 'org.rauschig:jarchivelib:1.0.0'
+        dependency 'org.rauschig:jarchivelib:1.2.0'
 
         // Remove once BEFTA rest-assured is updated
-        dependencySet(group: 'io.rest-assured', version: '4.3.0') {
+        dependencySet(group: 'io.rest-assured', version: '4.5.1') {
             entry 'json-path'
             entry 'xml-path'
         }
-        dependencySet(group: 'org.codehaus.groovy', version: '3.0.2') {
+        dependencySet(group: 'org.codehaus.groovy', version: '3.0.23') {
             entry 'groovy'
             entry 'groovy-xml'
             entry 'groovy-json'
diff --git a/charts/ccd-data-store-api/Chart.yaml b/charts/ccd-data-store-api/Chart.yaml
index 061385efc8..87f86c9959 100644
--- a/charts/ccd-data-store-api/Chart.yaml
+++ b/charts/ccd-data-store-api/Chart.yaml
@@ -2,13 +2,13 @@ description: Helm chart for the HMCTS CCD Data Store
 name: ccd-data-store-api
 apiVersion: v2
 home: https://github.com/hmcts/ccd-data-store-api
-version: 2.0.31
+version: 2.0.32
 maintainers:
   - name: HMCTS CCD Dev Team
     email: ccd-devops@HMCTS.NET
 dependencies:
   - name: java
-    version: 5.2.0
+    version: 5.2.1
     repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
   - name: elasticsearch
     version: 7.17.3
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index ccebba7710..a4b76b9530 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 20db9ad5c9..94113f200e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 79a61d421c..f5feea6d6b 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,10 +85,9 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +134,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -144,7 +148,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +156,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +201,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/gradlew.bat b/gradlew.bat
index 6689b85bee..9b42019c79 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/infrastructure/.terraform-version b/infrastructure/.terraform-version
index 8fdcf38694..66beabb579 100644
--- a/infrastructure/.terraform-version
+++ b/infrastructure/.terraform-version
@@ -1 +1 @@
-1.9.2
+1.9.8