diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 572161f6488b..aaff61ab0b94 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,13 +1,13 @@
 {
   // See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
   // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
-
   // List of extensions which should be recommended for users of this workspace.
   "recommendations": [
     "golang.go",
     "redhat.vscode-yaml",
     "yzhang.markdown-all-in-one",
-    "timonwong.shellcheck"
+    "timonwong.shellcheck",
+    "ms-python.black-formatter"
   ],
   // List of extensions recommended by VS Code that should not be recommended for users of this workspace.
   "unwantedRecommendations": []
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 677a1a977ecc..baee5aee6162 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -8,8 +8,12 @@
   "go.lintFlags": [
     "--fast"
   ],
-  "python.formatting.provider": "black",
+  "python.formatting.provider": "none",
   "python.linting.pylintEnabled": true,
   "python.linting.enabled": true,
   "markdown.extension.tableFormatter.enabled": false,
+  "[python]": {
+    "editor.defaultFormatter": "ms-python.black-formatter",
+    "editor.formatOnSave": true
+  },
 }