diff --git a/build.gradle b/build.gradle
index d82244a99..38ca80bf6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:3.1.2")
+        classpath("org.springframework.boot:spring-boot-gradle-plugin:3.1.4")
     }
     dependencies {
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.3.0.3225"
@@ -13,16 +13,16 @@ plugins {
     id 'idea'
     id 'application'
     id 'io.spring.dependency-management' version '1.1.3'
-    id 'org.springframework.boot' version '3.1.2'
-    id 'org.owasp.dependencycheck' version '8.3.1'
+    id 'org.springframework.boot' version '3.1.4'
+    id 'org.owasp.dependencycheck' version '8.4.0'
     id 'se.patrikerdes.use-latest-versions' version '0.2.18'
-    id 'com.github.ben-manes.versions' version '0.47.0'
-    id 'org.sonarqube' version '4.3.0.3225'
+    id 'com.github.ben-manes.versions' version '0.49.0'
+    id 'org.sonarqube' version '4.4.1.3373'
     id 'jacoco'
     id "com.github.kt3k.coveralls" version "2.12.2"
-    id 'com.github.spacialcircumstances.gradle-cucumber-reporting' version '0.1.23'
-    id "info.solidsoft.pitest" version '1.9.11'
-    id 'uk.gov.hmcts.java' version '0.12.43'
+    id 'com.github.spacialcircumstances.gradle-cucumber-reporting' version '0.1.25'
+    id "info.solidsoft.pitest" version '1.15.0'
+    id 'uk.gov.hmcts.java' version '0.12.46'
 }
 
 dependencyUpdates.resolutionStrategy {
@@ -98,11 +98,11 @@ java {
 }
 
 ext {
-    sl4jVersion = '2.0.7'
-    lombokVersion = '1.18.28'
+    sl4jVersion = '2.0.9'
+    lombokVersion = '1.18.30'
     reformLogging = '6.0.1'
-    springCloudVersion = '2022.0.3'
-    springSecurity = '6.1.2'
+    springCloudVersion = '2022.0.4'
+    springSecurity = '6.1.4'
     limits = [
             'instruction': 6,
             'branch'     : 8,
@@ -145,8 +145,8 @@ dependencies {
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web'
 
     implementation group: 'org.springdoc', name: 'springdoc-openapi-starter-webmvc-ui', version: '2.2.0'
-    implementation "org.flywaydb:flyway-core:9.21.1"
-    implementation group: 'org.yaml', name: 'snakeyaml', version: '2.1'
+    implementation "org.flywaydb:flyway-core:9.22.2"
+    implementation group: 'org.yaml', name: 'snakeyaml', version: '2.2'
     implementation group: 'com.zaxxer', name: 'HikariCP', version: '5.0.1'
     runtimeOnly group: 'org.postgresql', name: 'postgresql', version: '42.6.0'
     implementation group: 'com.github.hmcts', name: 'auth-checker-lib', version: '2.1.5'
@@ -169,15 +169,15 @@ dependencies {
     // CVE-2021-28170
     implementation "org.glassfish:jakarta.el:4.0.2"
 
-    aatImplementation 'com.github.hmcts:service-auth-provider-java-client:5.1.0'
+    aatImplementation 'com.github.hmcts:service-auth-provider-java-client:5.1.1'
     codacy 'com.github.codacy:codacy-coverage-reporter:13.13.7'
     testImplementation "org.junit.jupiter:junit-jupiter-api"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
     testRuntimeOnly "org.junit.vintage:junit-vintage-engine"
 
     testImplementation "org.junit.jupiter:junit-jupiter:5.10.0"
-    testImplementation "org.testcontainers:testcontainers:1.18.3"
-    testImplementation "org.testcontainers:junit-jupiter:1.18.3"
+    testImplementation "org.testcontainers:testcontainers:1.19.1"
+    testImplementation "org.testcontainers:junit-jupiter:1.19.1"
     testImplementation 'org.testcontainers:postgresql'
 
     testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test'
@@ -185,7 +185,7 @@ dependencies {
     testImplementation group: 'com.github.hmcts', name: 'ccd-test-definitions', version: '7.19.12'
     testImplementation group: 'com.github.hmcts', name: 'befta-fw', version: '8.7.11'
     testImplementation 'com.github.hmcts:fortify-client:1.3.0:all'
-    testImplementation 'info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.9.11'
+    testImplementation 'info.solidsoft.gradle.pitest:gradle-pitest-plugin:1.15.0'
 }
 // end::dependencies[]
 
diff --git a/charts/ccd-user-profile-api/Chart.yaml b/charts/ccd-user-profile-api/Chart.yaml
index 594d5bca6..1a5264344 100644
--- a/charts/ccd-user-profile-api/Chart.yaml
+++ b/charts/ccd-user-profile-api/Chart.yaml
@@ -2,11 +2,11 @@ description: CCD User profile
 name: ccd-user-profile-api
 apiVersion: v2
 home: https://github.com/hmcts/ccd-user-profile-api
-version: 1.6.11
+version: 1.6.12
 maintainers:
   - name: HMCTS CCD Dev Team
     email: ccd-devops@HMCTS.NET
 dependencies:
   - name: java
-    version: 4.0.13
+    version: 4.2.0
     repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
diff --git a/docker/database/Dockerfile b/docker/database/Dockerfile
index 0857cb838..2d79e9826 100644
--- a/docker/database/Dockerfile
+++ b/docker/database/Dockerfile
@@ -1,4 +1,4 @@
-FROM postgres:11.1
+FROM postgres:11.16
 USER postgres
 LABEL maintainer="https://github.com/hmcts/ccd-user-profile-api"
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index c1962a79e..7f93135c4 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 17a8ddce2..3fa8f862f 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.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index aeb74cbb4..1aa94a426 100755
--- a/gradlew
+++ b/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,10 +131,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.
@@ -141,7 +145,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
@@ -149,7 +153,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
@@ -198,11 +202,11 @@ fi
 # 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, 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.
+# 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/infrastructure/.terraform-version b/infrastructure/.terraform-version
index d4c4950a3..9c6d6293b 100644
--- a/infrastructure/.terraform-version
+++ b/infrastructure/.terraform-version
@@ -1 +1 @@
-1.3.9
+1.6.1