diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0e6f74ff7..31bca402d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ on: [pull_request]
 
 jobs:
   test:
-    runs-on: macos-10.15 # tmp fix for https://github.com/ReactiveCircus/android-emulator-runner/issues/160
+    runs-on: macos-latest
     steps:
     - name: Checkout project
       uses: actions/checkout@v3
@@ -79,10 +79,10 @@ jobs:
       run: npm install
 
     - name: Use specific Java version for sdkmanager to work
-      uses: joschi/setup-jdk@v2
+      uses: actions/setup-java@v2
       with:
+        distribution: 'temurin'
         java-version: '11'
-        architecture: 'x64'
 
     - name: Build
       run: npm run e2e:release-build