diff --git a/template/.pre-commit-config.yaml.j2 b/template/.pre-commit-config.yaml.j2
index c76c18e9..01689872 100644
--- a/template/.pre-commit-config.yaml.j2
+++ b/template/.pre-commit-config.yaml.j2
@@ -59,14 +59,23 @@ repos:
         name: regenerate-charts
         language: system
         entry: make regenerate-charts
-        stages: [pre-commit, pre-merge-commit, manual]
+        stages: [pre-commit, pre-merge-commit]
         pass_filenames: false
+        files: \.rs$|Cargo\.(toml|lock)
+
+      - id: regenerate-nix
+        name: regenerate-nix
+        language: system
+        entry: make regenerate-nix
+        stages: [pre-commit, pre-merge-commit]
+        pass_filename: false
+        files: Cargo\.lock
 
       - id: cargo-test
         name: cargo-test
         language: system
         entry: cargo test
-        stages: [pre-commit, pre-merge-commit, manual]
+        stages: [pre-commit, pre-merge-commit]
         pass_filenames: false
         files: \.rs$|Cargo\.(toml|lock)
 
@@ -74,7 +83,7 @@ repos:
         name: cargo-rustfmt
         language: system
         entry: cargo +{[rust_nightly_version}] fmt --all -- --check
-        stages: [pre-commit]
+        stages: [pre-commit, pre-merge-commit]
         pass_filenames: false
         files: \.rs$
 
@@ -82,6 +91,6 @@ repos:
         name: cargo-clippy
         language: system
         entry: cargo clippy --all-targets -- -D warnings
-        stages: [pre-commit]
+        stages: [pre-commit, pre-merge-commit]
         pass_filenames: false
         files: \.rs$