diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index ecf868e0..0af05016 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,7 +1,8 @@
 {
     "recommendations": [
-        "samuelcolvin.jinjahtml",
+        "mikestead.dotenv",
         "ms-azuretools.vscode-docker",
-        "ms-python.python"
+        "ms-python.python",
+        "wholroyd.jinja"
     ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index abafcbe3..3cf5f82d 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,7 +1,6 @@
 {
     "editor.rulers": [79],
     "files.insertFinalNewline": true,
-    "python.terminal.activateEnvironment": false,
     "[css]": {
         "editor.tabSize": 2
     },
@@ -14,10 +13,7 @@
     "[javascript]": {
         "editor.tabSize": 2
     },
-    "[jinja-html]": {
-        "editor.tabSize": 2
-    },
-    "[jinja-js]": {
+    "[jinja]": {
         "editor.tabSize": 2
     }
 }