diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 0d3a564f3798fe..7de88dd3bc868c 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -23,23 +23,23 @@
     "remoteUser": "vscode",
     // Add the IDs of extensions you want installed when the container is created in the array below.
     "extensions": [
-        "ms-azuretools.vscode-docker",
-        "xaver.clang-format",
-        "github.vscode-pull-request-github",
-        "maelvalais.autoconf",
-        "yzhang.markdown-all-in-one",
-        "eamodio.gitlens",
-        "yuichinukiyama.vscode-preview-server",
         "aaron-bond.better-comments",
-        "foxundermoon.shell-format",
+        "christian-kohler.path-intellisense",
+        "eamodio.gitlens",
         "editorconfig.editorconfig",
         "esbenp.prettier-vscode",
-        "redhat.vscode-yaml",
-        "christian-kohler.path-intellisense",
+        "foxundermoon.shell-format",
+        "github.vscode-pull-request-github",
         "knisterpeter.vscode-github",
-        "npclaudiu.vscode-gn",
+        "maelvalais.autoconf",
         "marus25.cortex-debug",
-        "msedge-dev.gnls"
+        "ms-azuretools.vscode-docker",
+        "msedge-dev.gnls",
+        "npclaudiu.vscode-gn",
+        "redhat.vscode-yaml",
+        "xaver.clang-format",
+        "yuichinukiyama.vscode-preview-server",
+        "yzhang.markdown-all-in-one"
     ],
     // Use 'settings' to set *default* container specific settings.json values on container create.
     // You can edit these settings after create using File > Preferences > Settings > Remote.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index d92e0983873689..91adec5ed52ac8 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -3,7 +3,25 @@
     // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
 
     // List of extensions which should be recommended for users of this workspace.
-    "recommendations": ["marus25.cortex-debug"],
+    "recommendations": [
+        "aaron-bond.better-comments",
+        "christian-kohler.path-intellisense",
+        "eamodio.gitlens",
+        "editorconfig.editorconfig",
+        "esbenp.prettier-vscode",
+        "foxundermoon.shell-format",
+        "github.vscode-pull-request-github",
+        "knisterpeter.vscode-github",
+        "maelvalais.autoconf",
+        "marus25.cortex-debug",
+        "ms-azuretools.vscode-docker",
+        "msedge-dev.gnls",
+        "npclaudiu.vscode-gn",
+        "redhat.vscode-yaml",
+        "xaver.clang-format",
+        "yuichinukiyama.vscode-preview-server",
+        "yzhang.markdown-all-in-one"
+    ],
     // List of extensions recommended by VS Code that should not be recommended for users of this workspace.
     "unwantedRecommendations": []
 }