diff --git a/vscode/rootfs/etc/cont-init.d/code-server.sh b/vscode/rootfs/etc/cont-init.d/code-server.sh
index bd71f5e..3a29339 100644
--- a/vscode/rootfs/etc/cont-init.d/code-server.sh
+++ b/vscode/rootfs/etc/cont-init.d/code-server.sh
@@ -15,6 +15,7 @@ readonly -a PREVIOUS_DEFAULT_CONFIG_HASHES=(
     4ef960e3d6e795adda51d5cbeb18d309fee87ba5cd177292a21b5a70a71a4726ae7053c3793cddc6d63d3b4dacc180ad3ea12d005fc8d63a1bc4cb29f9a17f18
     c5b8acf06ef6d9a2435e9ddb92cb9fce7cfbfe4a2206b0e0c3c4ed514cc926f8d3c662e694a995d102b5ba939056f93201c220558e06e1cd0872bfb1995ba148
     08d86c84a0d80720b22712e878963e90cbb34b659330dad8a823f3c5c7f0ae043d197a5e3020dd7ab4fda3625e17f794675ec074984951e7107db2488898a8d0
+    5243d7664d30b5aa0c45fbe1089cccdf85c5ade17cddd97e21b3a29ccb37b20d20bdfecc141ad6e1a7aa5ea8ee61695a79a43140a2d53f9f91687bc61f7e496c
 )
 
 if bashio::config.has_value 'config_path'; then
diff --git a/vscode/rootfs/root/.code-server/settings.json b/vscode/rootfs/root/.code-server/settings.json
index f66ef6b..3611169 100644
--- a/vscode/rootfs/root/.code-server/settings.json
+++ b/vscode/rootfs/root/.code-server/settings.json
@@ -75,7 +75,10 @@
   "[home-assistant]": {
     "editor.autoIndent": "full",
     "editor.insertSpaces": true,
-    "editor.tabSize": 2
+    "editor.tabSize": 2,
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true,
+    "editor.formatOnPaste": true
   },
   "editor.renderWhitespace": "boundary",
   "esphome.dashboardUri": "15ef4d2f-esphome.local.hass.io:6052",
@@ -87,5 +90,7 @@
   "vsicons.dontShowNewVersionMessage": true,
   "vsicons.projectDetection.disableDetect": true,
   "workbench.iconTheme": "vs-seti",
-  "yaml.format.enable": true
+  "yaml.format.enable": true,
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.rulers": [80, 88, 100, 120]
 }
diff --git a/vscode/vscode.extensions b/vscode/vscode.extensions
index f3cb6b9..ab650eb 100644
--- a/vscode/vscode.extensions
+++ b/vscode/vscode.extensions
@@ -1,4 +1,5 @@
 emilast.LogFileHighlighter#2.9.0
+esbenp.prettier-vscode#5.6.0
 ESPHome.esphome-vscode#0.3.0
 keesschollaart.vscode-home-assistant#1.9.0
 lukas-tr.materialdesignicons-intellisense#3.0.0