diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index ee7cfdf01..3323986e2 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     name: Android Build
     permissions: write-all
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     steps:
       - name: Pulling the new commit
         uses: actions/checkout@v2
@@ -25,7 +25,6 @@ jobs:
           # not caching the bin folder to prevent asset duplication and stuff like that
           key: cache-build-android
           path: |
-            ~/.gradle
             .haxelib/
             export/release/android/haxe/
             export/release/android/obj/
@@ -46,7 +45,7 @@ jobs:
         run: |
           haxelib run lime config ANDROID_SDK $ANDROID_HOME
           haxelib run lime config ANDROID_NDK_ROOT ${{ steps.setup-ndk.outputs.ndk-path }}
-          haxelib run lime config JAVA_HOME $JAVA_HOME_17_X64
+          haxelib run lime config JAVA_HOME $JAVA_HOME_17_arm64
           haxelib run lime config ANDROID_SETUP true
       - name: Rebuilding lime (android)
         run: haxelib run lime rebuild android -release -clean
@@ -84,7 +83,6 @@ jobs:
           # caching again since for some reason it doesnt work with the first post cache shit
           key: cache-build-android
           path: |
-            ~/.gradle
             .haxelib/
             export/release/android/haxe/
             export/release/android/obj/