diff --git a/templates/common/.devcontainer/Dockerfile b/templates/common/.devcontainer/Dockerfile
index ab5b44be816..9d7e7dc8f13 100644
--- a/templates/common/.devcontainer/Dockerfile
+++ b/templates/common/.devcontainer/Dockerfile
@@ -1,8 +1,6 @@
 ARG VARIANT=bullseye
 FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT}
-WORKDIR /extensions
 RUN curl -fsSL https://aka.ms/install-azd.sh | bash \
-    && curl -fsSLo azure-dev.vsix https://aka.ms/azure-dev/vsix \
     && curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > microsoft.gpg \
     && mv microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg \
     && sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/debian/$(lsb_release -rs | cut -d'.' -f 1)/prod $(lsb_release -cs) main" > /etc/apt/sources.list.d/dotnetdev.list' \
diff --git a/templates/common/.devcontainer/devcontainer.json b/templates/common/.devcontainer/devcontainer.json
index c0ab1aeb145..af8f08be3b7 100644
--- a/templates/common/.devcontainer/devcontainer.json
+++ b/templates/common/.devcontainer/devcontainer.json
@@ -8,7 +8,7 @@
     },
     "features": {
         "github-cli": "2",
-        "azure-cli": "2.36",
+        "azure-cli": "2.38",
         "python": "os-provided",
         "dotnet": "6.0",
         "docker-from-docker": "20.10",
@@ -18,17 +18,17 @@
         }
     },
     "extensions": [
-        "/extensions/azure-dev.vsix",
-        "dbaeumer.vscode-eslint",
+        "ms-azuretools.azure-dev",
         "ms-azuretools.vscode-bicep",
-        "eg2.vscode-npm-script",
         "ms-azuretools.vscode-docker",
+        "ms-azuretools.vscode-azurefunctions",
         "ms-vscode.vscode-node-azure-pack",
         "ms-vscode.js-debug",
-        "ms-azuretools.vscode-azurefunctions",
         "ms-dotnettools.csharp",
+        "ms-dotnettools.vscode-dotnet-runtime",
         "esbenp.prettier-vscode",
-        "ms-dotnettools.vscode-dotnet-runtime"
+        "eg2.vscode-npm-script",
+        "dbaeumer.vscode-eslint"
     ],
     "forwardPorts": [
         3000,
diff --git a/templates/todo/projects/csharp-cosmos-sql/README.md b/templates/todo/projects/csharp-cosmos-sql/README.md
index 34636df53f9..275d7193317 100644
--- a/templates/todo/projects/csharp-cosmos-sql/README.md
+++ b/templates/todo/projects/csharp-cosmos-sql/README.md
@@ -98,12 +98,16 @@ The Azure Developer experience includes an Azure Developer CLI VS Code Extension
 
 Here's how to install it:
 
-1. Download the extension from https://aka.ms/azure-dev/vsix
-1. In VS Code:
-    - Open "Extensions" (Ctrl+Shift+X)
-    - Click the ... menu at top of Extensions sidebar
-    - Click "Install from VSIX"
-    - Select location of downloaded file
+#### VS Code
+
+1. Click on the "Extensions" tab in VS Code
+1. Search for "Azure Developer CLI" - authored by Microsoft
+1. Click "Install"
+
+#### Marketplace
+
+1. Go to the [Azure Developer CLI - VS Code Extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.azure-dev) page
+1. Click "Install"
 
 Once the extension is installed, you can press `F1`, and type "Azure Developer CLI" to see all of your available options. You can also right click on your project's `azure.yaml` file for a list of commands.
 
diff --git a/templates/todo/projects/nodejs-mongo-aca/README.md b/templates/todo/projects/nodejs-mongo-aca/README.md
index 41489cae017..82f79aae1b7 100644
--- a/templates/todo/projects/nodejs-mongo-aca/README.md
+++ b/templates/todo/projects/nodejs-mongo-aca/README.md
@@ -98,12 +98,16 @@ The Azure Developer experience includes an Azure Developer CLI VS Code Extension
 
 Here's how to install it:
 
-1. Download the extension from https://aka.ms/azure-dev/vsix
-1. In VS Code:
-    - Open "Extensions" (Ctrl+Shift+X)
-    - Click the ... menu at top of Extensions sidebar
-    - Click "Install from VSIX"
-    - Select location of downloaded file
+#### VS Code
+
+1. Click on the "Extensions" tab in VS Code
+1. Search for "Azure Developer CLI" - authored by Microsoft
+1. Click "Install"
+
+#### Marketplace
+
+1. Go to the [Azure Developer CLI - VS Code Extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.azure-dev) page
+1. Click "Install"
 
 Once the extension is installed, you can press `F1`, and type "Azure Developer CLI" to see all of your available options. You can also right click on your project's `azure.yaml` file for a list of commands.
 
diff --git a/templates/todo/projects/nodejs-mongo-swa-func/README.md b/templates/todo/projects/nodejs-mongo-swa-func/README.md
index 8fe745e3810..ec72abc24bc 100644
--- a/templates/todo/projects/nodejs-mongo-swa-func/README.md
+++ b/templates/todo/projects/nodejs-mongo-swa-func/README.md
@@ -99,12 +99,16 @@ The Azure Developer experience includes an Azure Developer CLI VS Code Extension
 
 Here's how to install it:
 
-1. Download the extension from https://aka.ms/azure-dev/vsix
-1. In VS Code:
-    - Open "Extensions" (Ctrl+Shift+X)
-    - Click the ... menu at top of Extensions sidebar
-    - Click "Install from VSIX"
-    - Select location of downloaded file
+#### VS Code
+
+1. Click on the "Extensions" tab in VS Code
+1. Search for "Azure Developer CLI" - authored by Microsoft
+1. Click "Install"
+
+#### Marketplace
+
+1. Go to the [Azure Developer CLI - VS Code Extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.azure-dev) page
+1. Click "Install"
 
 Once the extension is installed, you can press `F1`, and type "Azure Developer CLI" to see all of your available options. You can also right click on your project's `azure.yaml` file for a list of commands.
 
diff --git a/templates/todo/projects/nodejs-mongo/README.md b/templates/todo/projects/nodejs-mongo/README.md
index 5a0099508fd..e47b1760f53 100644
--- a/templates/todo/projects/nodejs-mongo/README.md
+++ b/templates/todo/projects/nodejs-mongo/README.md
@@ -97,12 +97,16 @@ The Azure Developer experience includes an Azure Developer CLI VS Code Extension
 
 Here's how to install it:
 
-1. Download the extension from https://aka.ms/azure-dev/vsix
-1. In VS Code:
-    - Open "Extensions" (Ctrl+Shift+X)
-    - Click the ... menu at top of Extensions sidebar
-    - Click "Install from VSIX"
-    - Select location of downloaded file
+#### VS Code
+
+1. Click on the "Extensions" tab in VS Code
+1. Search for "Azure Developer CLI" - authored by Microsoft
+1. Click "Install"
+
+#### Marketplace
+
+1. Go to the [Azure Developer CLI - VS Code Extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.azure-dev) page
+1. Click "Install"
 
 Once the extension is installed, you can press `F1`, and type "Azure Developer CLI" to see all of your available options. You can also right click on your project's `azure.yaml` file for a list of commands.
 
diff --git a/templates/todo/projects/python-mongo-aca/README.md b/templates/todo/projects/python-mongo-aca/README.md
index 5fb5eec929f..1a08a16654c 100644
--- a/templates/todo/projects/python-mongo-aca/README.md
+++ b/templates/todo/projects/python-mongo-aca/README.md
@@ -100,12 +100,16 @@ The Azure Developer experience includes an Azure Developer CLI VS Code Extension
 
 Here's how to install it:
 
-1. Download the extension from https://aka.ms/azure-dev/vsix
-1. In VS Code:
-    - Open "Extensions" (Ctrl+Shift+X)
-    - Click the ... menu at top of Extensions sidebar
-    - Click "Install from VSIX"
-    - Select location of downloaded file
+#### VS Code
+
+1. Click on the "Extensions" tab in VS Code
+1. Search for "Azure Developer CLI" - authored by Microsoft
+1. Click "Install"
+
+#### Marketplace
+
+1. Go to the [Azure Developer CLI - VS Code Extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.azure-dev) page
+1. Click "Install"
 
 Once the extension is installed, you can press `F1`, and type "Azure Developer CLI" to see all of your available options. You can also right click on your project's `azure.yaml` file for a list of commands.
 
diff --git a/templates/todo/projects/python-mongo-swa-func/README.md b/templates/todo/projects/python-mongo-swa-func/README.md
index a084c15554e..cdb974ff708 100644
--- a/templates/todo/projects/python-mongo-swa-func/README.md
+++ b/templates/todo/projects/python-mongo-swa-func/README.md
@@ -100,12 +100,16 @@ The Azure Developer experience includes an Azure Developer CLI VS Code Extension
 
 Here's how to install it:
 
-1. Download the extension from https://aka.ms/azure-dev/vsix
-1. In VS Code:
-    - Open "Extensions" (Ctrl+Shift+X)
-    - Click the ... menu at top of Extensions sidebar
-    - Click "Install from VSIX"
-    - Select location of downloaded file
+#### VS Code
+
+1. Click on the "Extensions" tab in VS Code
+1. Search for "Azure Developer CLI" - authored by Microsoft
+1. Click "Install"
+
+#### Marketplace
+
+1. Go to the [Azure Developer CLI - VS Code Extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.azure-dev) page
+1. Click "Install"
 
 Once the extension is installed, you can press `F1`, and type "Azure Developer CLI" to see all of your available options. You can also right click on your project's `azure.yaml` file for a list of commands.
 
diff --git a/templates/todo/projects/python-mongo/README.md b/templates/todo/projects/python-mongo/README.md
index 9aafb80a8b3..41e2402cae5 100644
--- a/templates/todo/projects/python-mongo/README.md
+++ b/templates/todo/projects/python-mongo/README.md
@@ -99,12 +99,16 @@ The Azure Developer experience includes an Azure Developer CLI VS Code Extension
 
 Here's how to install it:
 
-1. Download the extension from https://aka.ms/azure-dev/vsix
-1. In VS Code:
-    - Open "Extensions" (Ctrl+Shift+X)
-    - Click the ... menu at top of Extensions sidebar
-    - Click "Install from VSIX"
-    - Select location of downloaded file
+#### VS Code
+
+1. Click on the "Extensions" tab in VS Code
+1. Search for "Azure Developer CLI" - authored by Microsoft
+1. Click "Install"
+
+#### Marketplace
+
+1. Go to the [Azure Developer CLI - VS Code Extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.azure-dev) page
+1. Click "Install"
 
 Once the extension is installed, you can press `F1`, and type "Azure Developer CLI" to see all of your available options. You can also right click on your project's `azure.yaml` file for a list of commands.