diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1c983757..d6ec9b77 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,6 +32,7 @@ jobs:
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: stable
+          components: clippy, rustfmt
 
       - name: Set up nightly Rust toolchain
         uses: actions-rust-lang/setup-rust-toolchain@v1
@@ -44,6 +45,11 @@ jobs:
           make lint
           make lint-web
 
+      - name: Lint files (Rust nightly)
+        continue-on-error: true
+        run: |
+          make lint-nightly
+
   sanitize:
     uses: ./.github/workflows/sanitize.yml
 
diff --git a/Makefile b/Makefile
index 2b0a39d7..cab4da96 100644
--- a/Makefile
+++ b/Makefile
@@ -104,6 +104,12 @@ test-wasm:
 	cargo xtask test-wasm
 
 lint:
+	cargo update --workspace --locked --quiet
+	cargo check --workspace --all-targets
+	cargo +nightly fmt --all --check
+	cargo +stable clippy --workspace --all-targets -- -D warnings
+
+lint-nightly:
 	cargo update --workspace --locked --quiet
 	cargo check --workspace --all-targets
 	cargo +nightly fmt --all --check