diff --git a/renovate.json b/renovate.json
index 0143b658..fca7ba4e 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,149 +1,53 @@
 {
-<<<<<<< HEAD
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:recommended"
-  ],
-  "prHourlyLimit": 2,
-  "prConcurrentLimit": 5,
-  "dependencyDashboard": true,
-  "labels": [
-    "dependencies",
-    "renovate"
-  ],
+  "extends": ["config:base"],
+  "enabledManagers": ["docker-compose"],
   "schedule": [
-    "before 6am on monday"
+    "* 3-9 * * 5",
+    "* 3-9 * * 6",
+    "* 3-9 * * 0"
   ],
+  "prConcurrentLimit": 5,
+  "branchPrefix": "renovate/",
+  "rebaseWhen": "behind-base-branch",
   "packageRules": [
     {
-      "description": "Pin ClickHouse to the exact version used by Signoz",
+      "description": "Pin ClickHouse, Zookeeper, Postgres, pgvector, and pgvecto-rs images",
+      "matchDatasources": ["docker"],
+      "matchManagers": ["docker-compose"],
       "matchPackageNames": [
-        "clickhouse/clickhouse-server"
+        "signoz-clickhouse-server",
+        "signoz-zookeeper-1",
+        "postgres",
+        "pgvector",
+        "pgvecto-rs"
       ],
-      "pin": {
-        "enabled": true
-      },
-      "semanticCommitScope": "signoz-clickhouse"
+      "pinDigests": true,
+      "allowedVersions": "digest"
     },
     {
-      "description": "Pin Zookeeper to the exact version used by Signoz",
-      "matchPackageNames": [
-        "bitnami/zookeeper"
-      ],
-      "pin": {
-        "enabled": true
-      },
-      "semanticCommitScope": "signoz-zookeeper-1"
+      "description": "Alpine-based images only update to Alpine-based versions",
+      "matchDatasources": ["docker"],
+      "matchManagers": ["docker-compose"],
+      "matchPackagePatterns": [".*"],
+      "allowedVersions": "/alpine/i"
     },
     {
-      "description": "Allow only Alpine tag upgrades for all Alpine-based images",
-      "matchDatasources": [
-        "docker"
-      ],
-      "allowedVersions": "/.*alpine.*/",
-      "groupName": "alpine-upgrades",
-      "semanticCommitScope": "{{depName}}",
-      "matchPackageNames": [
-        "/.*alpine.*/"
-      ]
+      "description": "Automerge patch updates for semver tags",
+      "matchDatasources": ["docker"],
+      "matchManagers": ["docker-compose"],
+      "matchUpdateTypes": ["patch"],
+      "automerge": true
     },
     {
-      "description": "Pin postgres image – never upgrade",
-      "matchPackageNames": [
-        "postgres"
-      ],
-      "pin": {
-        "enabled": true
-      },
-      "semanticCommitScope": "postgres"
-    },
-    {
-      "description": "Pin pgvector image – never upgrade",
-      "matchPackageNames": [
-        "pgvector/pgvector"
-      ],
-      "pin": {
-        "enabled": true
-      },
-      "semanticCommitScope": "pgvector"
-    },
-    {
-      "description": "Pin pgvecto‑rs image – never upgrade",
-      "matchPackageNames": [
-        "pgvecto-rs/pgvecto-rs"
-      ],
-      "pin": {
-        "enabled": true
-      },
-      "semanticCommitScope": "pgvecto-rs"
-    },
-    {
-      "description": "Default rule for all remaining Docker images",
-      "matchDatasources": [
-        "docker"
-      ],
-      "groupName": "docker-images",
-      "semanticCommitScope": "{{depName}}"
+      "description": "Require approval for major and minor updates",
+      "matchDatasources": ["docker"],
+      "matchManagers": ["docker-compose"],
+      "matchUpdateTypes": ["minor", "major"],
+      "automerge": false,
+      "requiredStatusChecks": null
     }
   ],
-  "customManagers": [],
   "branchNameStrict": true,
-  "branchPrefix": "renovate/",
-  "branchTopic": "{{service}}/{{depName}}",
-  "commitMessageAction": "Update",
-  "commitMessageTopic": "{{service}}/{{depName}}"
+  "branchTopic": "{{{depNameSanitized}}}-{{{newVersion}}}"
 }
-=======
-    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-    "extends": ["config:base"],
-    "enabledManagers": ["docker-compose"],
-    "schedule": [
-      "* 3-9 * * 5",
-      "* 3-9 * * 6",
-      "* 3-9 * * 0"
-    ],
-    "prConcurrentLimit": 5,
-    "branchPrefix": "renovate/",
-    "rebaseWhen": "behind-base-branch",
-    "packageRules": [
-      {
-        "description": "Pin ClickHouse, Zookeeper, Postgres, pgvector, and pgvecto-rs images",
-        "matchDatasources": ["docker"],
-        "matchManagers": ["docker-compose"],
-        "matchPackageNames": [
-          "signoz-clickhouse-server",
-          "signoz-zookeeper-1",
-          "postgres",
-          "pgvector",
-          "pgvecto-rs"
-        ],
-        "pinDigests": true,
-        "allowedVersions": "digest"
-      },
-      {
-        "description": "Alpine-based images only update to Alpine-based versions",
-        "matchDatasources": ["docker"],
-        "matchManagers": ["docker-compose"],
-        "matchPackagePatterns": [".*"],
-        "allowedVersions": "/alpine/i"
-      },
-      {
-        "description": "Automerge patch updates for semver tags",
-        "matchDatasources": ["docker"],
-        "matchManagers": ["docker-compose"],
-        "matchUpdateTypes": ["patch"],
-        "automerge": true
-      },
-      {
-        "description": "Require approval for major and minor updates",
-        "matchDatasources": ["docker"],
-        "matchManagers": ["docker-compose"],
-        "matchUpdateTypes": ["minor", "major"],
-        "automerge": false,
-        "requiredStatusChecks": null
-      }
-    ],
-    "branchNameStrict": true,
-    "branchTopic": "{{{depNameSanitized}}}-{{{newVersion}}}"
-  }
->>>>>>> renovate/reconfigure