diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c3a9e9..dd90b3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 [Unreleased]: https://github.com/chaostoolkit-incubator/chaostoolkit-opentracing/compare/0.10.0...HEAD
 
+### Changed
+
+- Switched from flake8/pycodestyle to ruff
+
 ## [0.10.0][] - 2023-04-12
 
 [0.10.0]: https://github.com/chaostoolkit-incubator/chaostoolkit-opentracing/compare/0.9.1...0.10.0
diff --git a/Makefile b/Makefile
index a7e13a2..7eb74d6 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ install-dev: install
 
 .PHONY: lint
 lint:
-	flake8 chaostracing/ tests/
+	ruff chaostracing/ tests/
 	isort --check-only --profile black chaostracing/ tests/
 	black --check --diff chaostracing/ tests/
 
@@ -18,6 +18,7 @@ lint:
 format:
 	isort --profile black chaostracing/ tests/
 	black chaostracing/ tests/
+	ruff chaostracing --fix
 
 .PHONY: tests
 tests:
diff --git a/requirements-dev.txt b/requirements-dev.txt
index b23b6de..b65dec4 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,11 +1,9 @@
 coverage
-pycodestyle
 pytest>=2.8
 pytest-cov
 pytest-sugar
 requests
 requests_mock
-flake8
 black
 isort
-pyflakes==2.4.0
\ No newline at end of file
+ruff
\ No newline at end of file