diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 6eb32e400f7d..c947ca08ace0 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -36,7 +36,7 @@ runs:
       - uses: actions/setup-java@v3
         if: ${{ inputs.java-version != '' }}
         with:
-          distribution: 'zulu'
+          distribution: 'temurin' # use same JDK distro as in Trino docker images
           java-version: ${{ inputs.java-version }}
       - name: Cache local Maven repo
         id: cache
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 29fb4d475f65..023d4a5255bf 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -51,7 +51,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3
         with:
-          distribution: 'zulu'
+          distribution: 'temurin' # use same JDK distro as in Trino docker images
           java-version: 17
           cache: 'maven'
       - name: Configure Problem Matchers
@@ -85,7 +85,7 @@ jobs:
           fetch-depth: 0 # checkout all commits, as the build result depends on `git describe` equivalent
       - uses: actions/setup-java@v3
         with:
-          distribution: 'zulu'
+          distribution: 'temurin' # use same JDK distro as in Trino docker images
           java-version: 17
           cache: 'maven'
       - name: Configure Problem Matchers
diff --git a/core/docker/Dockerfile b/core/docker/Dockerfile
index 46f98c277af1..26dc62443b3a 100644
--- a/core/docker/Dockerfile
+++ b/core/docker/Dockerfile
@@ -13,6 +13,7 @@
 #
 FROM ghcr.io/airlift/jvmkill:latest AS jvmkill
 
+# Use Eclipse Temurin as they have base Docker images for more architectures.
 FROM eclipse-temurin:17-jdk
 
 RUN \