diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000..1193eab
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,16 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v6.0.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-toml
+      - id: check-yaml
+      - id: check-merge-conflict
+
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.15.4
+    hooks:
+      - id: ruff
+        args: [--fix]
+      - id: ruff-format
diff --git a/aw_core/util.py b/aw_core/util.py
index bad3a05..9efe5d8 100644
--- a/aw_core/util.py
+++ b/aw_core/util.py
@@ -5,8 +5,7 @@
 logger = logging.getLogger(__name__)
 
 
-class VersionException(Exception):
-    ...
+class VersionException(Exception): ...
 
 
 def _version_info_tuple() -> Tuple[int, int, int]:  # pragma: no cover
diff --git a/tests/test_query2.py b/tests/test_query2.py
index 48bdb11..56154b4 100644
--- a/tests/test_query2.py
+++ b/tests/test_query2.py
@@ -341,9 +341,7 @@ def test_query2_query_functions(datastore):
     eventcount = query_bucket_eventcount(bid);
     asd = nop();
     RETURN = {{"events": events, "eventcount": eventcount}};
-    """.format(
-        bid=bid, bid_escaped=bid.replace("'", "\\'")
-    )
+    """.format(bid=bid, bid_escaped=bid.replace("'", "\\'"))
     try:
         bucket = datastore.create_bucket(
             bucket_id=bid, type="test", client="test", hostname="test", name="asd"
@@ -518,8 +516,7 @@ def test_query2_query_categorize(datastore):
     starttime = iso8601.parse_date("1970")
     endtime = starttime + timedelta(hours=1)
 
-    example_query = (
-        rf"""
+    example_query = rf"""
     events = query_bucket("{bid}");
     events = sort_by_timestamp(events);
     events = categorize(events, [
@@ -529,7 +526,6 @@ def test_query2_query_categorize(datastore):
     events_by_cat = merge_events_by_keys(events, ["$category"]);
     RETURN = {{"events": events, "events_by_cat": events_by_cat}};
     """
-    )
     try:
         bucket = datastore.create_bucket(
             bucket_id=bid, type="test", client="test", hostname="test", name="asd"
diff --git a/tests/utils.py b/tests/utils.py
index 1169b76..8a085f5 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -15,7 +15,7 @@ class TempTestBucket:
 
     def __init__(self, datastore):
         self.ds = datastore
-        self.bucket_id = f"test-{random.randint(0, 10 ** 4)}"
+        self.bucket_id = f"test-{random.randint(0, 10**4)}"
 
     def __enter__(self):
         self.ds.create_bucket(