diff --git a/.github/actions/install-jdk8-on-macos/action.yml b/.github/actions/install-jdk8-on-macos/action.yml
deleted file mode 100644
index 3f670bb882..0000000000
--- a/.github/actions/install-jdk8-on-macos/action.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-name: install-jdk8-on-macos
-runs:
-  using: composite
-  steps:
-  - name: Install JDK 8 on macos
-    run: |-
-      HOMEBREW_NO_AUTO_UPDATE=1 brew tap bell-sw/liberica
-      HOMEBREW_NO_AUTO_UPDATE=1 brew install --cask liberica-jdk8
-    shell: bash
diff --git a/.github/actions/setup-jdk-on-macos/action.yml b/.github/actions/setup-jdk-on-macos/action.yml
new file mode 100644
index 0000000000..264204efbf
--- /dev/null
+++ b/.github/actions/setup-jdk-on-macos/action.yml
@@ -0,0 +1,17 @@
+name: setup-jdk-on-macos
+runs:
+  using: composite
+  steps:
+  - name: Set up JDK on macos
+    run: |-
+      set -euo pipefail
+
+      JAVA_HOME="$(/usr/libexec/java_home -v 21)"
+
+      echo "JAVA_HOME=${JAVA_HOME}" >> "$GITHUB_ENV"
+      echo "JAVAC_ARGS=--release 8" >> "$GITHUB_ENV"
+      echo "${JAVA_HOME}/bin" >> "$GITHUB_PATH"
+      echo "Using JDK at ${JAVA_HOME}"
+      "${JAVA_HOME}/bin/java" -version
+      "${JAVA_HOME}/bin/javac" -version
+    shell: bash
diff --git a/.github/workflows/pr-jobs.yml b/.github/workflows/pr-jobs.yml
index 674d712f12..fa2afc5b80 100644
--- a/.github/workflows/pr-jobs.yml
+++ b/.github/workflows/pr-jobs.yml
@@ -619,7 +619,6 @@ jobs:
     needs: config
     runs-on: macos-15-xlarge
     env:
-      JAVA_HOME: "/Library/Java/JavaVirtualMachines/liberica-jdk-8.jdk/Contents/Home"
       ROCKSDB_DISABLE_JEMALLOC: 1
     steps:
     - uses: actions/checkout@v4.1.0
@@ -631,7 +630,7 @@ jobs:
         cache-key-prefix: macos-java
     - uses: "./.github/actions/increase-max-open-files-on-macos"
     - uses: "./.github/actions/install-gflags-on-macos"
-    - uses: "./.github/actions/install-jdk8-on-macos"
+    - uses: "./.github/actions/setup-jdk-on-macos"
     - uses: "./.github/actions/pre-steps-macos"
     - name: Set Java Environment
       run: |-
@@ -647,8 +646,6 @@ jobs:
     if: needs.config.outputs.only_job == 'build-macos-java-static' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
     needs: config
     runs-on: macos-15-xlarge
-    env:
-      JAVA_HOME: "/Library/Java/JavaVirtualMachines/liberica-jdk-8.jdk/Contents/Home"
     steps:
     - uses: actions/checkout@v4.1.0
     - uses: maxim-lobanov/setup-xcode@v1.6.0
@@ -659,7 +656,7 @@ jobs:
         cache-key-prefix: macos-java-static
     - uses: "./.github/actions/increase-max-open-files-on-macos"
     - uses: "./.github/actions/install-gflags-on-macos"
-    - uses: "./.github/actions/install-jdk8-on-macos"
+    - uses: "./.github/actions/setup-jdk-on-macos"
     - uses: "./.github/actions/pre-steps-macos"
     - name: Set Java Environment
       run: |-
@@ -675,8 +672,6 @@ jobs:
     if: needs.config.outputs.only_job == 'build-macos-java-static-universal' || (needs.config.outputs.only_job == '' && github.repository_owner == 'facebook')
     needs: config
     runs-on: macos-15-xlarge
-    env:
-      JAVA_HOME: "/Library/Java/JavaVirtualMachines/liberica-jdk-8.jdk/Contents/Home"
     steps:
     - uses: actions/checkout@v4.1.0
     - uses: maxim-lobanov/setup-xcode@v1.6.0
@@ -687,7 +682,7 @@ jobs:
         cache-key-prefix: macos-java-static-universal
     - uses: "./.github/actions/increase-max-open-files-on-macos"
     - uses: "./.github/actions/install-gflags-on-macos"
-    - uses: "./.github/actions/install-jdk8-on-macos"
+    - uses: "./.github/actions/setup-jdk-on-macos"
     - uses: "./.github/actions/pre-steps-macos"
     - name: Set Java Environment
       run: |-