diff --git a/.github/workflows/onPush.yml b/.github/workflows/onPush.yml
index 85c18f0f1..241ea0d5c 100644
--- a/.github/workflows/onPush.yml
+++ b/.github/workflows/onPush.yml
@@ -36,14 +36,8 @@ jobs:
           ruby-version: '3.2'
           bundler-cache: true
 
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
 
       - uses: ./.github/actions/create-release-number
         name: Create Release Number
@@ -78,7 +72,11 @@ jobs:
           KEYSTORE_ALIAS: ${{ secrets.ORIGINAL_KEYSTORE_ALIAS }}
           KEYSTORE_ALIAS_PASSWORD: ${{ secrets.ORIGINAL_KEYSTORE_ALIAS_PASSWORD }}
           VERSION_CODE: ${{ steps.rel_number.outputs.version-code }}
-        run: ./gradlew assembleRelease
+        run: |
+          ./gradlew :common:assemble
+          ./gradlew :app:assembleRelease
+          ./gradlew :wear:assembleRelease
+          ./gradlew :automotive:assembleRelease
 
       - name: Archive Build
         uses: actions/upload-artifact@v3
@@ -147,14 +145,8 @@ jobs:
           ruby-version: '3.2'
           bundler-cache: true
 
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
 
       - uses: ./.github/actions/create-release-number
         name: Create Release Number
@@ -189,7 +181,11 @@ jobs:
           KEYSTORE_ALIAS: ${{ secrets.UPLOAD_KEYSTORE_ALIAS }}
           KEYSTORE_ALIAS_PASSWORD: ${{ secrets.UPLOAD_KEYSTORE_ALIAS_PASSWORD }}
           VERSION_CODE: ${{ steps.rel_number.outputs.version-code }}
-        run: ./gradlew bundleRelease
+        run: |
+          ./gradlew :common:assemble
+          ./gradlew :app:bundleRelease
+          ./gradlew :wear:bundleRelease
+          ./gradlew :automotive:bundleRelease
 
       - name: Deploy to Playstore Internal
         run: bundle exec fastlane deploy_internal
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 3c97d1d23..ba6d1805f 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -91,14 +91,8 @@ jobs:
         distribution: 'adopt'
         java-version: '17'
 
-    - uses: actions/cache@v3
-      with:
-        path: |
-          ~/.gradle/caches
-          ~/.gradle/wrapper
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
-        restore-keys: |
-          ${{ runner.os }}-gradle-
+    - name: Setup Gradle
+      uses: gradle/gradle-build-action@v2
 
     - name: Mock google-services.json
       run: |
@@ -110,7 +104,11 @@ jobs:
       name: Validate Gradle Wrapper
 
     - name: Build Debug APK
-      run: ./gradlew assembleDebug
+      run: |
+        ./gradlew :common:assemble
+        ./gradlew :app:assembleDebug
+        ./gradlew :wear:assembleDebug
+        ./gradlew :automotive:assembleDebug
 
     - name: Check for missing/modified DB schemas after build
       run: |