diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 92d348187..b8e3bc8d0 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -7,30 +7,34 @@ on:
   pull_request:
     branches: [ master ]
 
+concurrency:
+  group: ci-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
-  lint:
-    runs-on: ubuntu-latest
+  lintAndApiChecks:
+    runs-on: macos-latest
+    permissions:
+      contents: write
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '17'
-      - name: ktLint
-        run: ./gradlew lintKotlin
-  apiCheck:
-    runs-on: ubuntu-latest
-    steps:
-     - uses: actions/checkout@v4
-     - name: Set up JDK
-       uses: actions/setup-java@v4
-       with:
-         distribution: 'zulu'
-         java-version: '17'
-     - name: Run Api Check
-       run: ./gradlew apiCheck
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: latest-stable
+      - name: Format Kotlin
+        run: ./gradlew formatKotlin
+      - name: Api File Update
+        run: ./gradlew apiDump
+      - uses: stefanzweifel/git-auto-commit-action@v6
   jobMatrixSetup:
+    needs: lintAndApiChecks
     runs-on: macos-latest
     outputs:
       emulator_jobs_matrix: ${{ steps.dataStep.outputs.emulator_jobs_matrix }}
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
deleted file mode 100644
index 84f03d20b..000000000
--- a/.github/workflows/push.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Push
-
-on: [ push ]
-
-jobs:
-  formatKotlin:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.head_ref }}
-      - name: Set up JDK
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-      - name: Format Kotlin
-        run: ./gradlew formatKotlin
-      - name: Api File Update
-        run: ./gradlew apiDump
-      - uses: stefanzweifel/git-auto-commit-action@v6
-      - name: lintKotlin
-        run: ./gradlew lintKotlin
-      - name: Api Check
-        run: ./gradlew apiCheck