diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 57a35ab4f..d1762aa9a 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -3,6 +3,7 @@
         "dbaeumer.vscode-eslint",
         "bradlc.vscode-tailwindcss",
         "stylelint.vscode-stylelint",
-        "wix.vscode-import-cost"
+        "wix.vscode-import-cost",
+        "redhat.vscode-yaml"
     ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 4a7155a74..d7ca13345 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -5,5 +5,15 @@
     "*.conf.template": "properties"
   },
   "files.eol": "\n",
-  "files.insertFinalNewline": false
+  "files.insertFinalNewline": false,
+  "json.schemas": [
+    {
+      "fileMatch": [".lintstagedrc.json"],
+      "url": "https://json.schemastore.org/lintstagedrc.schema.json"
+    },
+    {
+      "fileMatch": ["renovate.json"],
+      "url": "https://docs.renovatebot.com/renovate-schema.json"
+    }
+  ]
 }
diff --git a/renovate.json b/renovate.json
index 4fa381091..6cb74fb7d 100644
--- a/renovate.json
+++ b/renovate.json
@@ -5,5 +5,6 @@
   ],
   "lockFileMaintenance": {
     "enabled": true
-  }
+  },
+  "rebaseWhen": "conflicted"
 }