diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index e8fdc8e1f6c..992d0572661 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -11,10 +11,11 @@
         }
       },
       "extensions": [
-        "msazurermtools.azurerm-vscode-tools",
-        "ms-dotnettools.csharp",
+        "ms-dotnettools.vscode-dotnet-runtime",
+        "ms-dotnettools.csdevkit",
         "ms-vscode.powershell",
         "ms-azuretools.vscode-bicep",
+        "msazurermtools.azurerm-vscode-tools",
         "GitHub.vscode-pull-request-github",
         "github.vscode-github-actions",
         "bewhite.psrule-vscode-preview",
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 0d51c2ddc79..5316766e1be 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,6 +1,6 @@
 {
   "recommendations": [
-    "ms-dotnettools.csharp",
+    "ms-dotnettools.csdevkit",
     "ms-vscode.powershell",
     "davidanson.vscode-markdownlint",
     "streetsidesoftware.code-spell-checker",