diff --git a/{{cookiecutter.__package_slug}}/makefile b/{{cookiecutter.__package_slug}}/makefile
index a8d8cf1..932c074 100644
--- a/{{cookiecutter.__package_slug}}/makefile
+++ b/{{cookiecutter.__package_slug}}/makefile
@@ -78,7 +78,7 @@ dapperdata_fixes:
 
 .PHONY: tomlsort_fixes
 tomlsort_fixes:
-	$(PYTHON_ENV) toml-sort $$(find . -not -path "./.venv/*" -name "*.toml") -i
+	$(PYTHON_ENV) tombi format $$(find . -not -path "./.venv/*" -name "*.toml")
 
 #
 # Testing
@@ -118,7 +118,8 @@ dapperdata_check:
 
 .PHONY: tomlsort_check
 tomlsort_check:
-	$(PYTHON_ENV) toml-sort $$(find . -not -path "./.venv/*" -name "*.toml") --check
+	$(PYTHON_ENV) tombi lint $$(find . -not -path "./.venv/*" -name "*.toml")
+	$(PYTHON_ENV) tombi format $$(find . -not -path "./.venv/*" -name "*.toml") --check
 
 
 
diff --git a/{{cookiecutter.__package_slug}}/pyproject.toml b/{{cookiecutter.__package_slug}}/pyproject.toml
index 48152bd..567891a 100644
--- a/{{cookiecutter.__package_slug}}/pyproject.toml
+++ b/{{cookiecutter.__package_slug}}/pyproject.toml
@@ -81,7 +81,7 @@ dev = [
   "pytest-pretty",
   "ruamel.yaml",
   "ruff",
-  "toml-sort",
+  "tombi",
   "uv"
 ]