diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index f6a0d44226a..d94500d2a0f 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -9,7 +9,7 @@
       // Add the IDs of extensions you want installed when the container is created.
       "extensions": [
         "dbaeumer.vscode-eslint",
-        "esbenp.prettier-vscode",
+        "prettier.prettier-vscode",
         "streetsidesoftware.code-spell-checker",
         "vitest.explorer"
       ]
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index feb88bb966e..b26ab98a691 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,7 +1,7 @@
 {
   "recommendations": [
     "dbaeumer.vscode-eslint",
-    "esbenp.prettier-vscode",
+    "prettier.prettier-vscode",
     "streetsidesoftware.code-spell-checker",
     "astro-build.astro-vscode",
     "vitest.explorer",
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 61abbfa9412..4c84ae156be 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -27,7 +27,7 @@
     "editor.insertSpaces": true,
     "editor.tabSize": 2,
     "editor.detectIndentation": false,
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "prettier.prettier-vscode"
   },
   "[json][[jsonc][yaml][typespec][markdown][css][astro][mdx][shellscript][dockerfile]": {
     "editor.formatOnSave": true,
@@ -35,7 +35,7 @@
     "editor.insertSpaces": true,
     "editor.tabSize": 2,
     "editor.detectIndentation": false,
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "prettier.prettier-vscode"
   },
   "[csharp]": {
     "editor.insertSpaces": true,
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 043ecfc7ffa..1f7c8e4c8b2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -70,7 +70,7 @@ TYPESPEC_VERBOSE_TEST_OUTPUT=true.
 ### Recommended extensions
 
 1. [Vitest Test Explorer](https://marketplace.visualstudio.com/items?itemName=vitest.explorer): Run tests from the IDE.
-2. [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode): Automatically keep code formatted correctly on save.
+2. [Prettier](https://marketplace.visualstudio.com/items?itemName=prettier.prettier-vscode): Automatically keep code formatted correctly on save.
 3. [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint): Show eslint errors in warnings in UI.
 4. [Code Spell Checker](https://marketplace.visualstudio.com/items?itemName=streetsidesoftware.code-spell-checker): Show spell check errors in document.
 
diff --git a/package.json b/package.json
index 4bfb5527cea..17bbc72f60f 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "prettier": "~3.7.4",
     "prettier-plugin-astro": "^0.14.1",
     "prettier-plugin-organize-imports": "~4.3.0",
-    "prettier-plugin-sh": "^0.17.4",
+    "prettier-plugin-sh": "^0.18.0",
     "rimraf": "~6.1.2",
     "syncpack": "^13.0.3",
     "tsx": "^4.21.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8af70bccd41..e9e1ecd2f89 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -85,8 +85,8 @@ importers:
         specifier: ~4.3.0
         version: 4.3.0(prettier@3.7.4)(typescript@5.9.3)
       prettier-plugin-sh:
-        specifier: ^0.17.4
-        version: 0.17.4(prettier@3.7.4)
+        specifier: ^0.18.0
+        version: 0.18.0(prettier@3.7.4)
       rimraf:
         specifier: ~6.1.2
         version: 6.1.2
@@ -11273,11 +11273,11 @@ packages:
       vue-tsc:
         optional: true
 
-  prettier-plugin-sh@0.17.4:
-    resolution: {integrity: sha512-aAVKXZ7GTEMZdZsIPSwMwddwPvt2ibMbRGd4OJAP0G7QoeYZV+mPNg2Oln3R53sZ4PVjeAA7Xzi/PuI0QlHHfQ==}
+  prettier-plugin-sh@0.18.0:
+    resolution: {integrity: sha512-cW1XL27FOJQ/qGHOW6IHwdCiNWQsAgK+feA8V6+xUTaH0cD3Mh+tFAtBvEEWvuY6hTDzRV943Fzeii+qMOh7nQ==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
-      prettier: ^3.0.3
+      prettier: ^3.6.0
 
   prettier@3.7.4:
     resolution: {integrity: sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==}
@@ -25241,7 +25241,7 @@ snapshots:
       prettier: 3.7.4
       typescript: 5.9.3
 
-  prettier-plugin-sh@0.17.4(prettier@3.7.4):
+  prettier-plugin-sh@0.18.0(prettier@3.7.4):
     dependencies:
       '@reteps/dockerfmt': 0.3.6
       prettier: 3.7.4