diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 7e95a451..0ea5e7b4 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -22,35 +22,33 @@ env:
   PACKAGE_NAME: huak
 
 jobs:
-  test-and-build:
+  build-and-test:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-    name: Test and build
+    name: Build and test
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@nightly
       - uses: Swatinem/rust-cache@v1
       - uses: actions/setup-python@v1
+      # We install instead of just build for insta-cmd TODO(cnpryer)
       - name: Install huak
         run: cargo install --path crates/huak_cli
       - name: Test
         run: cargo test --all-features
 
-  lint-and-fmt:
-    name: Lint and check fmt
+  clippy-lints:
+    name: Clippy lints
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Install Rust
         uses: dtolnay/rust-toolchain@nightly
         with:
-          components: rustfmt, clippy
+          components: clippy
       - uses: Swatinem/rust-cache@v1
-      - name: Run formatting checks
-        run: |
-          cargo fmt --all -- --check
       - name: Run lints
         env:
           RUSTFLAGS: -C debuginfo=0
@@ -58,6 +56,20 @@ jobs:
           cargo clippy --all-features
           cargo clippy -- -D warnings
 
+  format:
+    name: Formatting check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@nightly
+        with:
+          components: rustfmt
+      - uses: Swatinem/rust-cache@v1
+      - name: Run formatting check
+        run: |
+          cargo fmt --all -- --check
+
   dry-release:
     name: Build with maturin
     runs-on: ubuntu-latest