diff --git a/.github/workflows/op_rbuilder_checks.yaml b/.github/workflows/op_rbuilder_checks.yaml
index e13852ef..1283c8f6 100644
--- a/.github/workflows/op_rbuilder_checks.yaml
+++ b/.github/workflows/op_rbuilder_checks.yaml
@@ -12,17 +12,11 @@ env:
 
 jobs:
   lint_and_test:
-    name: Lint and test
+    name: Lint and test (nightly)
     runs-on: warp-ubuntu-latest-x64-16x
     env:
       # Set features for the Makefile
-      FEATURES: ${{ matrix.features }}
-    strategy:
-      matrix:
-        toolchain:
-          - nightly
-        features:
-          - ""
+      FEATURES: ""
 
     steps:
       - name: Checkout sources
@@ -32,7 +26,7 @@ jobs:
       - name: Setup rust toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: ${{ matrix.toolchain }}
+          toolchain: nightly-2026-02-21
           components: "rustfmt,clippy"
 
       # https://github.com/swatinem/rust-cache
diff --git a/Makefile b/Makefile
index 0eb0c4ad..82b964bf 100644
--- a/Makefile
+++ b/Makefile
@@ -76,8 +76,8 @@ docker-image-rbuilder: ## Build a rbuilder Docker image
 
 .PHONY: lint
 lint: ## Run the linters
-	cargo +nightly fmt -- --check
-	cargo +nightly clippy --all-features -- -D warnings
+	cargo +nightly-2026-02-21 fmt -- --check
+	cargo +nightly-2026-02-21 clippy --all-features -- -D warnings
 
 .PHONY: test
 test: ## Run the tests for rbuilder and op-rbuilder
@@ -90,9 +90,9 @@ lt: lint test ## Run "lint" and "test"
 
 .PHONY: fmt
 fmt: ## Format the code
-	cargo +nightly fmt
-	cargo +nightly clippy --all-features --fix --allow-staged --allow-dirty
-	cargo +nightly fix --allow-staged --allow-dirty
+	cargo +nightly-2026-02-21 fmt
+	cargo +nightly-2026-02-21 clippy --all-features --fix --allow-staged --allow-dirty
+	cargo +nightly-2026-02-21 fix --allow-staged --allow-dirty
 
 .PHONY: bench
 bench: ## Run benchmarks