diff --git a/Makefile b/Makefile
index 3d83ba04244..5791fd46ac6 100644
--- a/Makefile
+++ b/Makefile
@@ -154,7 +154,31 @@ ghcid:
 
 # Used by CI
 .PHONY: lint-all
-lint-all: treefmt-check check-local-nix-derivations
+lint-all: treefmt-check check-local-nix-derivations hlint-check-all
+
+.PHONY: hlint-check-all
+hlint-check-all:
+	./tools/hlint.sh -f all -m check
+
+.PHONY: hlint-inplace-all
+hlint-inplace-all:
+	./tools/hlint.sh -f all -m inplace
+
+.PHONY: hlint-check-pr
+hlint-check-pr:
+	./tools/hlint.sh -f pr -m check
+
+.PHONY: hlint-inplace-pr
+hlint-inplace-pr:
+	./tools/hlint.sh -f pr -m inplace
+
+.PHONY: hlint-check
+hlint-check:
+	./tools/hlint.sh -f changeset -m check
+
+.PHONY: hlint-inplace
+hlint-inplace:
+	./tools/hlint.sh -f changeset -m inplace
 
 .PHONY: hlint-inplace-all
 hlint-inplace-all:
diff --git a/treefmt.toml b/treefmt.toml
index 8c952fb7e6b..dce24e184d6 100644
--- a/treefmt.toml
+++ b/treefmt.toml
@@ -18,11 +18,6 @@ options = [
   "--check-idempotence",
 ]
 
-[formatter.hlint]
-command = "hlint"
-includes = ["*.hs"]
-excludes = [ "dist*" ]
-
 [formatter.shellcheck]
 command = "shellcheck"
 includes = ["*.sh"]