diff --git a/renovate.json b/renovate.json
index bb642ec2238c..d5a006f794ca 100644
--- a/renovate.json
+++ b/renovate.json
@@ -4,15 +4,19 @@
     "security:only-security-updates",
     ":semanticCommitTypeAll(deps)"
   ],
-  "recreateClosed": true,
-  "rebaseWhen": "always",
   "packageRules": [
     {
-      "matchManagers": ["uv"],
+      "matchManagers": ["pep621"],
       "matchFileNames": ["api/**"],
       "addLabels": ["api", "dependencies"],
       "semanticCommitScope": "API"
     },
+    {
+      "matchManagers": ["pep621"],
+      "matchFileNames": ["mcp/**"],
+      "addLabels": ["mcp", "dependencies"],
+      "semanticCommitScope": "MCP"
+    },
     {
       "matchManagers": ["npm"],
       "matchFileNames": ["frontend/**"],
@@ -24,6 +28,13 @@
       "matchFileNames": ["docs/**"],
       "addLabels": ["docs", "dependencies"],
       "semanticCommitScope": "Docs"
+    },
+    {
+      "matchManagers": ["github-actions"],
+      "matchFileNames": [".github/**"],
+      "addLabels": ["ci", "dependencies"],
+      "semanticCommitScope": "CI"
     }
-  ]
+  ],
+  "semanticCommitScope": ""
 }