diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9e63408fcd..a8e89fa4d7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -58,17 +58,14 @@ repos:
           - -d
           - '{extends: relaxed, rules: {line-length: {max: 90}}}'
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.6
+    rev: v0.1.7
     hooks:
       - id: ruff
+      - id: ruff-format
   - repo:  https://github.com/PyCQA/autoflake
     rev: v2.2.1
     hooks:
       - id: autoflake
-  - repo: https://github.com/psf/black
-    rev: 23.11.0
-    hooks:
-      - id: black
   - repo: https://github.com/codespell-project/codespell
     rev: v2.2.6
     hooks:
diff --git a/pyproject.toml b/pyproject.toml
index 8fc19dc5df..15842fd0d8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -109,6 +109,21 @@ extend-ignore = [
     "ANN101",
     "B904",
     "PLW2901",
+    # https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
+    "W191",
+    "E111",
+    "E114",
+    "E117",
+    "D206",
+    "D300",
+    "Q000",
+    "Q001",
+    "Q002",
+    "Q003",
+    "COM812",
+    "COM819",
+    "ISC001",
+    "ISC002",
 ]
 line-length = 88
 select = [
@@ -127,6 +142,7 @@ select = [
     "PLW",
     "S",
     "U",
+    "UP",
     "W",
     "YTT",
 ]