diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d542f6767..e89d6c85b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -99,7 +99,14 @@ jobs:
             .gradle/wrapper
           # refresh cache every month to avoid unlimited growth
           key: gradle-examples-${{ matrix.db }}-${{ steps.get-date.outputs.yearmonth }}
+      - name: Set up JDK 11
+        if: ${{ startsWith( inputs.branch, 'wip/2' ) }}
+        uses: actions/setup-java@v2.2.0
+        with:
+          distribution: 'temurin'
+          java-version: 11
       - name: Set up JDK 17
+        if: ${{ !startsWith( inputs.branch, 'wip/2' ) }}
         uses: actions/setup-java@v2.2.0
         with:
           distribution: 'temurin'
@@ -141,8 +148,16 @@ jobs:
             .gradle/wrapper
           # refresh cache every month to avoid unlimited growth
           key: gradle-db-${{ matrix.db }}-${{ steps.get-date.outputs.yearmonth }}
+      - name: Set up JDK 11
+        if: ${{ startsWith( inputs.branch, 'wip/2' ) }}
+        uses: actions/setup-java@v2.2.0
+        with:
+          distribution: 'temurin'
+          java-version: 11
       - name: Set up JDK 17
+        if: ${{ !startsWith( inputs.branch, 'wip/2' ) }}
         uses: actions/setup-java@v2.2.0
+
         with:
           distribution: 'temurin'
           java-version: 17
@@ -249,8 +264,15 @@ jobs:
       - name: Export path to JDK ${{ matrix.java.name }}
         id: testjdk-exportpath
         run: echo "::set-output name=path::${JAVA_HOME}"
-      # Always use JDK 11 to build the main code: that's what we use for releases.
+      - name: Set up JDK 11
+        if: ${{ startsWith( inputs.branch, 'wip/2' ) }}
+        uses: actions/setup-java@v2.2.0
+        with:
+          distribution: 'temurin'
+          java-version: 11
+          check-latest: true
       - name: Set up JDK 17
+        if: ${{ !startsWith( inputs.branch, 'wip/2' ) }}
         uses: actions/setup-java@v2.2.0
         with:
           distribution: 'temurin'