diff --git a/Makefile b/Makefile
index f34a0de5..bf1d87e9 100644
--- a/Makefile
+++ b/Makefile
@@ -63,15 +63,13 @@ test:
 #: format - Run the PEP8 formatter.
 .PHONY: format
 format:
-	autopep8 --exit-code --global-config .flake8 helpdesk
-	isort --line-length=120 --src helpdesk .
+	ruff format helpdesk 
 
 
 #: checkformat - checks formatting against configured format specifications for the project.
 .PHONY: checkformat
 checkformat:
-	flake8 helpdesk --count --show-source --statistics --exit-zero --max-complexity=20
-	isort --line-length=120 --src helpdesk . --check
+	ruff check helpdesk
 
 
 #: documentation - Build documentation (Sphinx, README, ...).