diff --git a/.github/workflows/gradle-android-instrumented-tests.yml b/.github/workflows/gradle-android-instrumented-tests.yml
index 5c4dca8f263..b757468eb3c 100644
--- a/.github/workflows/gradle-android-instrumented-tests.yml
+++ b/.github/workflows/gradle-android-instrumented-tests.yml
@@ -26,15 +26,12 @@ jobs:
                     fetch-depth: 0
 
             -   name: Set up JDK
-                uses: actions/setup-java@v3
+                uses: buildjet/setup-java@v3
                 with:
                     java-version: '17'
                     distribution: 'temurin'
                     cache: gradle
 
-            -   name: Gradle Setup
-                uses: gradle/gradle-build-action@v2
-
             -   name: Validate Gradle wrapper
                 uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
 
diff --git a/.github/workflows/gradle-ios-tests.yml b/.github/workflows/gradle-ios-tests.yml
index 5a598edc03c..3272cc6476c 100644
--- a/.github/workflows/gradle-ios-tests.yml
+++ b/.github/workflows/gradle-ios-tests.yml
@@ -27,12 +27,10 @@ jobs:
         with:
           java-version: '17'
           distribution: 'temurin'
-          cache: gradle
+#          cache: gradle # Cache disabled as we use Gradle Setup below
 
       - name: Gradle Setup
         uses: gradle/gradle-build-action@v2
-        with:
-            cache-disabled: true
 
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b