diff --git a/Dockerfile b/Dockerfile
index ad915f7cf..3dfe4321a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 ARG APP_INSIGHTS_AGENT_VERSION=3.5.2
 ARG PLATFORM=""
-FROM hmctspublic.azurecr.io/base/java${PLATFORM}:21-distroless
+FROM hmctspublic.azurecr.io/base/java${PLATFORM}:17-distroless
 
 COPY lib/applicationinsights.json /opt/app/
 COPY build/libs/rd-professional-api.jar /opt/app/
diff --git a/acb.tpl.yaml b/acb.tpl.yaml
index eb0fb501d..35e235978 100644
--- a/acb.tpl.yaml
+++ b/acb.tpl.yaml
@@ -1,7 +1,7 @@
 version: 1.0-preview-1
 steps:
   - id: pull-base-image-amd64
-    cmd: docker pull --platform linux/amd64 hmctspublic.azurecr.io/base/java:21-distroless && docker tag hmctspublic.azurecr.io/base/java:21-distroless hmctspublic.azurecr.io/base/java/linux/amd64:21-distroless
+    cmd: docker pull --platform linux/amd64 hmctspublic.azurecr.io/base/java:17-distroless && docker tag hmctspublic.azurecr.io/base/java:17-distroless hmctspublic.azurecr.io/base/java/linux/amd64:17-distroless
     retries: 3
     retryDelay: 3
     when: ["-"]
@@ -18,7 +18,7 @@ steps:
       - pull-base-image-amd64
 
   - id: pull-base-image-arm64
-    cmd: docker pull --platform linux/arm64 hmctspublic.azurecr.io/base/java:21-distroless && docker tag hmctspublic.azurecr.io/base/java:21-distroless hmctspublic.azurecr.io/base/java/linux/arm64:21-distroless
+    cmd: docker pull --platform linux/arm64 hmctspublic.azurecr.io/base/java:17-distroless && docker tag hmctspublic.azurecr.io/base/java:17-distroless hmctspublic.azurecr.io/base/java/linux/arm64:17-distroless
     retries: 3
     retryDelay: 3
     when:
diff --git a/build.gradle b/build.gradle
index 849b4477c..fb94eac0d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ plugins {
     id 'io.spring.dependency-management' version '1.1.6'
     id 'org.sonarqube' version '5.0.0.4638'
     id 'org.springframework.boot' version '3.3.1'
-    id "org.flywaydb.flyway" version '10.18.0'
+    id "org.flywaydb.flyway" version '10.18.1'
     id 'au.com.dius.pact' version '4.1.7'// do not change, otherwise serenity report fails
 }
 
@@ -58,7 +58,7 @@ version = '0.1.0'
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
+        languageVersion = JavaLanguageVersion.of(17)
     }
 }
 
@@ -375,8 +375,8 @@ dependencies {
     //Fix for CVE-2021-29425
     implementation 'commons-io:commons-io:2.8.0'
 
-    implementation group: 'org.flywaydb', name: 'flyway-core', version: '10.18.0'
-    runtimeOnly group: 'org.flywaydb', name: 'flyway-database-postgresql', version: '10.18.0'
+    implementation group: 'org.flywaydb', name: 'flyway-core', version: '10.18.1'
+    runtimeOnly group: 'org.flywaydb', name: 'flyway-database-postgresql', version: '10.18.1'
     implementation group: 'org.postgresql', name: 'postgresql', version: '42.7.4'
 
     implementation group: 'com.google.guava', name: 'guava', version: '32.1.3-jre'