diff --git a/.prettierignore b/.prettierignore
index fb328fef19..0994221273 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -32,3 +32,6 @@ tmp/
 cypress/screenshots
 cypress/videos
 cypress/downloads
+
+# fleetdm.com website (uses its own formatting conventions)
+website/
\ No newline at end of file
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 130599c6bc..a8597204ad 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -6,6 +6,7 @@
         "esbenp.prettier-vscode",
         "redhat.vscode-yaml",
         "dbaeumer.vscode-eslint",
-        "firefox-devtools.vscode-firefox-debug"
+        "firefox-devtools.vscode-firefox-debug",
+        "editorconfig.editorconfig"
     ]
 }
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 2f0efa2210..c12547f138 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -27,5 +27,9 @@
         "debugAdapter": "legacy",
         "substitutePath": []
     },
-    "go.testTimeout": "60s"
+    "go.testTimeout": "60s",
+    "html.format.templating": true,
+    "html.format.wrapAttributes": "preserve",
+    "html.format.wrapLineLength": 0,
+    "prettier.requireConfig": true
 }
\ No newline at end of file