diff --git a/Makefile b/Makefile
index 1154a15301..5b8c5a2cb3 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ define deactivate_virtualenv
     fi
 endef
 
-.SILENT: install install/all test/all lint build run new test test/watch clean bump/integrations bump/single-integration execute/all
+.SILENT: install install/all test/all lint lint/fix build run new test test/watch clean bump/integrations bump/single-integration execute/all
 
 
 # Install dependencies
@@ -102,6 +102,7 @@ lint:
 lint/fix:
 	$(ACTIVATE) && \
 	black .
+	ruff check --fix .
 
 # Development commands
 build:
diff --git a/integrations/_infra/Makefile b/integrations/_infra/Makefile
index 1a8c62e668..ee81db8f5e 100644
--- a/integrations/_infra/Makefile
+++ b/integrations/_infra/Makefile
@@ -37,7 +37,7 @@ define deactivate_virtualenv
     fi
 endef
 
-.SILENT: install install/prod install/local-core lint run test clean
+.SILENT: install install/prod install/local-core lint lint/fix run test clean
 
 install:
 	$(call deactivate_virtualenv) && \
@@ -56,6 +56,11 @@ lint:
 	$(ACTIVATE) && \
 	$(call run_checks,.)
 
+lint/fix:
+	$(ACTIVATE) && \
+	black .
+	ruff check --fix .
+
 run:
 	$(ACTIVATE) && ocean sail