diff --git a/Makefile b/Makefile
index 58e2e85..0a57efa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,12 @@
 .PHONY: lint format
 
 help:
-	@echo "lint - check style with black, flake8, sort python with isort, and indent html"
-	@echo "format - enforce a consistent code style across the codebase and sort python files with isort"
+	@echo "lint - check style with black, ruff, sort python with ruff, indent html, and lint frontend css/js"
+	@echo "format - enforce a consistent code style across the codebase, sort python files with ruff and fix frontend css/js"
 
 lint-server:
-	black --target-version py37 --check --diff .
-	flake8
-	isort --check-only --diff .
+	black --target-version py38 --check --diff .
+	ruff check .
 	curlylint --parse-only bakerydemo
 	git ls-files '*.html' | xargs djhtml --check
 
@@ -19,8 +18,8 @@ lint-client:
 lint: lint-server lint-client
 
 format-server:
-	black --target-version py37 .
-	isort .
+	black --target-version py38 .
+	ruff check . --fix
 	git ls-files '*.html' | xargs djhtml -i
 
 format-client: