diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index bdf82a7..cd70d61 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -13,7 +13,7 @@ repos:
       - id: mypy
         additional_dependencies: ["pydantic==2.11.7", "types-docutils", "sphinx>=7.4.7"]
   - repo: https://github.com/PyCQA/autoflake
-    rev: v2.3.1
+    rev: v2.3.3
     hooks:
       - id: autoflake
         args: [--remove-all-unused-imports, --in-place]
@@ -22,14 +22,14 @@ repos:
     hooks:
       - id: yamlfmt
   - repo: https://github.com/commitizen-tools/commitizen
-    rev: v4.12.1
+    rev: v4.13.9
     hooks:
       - id: commitizen
         stages: [commit-msg]
       - id: commitizen-branch
         stages: [pre-push]
   - repo: https://github.com/hukkin/mdformat
-    rev: 1.0.0 # Use the ref you want to point at
+    rev: 1.0.0
     hooks:
       - id: mdformat
         additional_dependencies:
@@ -45,7 +45,7 @@ repos:
         files: 'pyproject\.toml$'
         additional_dependencies: ["tomli==1.2.0", "tomli-w==1.2.0", "packaging==25.0"]
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: v2.11.1
+    rev: v2.16.2
     hooks:
       - id: pyproject-fmt
         args: [--keep-full-version]
@@ -56,6 +56,10 @@ repos:
         args: [--py310-plus]
         exclude: '^.*test.*\.py$'
   - repo: https://github.com/tox-dev/tox-ini-fmt
-    rev: "1.7.1"
+    rev: 1.7.1
     hooks:
       - id: tox-ini-fmt
+  - repo: https://github.com/google/yamlfmt
+    rev: v0.21.0
+    hooks:
+      - id: yamlfmt
diff --git a/example/pyproject.toml b/example/pyproject.toml
index 42a70bc..bf76b47 100644
--- a/example/pyproject.toml
+++ b/example/pyproject.toml
@@ -18,7 +18,7 @@ dependencies = [
   "asyncfast",
 ]
 
-[tool.uv.sources]
-amgi-aiokafka = { workspace = true }
-asyncfast = { workspace = true }
-amgi-paho-mqtt = { workspace = true }
+[tool.uv]
+sources.amgi-aiokafka = { workspace = true }
+sources.amgi-paho-mqtt = { workspace = true }
+sources.asyncfast = { workspace = true }
diff --git a/packages/amgi-aiobotocore/pyproject.toml b/packages/amgi-aiobotocore/pyproject.toml
index 4e755a1..d1113a7 100644
--- a/packages/amgi-aiobotocore/pyproject.toml
+++ b/packages/amgi-aiobotocore/pyproject.toml
@@ -31,7 +31,6 @@ dependencies = [
   "amgi-types==0.37.0",
   "typing-extensions>=4.15.0; python_full_version<'3.11'",
 ]
-
 entry-points.amgi_server.amgi-aiobotocore-sqs = "amgi_aiobotocore.sqs:_run_cli"
 
 [dependency-groups]
@@ -44,11 +43,7 @@ dev = [
   "testcontainers[localstack]>=4.13.0",
 ]
 
-[tool.uv.sources.amgi-common]
-workspace = true
-
-[tool.uv.sources.amgi-types]
-workspace = true
-
-[tool.uv.sources.test-utils]
-workspace = true
+[tool.uv]
+sources.amgi-common.workspace = true
+sources.amgi-types.workspace = true
+sources.test-utils.workspace = true
diff --git a/packages/amgi-aiokafka/pyproject.toml b/packages/amgi-aiokafka/pyproject.toml
index 11a9b45..fb44902 100644
--- a/packages/amgi-aiokafka/pyproject.toml
+++ b/packages/amgi-aiokafka/pyproject.toml
@@ -33,7 +33,6 @@ dependencies = [
   "amgi-types==0.37.0",
   "typing-extensions>=4.15.0; python_full_version<'3.11'",
 ]
-
 urls.Changelog = "https://github.com/asyncfast/amgi/blob/main/CHANGELOG.md"
 urls.Homepage = "https://github.com/asyncfast/amgi/tree/main/packages/amgi-aiokafka"
 urls.Issues = "https://github.com/asyncfast/amgi/issues/"
@@ -50,11 +49,7 @@ dev = [
   "testcontainers[kafka]>=4.13.0",
 ]
 
