diff --git a/.github/workflows/Android-CI-release.yml b/.github/workflows/Android-CI-release.yml
index 3985707f..b275e382 100644
--- a/.github/workflows/Android-CI-release.yml
+++ b/.github/workflows/Android-CI-release.yml
@@ -20,7 +20,7 @@ jobs:
           distribution: 'adopt'
           java-version: 11
       - name: Install Android SDK
-        uses: malinskiy/action-android/install-sdk@release/0.1.4
+        uses: hannesa2/action-android/install-sdk@0.1.16.7
       - name: Build project
         run: ./gradlew clean build
         env:
diff --git a/.github/workflows/Android-CI.yml b/.github/workflows/Android-CI.yml
index 2042204f..aa8ef89c 100644
--- a/.github/workflows/Android-CI.yml
+++ b/.github/workflows/Android-CI.yml
@@ -4,11 +4,13 @@ on: [ pull_request ]
 
 jobs:
   buildTest:
-    name: Build & Test JDK ${{ matrix.java_version }}
-    runs-on: macOS-latest
+    name: Test
+    runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
-        java_version: [ 11 ]
+        os: [ macOS-13 ]
+        java_version: [ 17 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -21,13 +23,13 @@ jobs:
           java-version: ${{ matrix.java_version }}
       - uses: gradle/wrapper-validation-action@v3
       - name: Install Android SDK
-        uses: malinskiy/action-android/install-sdk@release/0.1.4
+        uses: hannesa2/action-android/install-sdk@0.1.16.7
       - name: Run tests
         run: ./gradlew test
         env:
           VERSION: ${{ github.ref }}
       - name: Run instrumentation tests
-        uses: malinskiy/action-android/emulator-run-cmd@release/0.1.4
+        uses: hannesa2/action-android/emulator-run-cmd@0.1.16.7
         env:
           VERSION: ${{ github.ref }}
         with:
@@ -58,7 +60,12 @@ jobs:
             applications/**/build/outputs/androidTest-results/connected
   Check:
     name: Check
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-latest ]
+        java_version: [ 17 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -68,9 +75,9 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: 11
+          java-version: ${{ matrix.java_version }}
       - name: Install Android SDK
-        uses: malinskiy/action-android/install-sdk@release/0.1.4
+        uses: hannesa2/action-android/install-sdk@0.1.16.7
       - name: Code checks
         run: ./gradlew check
       - name: Archive Lint report