diff --git a/.github/renovate.json b/.github/renovate.json
deleted file mode 100644
index 5db72dd6a..000000000
--- a/.github/renovate.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:recommended"
-  ]
-}
diff --git a/.github/renovate.json5 b/.github/renovate.json5
new file mode 100644
index 000000000..5fd1a7750
--- /dev/null
+++ b/.github/renovate.json5
@@ -0,0 +1,26 @@
+{
+  $schema: 'https://docs.renovatebot.com/renovate-schema.json',
+  extends: [
+    'config:recommended',
+  ],
+  ignorePresets: [
+    // Ensure we get the latest version and are not pinned to old versions.
+    'workarounds:javaLTSVersions',
+  ],
+  customManagers: [
+    // Update .java-version file with the latest JDK version.
+    {
+      customType: 'regex',
+      fileMatch: [
+        '\\.java-version$',
+      ],
+      matchStrings: [
+        '(?<currentValue>.*)\\n',
+      ],
+      datasourceTemplate: 'java-version',
+      depNameTemplate: 'java',
+      // Only write the major version.
+      extractVersionTemplate: '^(?<version>\\d+)',
+    },
+  ]
+}
diff --git a/.github/workflows/.java-version b/.github/workflows/.java-version
new file mode 100644
index 000000000..aabe6ec39
--- /dev/null
+++ b/.github/workflows/.java-version
@@ -0,0 +1 @@
+21
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d4b7bc4b7..6cedc0583 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,12 +16,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Configure JDK
-        uses: actions/setup-java@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: '21'
-          cache: 'gradle'
+          java-version-file: .github/workflows/.java-version
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4