-[tool.uv.sources.amgi-types]
-workspace = true
-
-[tool.uv.sources.amgi-common]
-workspace = true
-
-[tool.uv.sources.test-utils]
-workspace = true
+[tool.uv]
+sources.amgi-common.workspace = true
+sources.amgi-types.workspace = true
+sources.test-utils.workspace = true
diff --git a/packages/amgi-common/pyproject.toml b/packages/amgi-common/pyproject.toml
index 74ffb3f..f7a956c 100644
--- a/packages/amgi-common/pyproject.toml
+++ b/packages/amgi-common/pyproject.toml
@@ -30,7 +30,6 @@ dependencies = [
   "amgi-types==0.37.0",
   "typing-extensions>=4.15.0; python_full_version<'3.13'",
 ]
-
 urls.Changelog = "https://github.com/asyncfast/amgi/blob/main/CHANGELOG.md"
 urls.Homepage = "https://github.com/asyncfast/amgi/tree/main/packages/amgi-common"
 urls.Issues = "https://github.com/asyncfast/amgi/issues/"
@@ -45,8 +44,6 @@ dev = [
   "test-utils",
 ]
 
-[tool.uv.sources.test-utils]
-workspace = true
-
-[tool.uv.sources.amgi-types]
-workspace = true
+[tool.uv]
+sources.amgi-types.workspace = true
+sources.test-utils.workspace = true
diff --git a/packages/amgi-kafka-event-source-mapping/pyproject.toml b/packages/amgi-kafka-event-source-mapping/pyproject.toml
index d6435cb..a5fe610 100644
--- a/packages/amgi-kafka-event-source-mapping/pyproject.toml
+++ b/packages/amgi-kafka-event-source-mapping/pyproject.toml
@@ -28,7 +28,6 @@ classifiers = [
 dependencies = [
   "amgi-aiokafka==0.37.0",
   "typing-extensions>=4.15.0; python_full_version<'3.11'",
-
 ]
 
 [dependency-groups]
@@ -39,11 +38,8 @@ dev = [
   "pytest-timeout>=2.4.0",
   "test-utils",
   "testcontainers[kafka]>=4.13.0",
-
 ]
 
-[tool.uv.sources.amgi-aiokafka]
-workspace = true
-
-[tool.uv.sources.test-utils]
-workspace = true
+[tool.uv]
+sources.amgi-aiokafka.workspace = true
+sources.test-utils.workspace = true
diff --git a/packages/amgi-paho-mqtt/pyproject.toml b/packages/amgi-paho-mqtt/pyproject.toml
index 22bc351..b473fa7 100644
--- a/packages/amgi-paho-mqtt/pyproject.toml
+++ b/packages/amgi-paho-mqtt/pyproject.toml
@@ -30,7 +30,6 @@ dependencies = [
   "amgi-types==0.37.0",
   "paho-mqtt>=2.1.0",
 ]
-
 entry-points.amgi_server.amgi-paho-mqtt = "amgi_paho_mqtt:run"
 
 [dependency-groups]
@@ -43,11 +42,7 @@ dev = [
   "testcontainers[mqtt]>=4.13.0",
 ]
 
-[tool.uv.sources.test-utils]
-workspace = true
-
-[tool.uv.sources.amgi-common]
-workspace = true
-
-[tool.uv.sources.amgi-types]
-workspace = true
+[tool.uv]
+sources.amgi-common.workspace = true
+sources.amgi-types.workspace = true
+sources.test-utils.workspace = true
diff --git a/packages/amgi-redis/pyproject.toml b/packages/amgi-redis/pyproject.toml
index 5f44ce6..53e62a0 100644
--- a/packages/amgi-redis/pyproject.toml
+++ b/packages/amgi-redis/pyproject.toml
@@ -31,7 +31,6 @@ dependencies = [
   "redis>=7.0.1",
   "typing-extensions>=4.15.0; python_full_version<'3.11'",
 ]
-
 entry-points.amgi_server.amgi-redis = "amgi_redis:_run_cli"
 
 [dependency-groups]
@@ -44,11 +43,7 @@ dev = [
   "testcontainers[redis]>=4.13.0",
 ]
 
-[tool.uv.sources.amgi-common]
-workspace = true
-
-[tool.uv.sources.test-utils]
-workspace = true
-
-[tool.uv.sources.amgi-types]
-workspace = true
+[tool.uv]
+sources.amgi-common.workspace = true
+sources.amgi-types.workspace = true
+sources.test-utils.workspace = true
diff --git a/packages/amgi-sqs-event-source-mapping/pyproject.toml b/packages/amgi-sqs-event-source-mapping/pyproject.toml
index 12aa600..759662b 100644
--- a/packages/amgi-sqs-event-source-mapping/pyproject.toml
+++ b/packages/amgi-sqs-event-source-mapping/pyproject.toml
@@ -30,7 +30,6 @@ dependencies = [
   "amgi-types==0.37.0",
   "typing-extensions>=4.15.0; python_full_version<'3.11'",
 ]
-
 optional-dependencies.boto3 = [
   "boto3>=1.40.70",
 ]
@@ -45,11 +44,7 @@ dev = [
   "testcontainers[localstack]>=4.13.0",
 ]
 
-[tool.uv.sources.test-utils]
-workspace = true
-
-[tool.uv.sources.amgi-common]
-workspace = true
-
-[tool.uv.sources.amgi-types]
-workspace = true
+[tool.uv]
+sources.amgi-common.workspace = true
+sources.amgi-types.workspace = true
+sources.test-utils.workspace = true
diff --git a/packages/amgi-types/pyproject.toml b/packages/amgi-types/pyproject.toml
index 5afd66d..c4c8474 100644
--- a/packages/amgi-types/pyproject.toml
+++ b/packages/amgi-types/pyproject.toml
@@ -30,7 +30,6 @@ classifiers = [
 dependencies = [
   "typing-extensions>=4.15.0; python_full_version<'3.11'",
 ]
-
 urls.Changelog = "https://github.com/asyncfast/amgi/blob/main/CHANGELOG.md"
 urls.Homepage = "https://github.com/asyncfast/amgi/tree/main/packages/amgi-types"
 urls.Issues = "https://github.com/asyncfast/amgi/issues/"
diff --git a/packages/asyncfast-cli/pyproject.toml b/packages/asyncfast-cli/pyproject.toml
index c37f043..9011cda 100644
--- a/packages/asyncfast-cli/pyproject.toml
+++ b/packages/asyncfast-cli/pyproject.toml
@@ -38,5 +38,5 @@ dev = [
   "pytest-timeout>=2.4.0",
 ]
 
-[tool.uv.sources.amgi-types]
-workspace = true
+[tool.uv]
+sources.amgi-types.workspace = true
diff --git a/packages/asyncfast/pyproject.toml b/packages/asyncfast/pyproject.toml
index 8b44f25..49e0c6d 100644
--- a/packages/asyncfast/pyproject.toml
+++ b/packages/asyncfast/pyproject.toml
@@ -36,7 +36,6 @@ dependencies = [
   "amgi-types==0.37.0",
   "pydantic>=2.0.0",
 ]
-
 optional-dependencies.standard = [
   "asyncfast-cli==0.37.0",
 ]
@@ -56,16 +55,14 @@ dev = [
   "pytest-timeout>=2.4.0",
 ]
 
-[tool.uv.sources.amgi-types]
-workspace = true
-
-[tool.uv.sources.asyncfast-cli]
-workspace = true
+[tool.uv]
+sources.amgi-types.workspace = true
+sources.asyncfast-cli.workspace = true
 
-[tool.pytest.ini_options]
-asyncio_mode = "auto"
-timeout = 10
-timeout_func_only = true
-addopts = [
+[tool.pytest]
+ini_options.asyncio_mode = "auto"
+ini_options.timeout = 10
+ini_options.timeout_func_only = true
+ini_options.addopts = [
   "--benchmark-max-time=0.1",
 ]
diff --git a/pyproject.toml b/pyproject.toml
index 63f2d9c..f6d4c2b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -14,7 +14,7 @@ classifiers = [
   "Programming Language :: Python :: 3.13",
   "Programming Language :: Python :: 3.14",
 ]
-dependencies = [  ]
+dependencies = []
 
 [dependency-groups]
 dev = [
@@ -33,21 +33,21 @@ dev = [
   "tox-uv>=1.27.0",
 ]
 
-[tool.uv.workspace]
-members = [
-  "packages/*",
+[tool.uv]
+workspace.members = [
   "example",
+  "packages/*",
 ]
 
-[tool.pytest.ini_options]
-asyncio_mode = "auto"
-timeout = 10
-timeout_func_only = true
-filterwarnings = [
+[tool.pytest]
+ini_options.asyncio_mode = "auto"
+ini_options.timeout = 10
+ini_options.timeout_func_only = true
+ini_options.filterwarnings = [
   "ignore:^The wait_for_logs function with string or callable predicates is deprecated:DeprecationWarning",
   "ignore:^The @wait_container_is_ready decorator is deprecated:DeprecationWarning",
 ]
-markers = [
+ini_options.markers = [
   "integration: tests that require external services (Docker/Testcontainers)",
 ]