diff --git a/.vscode/settings.json b/.vscode/settings.json
index 8bdd980dd..333f7af30 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -14,12 +14,12 @@
   "typescript.preferences.importModuleSpecifier": "non-relative",
   "typescript.updateImportsOnFileMove.enabled": "always",
   "editor.codeActionsOnSave": {
-    "source.organizeImports": false
+    "source.organizeImports": "never"
   },
   "[javascript]": {
     "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
-      "source.organizeImports": false
+      "source.organizeImports": "never"
     }
   },
   "[javascriptreact]": {
@@ -43,4 +43,9 @@
   "javascript.format.enable": false,
   "editor.tabSize": 2,
   "editor.detectIndentation": false,
+  "[javascriptreact][typescript][typescriptreact]": {
+    "editor.codeActionsOnSave": {
+      "source.organizeImports": "explicit"
+    }
+  },
 }
diff --git a/renovate.json b/renovate.json
index f22fd80ff..d3eb01d44 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,10 +1,6 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:recommended",
-    ":rebaseStalePrs",
-    ":gitSignOff"
-  ],
+  "extends": ["local>celo-org/.github:renovate-config"],
   "packageRules": [
     {
       "matchDepTypes": ["devDependencies"],
@@ -37,11 +33,5 @@
   "patch": {
     "minimumReleaseAge": "4 days"
   },
-  "vulnerabilityAlerts": {
-    "enabled": true,
-    "labels": [
-      "type:security"
-    ]
-  },
   "schedule": ["on tuesday and thursday", "every weekend"]
 }