diff --git a/.github/workflows/ci.yml b/.github/workflows/ci-build.yml
similarity index 69%
rename from .github/workflows/ci.yml
rename to .github/workflows/ci-build.yml
index c1b1119ea2..46e8937a67 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci-build.yml
@@ -37,14 +37,5 @@ jobs:
         with:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
-      - name: ktlint
-        run: ./gradlew clean ktlintCheck
-
-      - name: Regular lint ${{ matrix.color }}${{ matrix.store }}Debug
-        run: ./gradlew app:lint${{ matrix.color }}${{ matrix.store }}Debug
-
-      - name: Test ${{ matrix.color }}${{ matrix.store }}DebugUnitTest checks:test
-        run: ./gradlew app:test${{ matrix.color }}${{ matrix.store }}DebugUnitTest checks:test
-
       - name: Build ${{ matrix.color }}${{ matrix.store }}Debug
-        run: ./gradlew app:build${{ matrix.color }}${{ matrix.store }}Debug
+        run: ./gradlew --no-configuration-cache build{{ matrix.color }}${{ matrix.store }}Debug
diff --git a/.github/workflows/ci-check.yml b/.github/workflows/ci-check.yml
index 562c693da7..3be0474ca3 100644
--- a/.github/workflows/ci-check.yml
+++ b/.github/workflows/ci-check.yml
@@ -11,7 +11,7 @@ permissions: read-all
 
 jobs:
   build:
-    name: Build
+    name: Check
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -33,18 +33,7 @@ jobs:
         with:
           cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
-      # Increase the amount of available swap space to prevent OOM.
-      - name: Configure swap
-        run: |
-          sudo swapon --show
-          sudo swapoff -a
-          sudo fallocate -l 8G /swapfile
-          sudo chmod 600 /swapfile
-          sudo mkswap /swapfile
-          sudo swapon /swapfile
-          sudo swapon --show
-
       # Disable the configuration cache; it's not restored, or saved at the end, so this
       # removes any overhead trying to load or save it.
-      - name: Check and assemble everything
-        run: ./gradlew --no-configuration-cache build
+      - name: Check everything
+        run: ./gradlew --no-configuration-cache check
diff --git a/.github/workflows/ktlint.yml b/.github/workflows/ktlint.yml
deleted file mode 100644
index db51245dd2..0000000000
--- a/.github/workflows/ktlint.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: reviewdog-suggester
-on: pull_request_target
-
-permissions:
-  contents: read
-  pull-requests: write
-
-jobs:
-  ktlint:
-    timeout-minutes: 5
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
-
-      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-          cache: 'gradle'
-
-      - run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
-
-      - uses: gradle/wrapper-validation-action@b231772637bb498f11fdbc86052b6e8a8dc9fc92 # v2
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@1168cd3d07c1876a65e1724114de42ccbdfa7b78 # v3
-        with:
-          cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
-
-      - run: chmod +x ./gradlew
-
-      - run: ./gradlew ktlintFormat
-
-      - uses: reviewdog/action-suggester@3d7fde6859623ad6174df5fd662677a0eb63310a # v1
-        with:
-          tool_name: ktlintFormat