diff --git a/.github/workflows/choreolib.yml b/.github/workflows/choreolib.yml
index d5b4a19936..fbd743585b 100644
--- a/.github/workflows/choreolib.yml
+++ b/.github/workflows/choreolib.yml
@@ -68,23 +68,19 @@ jobs:
         include:
           - os: windows-2022
             artifact-name: Windows-x86_64
-            architecture: x64
             build-options:
 
           # FIXME: Link failure on commands library
           # - os: windows-2022
           #   artifact-name: Windows-aarch64
-          #   architecture: x64
           #   build-options: -Pbuildwinarm64 -Ponlywindowsarm64
 
           - os: macOS-13
             artifact-name: macOS-x86_64
-            architecture: x64
             build-options:
 
           - os: macOS-14
             artifact-name: macOS-arm64
-            architecture: x64
             build-options:
 
     name: "${{ matrix.artifact-name }}"
@@ -99,9 +95,8 @@ jobs:
 
       - uses: actions/setup-java@v4
         with:
-          distribution: "zulu"
+          distribution: "temurin"
           java-version: 17
-          architecture: ${{ matrix.architecture }}
 
       - name: Set version (Windows release)
         if: startsWith(matrix.os, 'windows') && startsWith(github.ref, 'refs/tags/v')
@@ -148,7 +143,7 @@ jobs:
 
       - uses: actions/setup-java@v4
         with:
-          distribution: "zulu"
+          distribution: "temurin"
           java-version: 17
 
       - name: Combine
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index e4490b321f..5da1eb0fc7 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -36,6 +36,11 @@ jobs:
           working-directory: "choreolib"
           doxyfile-path: "docs/Doxyfile"
 
+      - uses: actions/setup-java@v4
+        with:
+          distribution: "temurin"
+          java-version: 17
+
       - name: Run JavaDoc
         run: |
           cd choreolib