diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1b01cd10..2fa08215 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,10 +25,12 @@ jobs:
           unzip commandlinetools.zip -d ${ANDROID_SDK_ROOT}
           rm commandlinetools.zip
 
+      # Set up Java 8 (needed for sdkmanager)
       - name: Set up Java 8
         uses: actions/setup-java@v2
         with:
           java-version: 8
+          distribution: 'adopt-openjdk'
 
       - name: Set up Android SDK and install platform-tools
         run: |
@@ -42,6 +44,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           java-version: 7
+          distribution: 'adopt-openjdk'
 
       - name: Capture JDK7_HOME
         run: echo "export JDK7_HOME=\"$JAVA_HOME\"" > ~/.jdk7_home
@@ -50,6 +53,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           java-version: 17
+          distribution: 'adopt-openjdk'
 
       - name: Capture JDK17_HOME
         run: echo "export JDK17_HOME=\"$JAVA_HOME\"" > ~/.jdk17_home
@@ -59,6 +63,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           java-version: ${{ matrix.java }}
+          distribution: 'adopt-openjdk'
 
       - name: Cache Gradle packages
         uses: actions/cache@v2
@@ -105,6 +110,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           java-version: 7
+          distribution: 'adopt-openjdk'
 
       - name: Capture JDK7_HOME
         run: echo "export JDK7_HOME=\"$JAVA_HOME\"" > ~/.jdk7_home
@@ -113,6 +119,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           java-version: 8
+          distribution: 'adopt-openjdk'
 
       - name: Cache Gradle packages
         uses: actions/cache@v2