diff --git a/vscode/rootfs/root/.code-server/settings.json b/vscode/rootfs/root/.code-server/settings.json
index c65a119..1eeb5a0 100644
--- a/vscode/rootfs/root/.code-server/settings.json
+++ b/vscode/rootfs/root/.code-server/settings.json
@@ -8,5 +8,18 @@
         "**/deps/**": true
     },
     "editor.selectionClipboard": false,
-    "terminal.integrated.copyOnSelection": true
+    "terminal.integrated.copyOnSelection": true,
+    "settings": {
+		"editor.tabSize": 2,
+		"editor.renderWhitespace": "boundary",
+		"yaml.customTags": [
+			"!secret",
+			"!yaml",
+			"!include",
+			"!include_dir_list",
+			"!include_dir_named",
+			"!include_dir_merge_list",
+			"!include_dir_merge_named"
+		]
+	}
 }
diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions
index 2db10e0..d64c6c0 100644
--- a/vscode/vscode.extensions
+++ b/vscode/vscode.extensions
@@ -1,2 +1,3 @@
 keesschollaart.vscode-home-assistant
 lukas-tr.materialdesignicons-intellisense
+redhat.vscode-yaml