diff --git a/.github/actions/androidapp-road-test/action.yml b/.github/actions/androidapp-road-test/action.yml
index 8cd2da4b..babd9626 100644
--- a/.github/actions/androidapp-road-test/action.yml
+++ b/.github/actions/androidapp-road-test/action.yml
@@ -23,16 +23,8 @@ runs:
     - name: Prepare Android environment
       uses: ./.github/actions/prepare-android
 
-    - name: Restore Gradle cache
-      uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5
-      with:
-        path: |
-          ~/.gradle/caches
-          ~/.gradle/wrapper
-        key: ${{ runner.os }}-android-androidapp-${{ inputs.flavor }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-        restore-keys: |
-          ${{ runner.os }}-android-androidapp-${{ inputs.flavor }}-gradle-
-          ${{ runner.os }}-android-androidapp-gradle-
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v4.2.1
 
     # == Brownfield Gradle Plugin ==
     - name: Publish Brownfield Gradle Plugin to Maven Local
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 353b06e0..29b4acfb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -65,15 +65,8 @@ jobs:
       - name: Prepare Android environment
         uses: ./.github/actions/prepare-android
 
-      - name: Restore Gradle cache
-        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-android-tester-integrated-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-android-tester-integrated-gradle-
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v4.2.1
 
       # == TesterIntegrated ==
 
diff --git a/apps/AndroidApp/app/build.gradle.kts b/apps/AndroidApp/app/build.gradle.kts
index 2b6cd3a6..c524232e 100644
--- a/apps/AndroidApp/app/build.gradle.kts
+++ b/apps/AndroidApp/app/build.gradle.kts
@@ -25,6 +25,9 @@ android {
         versionCode = 1
         versionName = "1.0"
 
+        ndk {
+            abiFilters += listOf("arm64-v8a")
+        }
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/apps/RNApp/android/gradle.properties b/apps/RNApp/android/gradle.properties
index a55711cc..b7ebb15a 100644
--- a/apps/RNApp/android/gradle.properties
+++ b/apps/RNApp/android/gradle.properties
@@ -25,7 +25,7 @@ android.useAndroidX=true
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using
 # ./gradlew <task> -PreactNativeArchitectures=x86_64
-reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
+reactNativeArchitectures=arm64-v8a
 
 # Use this property to enable support to the new architecture.
 # This will allow you to use TurboModules and the Fabric render in
diff --git a/apps/TesterIntegrated/kotlin/gradle.properties b/apps/TesterIntegrated/kotlin/gradle.properties
index 02151414..b8fbfd7f 100644
--- a/apps/TesterIntegrated/kotlin/gradle.properties
+++ b/apps/TesterIntegrated/kotlin/gradle.properties
@@ -19,7 +19,7 @@ android.enableJetifier=true
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using
 # ./gradlew <task> -PreactNativeArchitectures=x86_64
-reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
+reactNativeArchitectures=arm64-v8a
 
 # Use this property to enable support to the new architecture.
 # This will allow you to use TurboModules and the Fabric render in