diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e7ac7ecdb4..151e8a8a50 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: Build and Test Workflow
+name: Build, Lint, and Test
 
 on:
   push:
@@ -43,6 +43,10 @@ jobs:
           sudo apt-get install -y protobuf-compiler
           cargo install just
 
+      - name: Run linting
+        run: |
+          just ${{ matrix.just_variants }} lint
+
       - name: Build all crates in workspace
         run: just ${{ matrix.just_variants }} build
 
diff --git a/.github/workflows/lints.yml b/.github/workflows/lints.yml
deleted file mode 100644
index 61106f6d0c..0000000000
--- a/.github/workflows/lints.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: Lints Workflow
-
-on:
-  push:
-    branches:
-      - 'main'
-  pull_request:
-    branches:
-      - 'main'
-      - '*/*'
-  workflow_dispatch:
-
-jobs:
-  lints:
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - uses: styfle/cancel-workflow-action@0.11.0
-        name: Cancel Outdated Builds
-        with:
-          all_but_latest: true
-          access_token: ${{ github.token }}
-
-      - name: Install Nix
-        uses: cachix/install-nix-action@v23
-
-      - uses: actions/checkout@v4
-        name: Checkout Repository
-
-      - uses: Swatinem/rust-cache@v2
-        name: Enable Rust Caching
-        with:
-          shared-key: ""
-          prefix-key: lint
-
-      - name: Format Check
-        run: cargo fmt -- --check
-
-      - name: Clippy
-        run: |
-          nix develop -c just async_std lint
-          nix develop -c just tokio lint