diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 97e0dac98..e4ac242ec 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version-file: .java-version
           cache: 'maven'
       - name: Compile and Build OpenAPI file
         run: ./mvnw compile
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 14c18e830..c65201f91 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version-file: .java-version
           cache: 'maven'
       - uses: aws-actions/configure-aws-credentials@b47578312673ae6fa5b5096b330d9fbac3d116df # v4.2.1
         name: Configure AWS credentials from Test account
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 271628419..dd6a9d4a9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: ubuntu:22.04
+    container: ubuntu:24.04
     timeout-minutes: 20
 
     services:
@@ -21,11 +21,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - name: Set up JDK 21
+      - name: Set up JDK
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version-file: .java-version
           cache: 'maven'
         env:
           # work around an issue with actions/runner setting an incorrect HOME in containers, which breaks maven caching
diff --git a/.gitignore b/.gitignore
index 721bacd1e..3a91cac56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,6 @@ config/deploy.properties
 /service/config/testing.yml
 /service/config/deploy.properties
 /service/dependency-reduced-pom.xml
-.java-version
 .opsmanage
 put.sh
 deployer-staging.properties
@@ -29,4 +28,4 @@ deployer.log
 .project
 .classpath
 .settings
-.DS_Store
\ No newline at end of file
+.DS_Store
diff --git a/.java-version b/.java-version
new file mode 100644
index 000000000..665594337
--- /dev/null
+++ b/.java-version
@@ -0,0 +1 @@
+temurin-24
diff --git a/pom.xml b/pom.xml
index 1bb7fdb67..546bfabdb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,8 +89,8 @@
     <!-- image to use in tests that run localstack via docker. -->
     <localstack.image>localstack/localstack:3.5.0</localstack.image>
 
-    <!-- eclipse-temurin:21.0.6_7-jre-jammy (note: always use the multi-arch manifest *LIST* here) -->
-    <docker.image.sha256>02fc89fa8766a9ba221e69225f8d1c10bb91885ddbd3c112448e23488ba40ab6</docker.image.sha256>
+    <!-- eclipse-temurin:24.0.1_9-jre-noble (note: always use the multi-arch manifest *LIST* here) -->
+    <docker.image.sha256>a42f2330212db8bc1459a2550def18f6ec04a8c31494ffc20dea13dfa82a211e</docker.image.sha256>
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
@@ -506,7 +506,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.13.0</version>
         <configuration>
-          <release>21</release>
+          <release>24</release>
         </configuration>
       </plugin>