diff --git a/Makefile b/Makefile
index 2a89b6df..1a99d25e 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,18 @@ lint:
 format:
 	python -m ruff format --check .
 
+.PHONY: fix
+fix: fix-lint fix-format
+
+.PHONY: fix-lint
+fix-lint:
+	python -m ruff check --fix .
+
+.PHONY: fix-format
+fix-format:
+	python -m ruff format .
+
+
 .PHONY: unittest
 unittest: ## Run unittest
 	python -m pytest $(ARGS) test/unit/
diff --git a/ci.sh b/ci.sh
index 6b8c808d..f2646a6a 100755
--- a/ci.sh
+++ b/ci.sh
@@ -3,11 +3,11 @@
 EXIT_STATUS=0
 
 if ! make lint ; then
-  echo "Please run command 'make lint' on your local and commit the result"
+  echo "Please run command 'make fix' on your local and commit the result"
   EXIT_STATUS=1
 fi
 if ! make format ; then
-  echo "Please run command 'make format' on your local and commit the result"
+  echo "Please run command 'make fix' on your local and commit the result"
   EXIT_STATUS=1
 fi
 if ! make unittest ARGS=--junitxml=./test/unit/junit.xml ; then