diff --git a/ext/devcontainer/src/azd/README.md b/ext/devcontainer/src/azd/README.md
index 37327085f28..2369b507515 100644
--- a/ext/devcontainer/src/azd/README.md
+++ b/ext/devcontainer/src/azd/README.md
@@ -2,16 +2,26 @@
 
 Installs the [Azure Developer CLI](https://github.com/Azure/azure-dev) along with needed dependencies.
 
-## Example Usage
+## Example Usage - Install latest `azd` version
 
 ```json
 "features": {
-    "ghcr.io/azure/azure-dev/azd:1": {
-        "version": "stable"
-    }
+    "ghcr.io/azure/azure-dev/azd:latest": {}
 }
 ```
 
+## Example Usage - Install a specific `azd` version
+
+Select a specific `azd` version [here](https://github.com/Azure/azure-dev/releases) and use it in `version`.
+
+```json
+"features": {
+    "ghcr.io/azure/azure-dev/azd:latest": {
+        "version": "<version-number>"
+    }
+},
+```
+
 ## Options
 
 | Options Id | Description | Type | Default Value |
diff --git a/templates/common/.devcontainer/Dockerfile/base/Dockerfile b/templates/common/.devcontainer/Dockerfile/base/Dockerfile
deleted file mode 100644
index a2cf933cc6c..00000000000
--- a/templates/common/.devcontainer/Dockerfile/base/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-ARG IMAGE=bullseye
-FROM --platform=amd64 mcr.microsoft.com/devcontainers/${IMAGE}
-RUN export DEBIAN_FRONTEND=noninteractive \
-     && apt-get update && apt-get install -y xdg-utils \
-     && apt-get clean -y && rm -rf /var/lib/apt/lists/*
-RUN curl -fsSL https://aka.ms/install-azd.sh | bash
diff --git a/templates/common/.devcontainer/Dockerfile/func/Dockerfile b/templates/common/.devcontainer/Dockerfile/func/Dockerfile
index 9c301651504..61193c853d1 100644
--- a/templates/common/.devcontainer/Dockerfile/func/Dockerfile
+++ b/templates/common/.devcontainer/Dockerfile/func/Dockerfile
@@ -3,7 +3,5 @@ FROM --platform=amd64 mcr.microsoft.com/devcontainers/${IMAGE}
 RUN 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' \
-    && apt-get update && apt-get install -y xdg-utils \
     && apt-get update && apt-get install -y azure-functions-core-tools-4 \
     && apt-get clean -y && rm -rf /var/lib/apt/lists/*
-RUN curl -fsSL https://aka.ms/install-azd.sh | bash
diff --git a/templates/common/.devcontainer/Dockerfile/java/Dockerfile b/templates/common/.devcontainer/Dockerfile/java/Dockerfile
index 7eb113acf9d..79d8f429163 100644
--- a/templates/common/.devcontainer/Dockerfile/java/Dockerfile
+++ b/templates/common/.devcontainer/Dockerfile/java/Dockerfile
@@ -1,7 +1,5 @@
 ARG IMAGE=bullseye
 FROM --platform=amd64 mcr.microsoft.com/devcontainers/${IMAGE}
 RUN export DEBIAN_FRONTEND=noninteractive \
-     && apt-get update && apt-get install -y xdg-utils \
      && apt-get update && apt-get install --yes --no-install-recommends postgresql-client \
      && apt-get clean -y && rm -rf /var/lib/apt/lists/*
-RUN curl -fsSL https://aka.ms/install-azd.sh | bash
diff --git a/templates/common/.devcontainer/devcontainer.json/aks/nodejs/devcontainer.json b/templates/common/.devcontainer/devcontainer.json/aks/nodejs/devcontainer.json
index 9555254926b..29edfdac013 100644
--- a/templates/common/.devcontainer/devcontainer.json/aks/nodejs/devcontainer.json
+++ b/templates/common/.devcontainer/devcontainer.json/aks/nodejs/devcontainer.json
@@ -1,11 +1,6 @@
 {
     "name": "Azure Developer CLI",
-    "build": {
-        "dockerfile": "Dockerfile",
-        "args": {
-            "IMAGE": "javascript-node:16-bullseye"
-        }
-    },
+    "image": "mcr.microsoft.com/devcontainers/javascript-node:16-bullseye",
     "features": {
         "ghcr.io/devcontainers/features/docker-in-docker:2": {
         },
@@ -13,7 +8,8 @@
             "version": "latest",
             "helm": "latest",
             "minikube": "none"
-        }
+        },
+        "ghcr.io/azure/azure-dev/azd:latest": {}
     },
     "customizations": {
         "vscode": {
diff --git a/templates/common/.devcontainer/devcontainer.json/bicep-starter/devcontainer.json b/templates/common/.devcontainer/devcontainer.json/bicep-starter/devcontainer.json
index e5e4717247b..575f26e5c07 100644
--- a/templates/common/.devcontainer/devcontainer.json/bicep-starter/devcontainer.json
+++ b/templates/common/.devcontainer/devcontainer.json/bicep-starter/devcontainer.json
@@ -1,16 +1,11 @@
 {
     "name": "Azure Developer CLI",
-    "build": {
-        "dockerfile": "Dockerfile",
-        "args": {
-            // List of images: https://github.com/devcontainers/images/tree/main/src
-            "IMAGE": "python:3.10-bullseye"
-        }
-    },
+    "image": "mcr.microsoft.com/devcontainers/python:3.10-bullseye",
     "features": {
         // See https://containers.dev/features for list of features
         "ghcr.io/devcontainers/features/docker-in-docker:2": {
-        }
+        },
+        "ghcr.io/azure/azure-dev/azd:latest": {}
     },
     "customizations": {
         "vscode": {
diff --git a/templates/common/.devcontainer/devcontainer.json/csharp/devcontainer.json b/templates/common/.devcontainer/devcontainer.json/csharp/devcontainer.json
index 6f9d6e6d0bb..960ae653ca0 100644
--- a/templates/common/.devcontainer/devcontainer.json/csharp/devcontainer.json
+++ b/templates/common/.devcontainer/devcontainer.json/csharp/devcontainer.json
@@ -1,18 +1,14 @@
 {
     "name": "Azure Developer CLI",
-    "build": {
-        "dockerfile": "Dockerfile",
-        "args": {
-            "IMAGE": "dotnet:6.0-bullseye"
-        }
-    },
+    "image": "mcr.microsoft.com/devcontainers/dotnet:6.0-bullseye",
     "features": {
         "ghcr.io/devcontainers/features/docker-in-docker:2": {
         },
         "ghcr.io/devcontainers/features/node:1": {
             "version": "16",
             "nodeGypDependencies": false
-        }
+        },
+        "ghcr.io/azure/azure-dev/azd:latest": {}
     },
     "customizations": {
         "vscode": {
diff --git a/templates/common/.devcontainer/devcontainer.json/csharp/func/devcontainer.json b/templates/common/.devcontainer/devcontainer.json/csharp/func/devcontainer.json
new file mode 100644
index 00000000000..0fa542bbcdf
--- /dev/null
+++ b/templates/common/.devcontainer/devcontainer.json/csharp/func/devcontainer.json
@@ -0,0 +1,41 @@
+{
+    "name": "Azure Developer CLI",
+    "build": {
+        "dockerfile": "Dockerfile",
+        "args": {
+            "IMAGE": "dotnet:6.0-bullseye"
+        }
+    },
+    "features": {
+        "ghcr.io/devcontainers/features/docker-in-docker:2": {
+        },
+        "ghcr.io/devcontainers/features/node:1": {
+            "version": "16",
+            "nodeGypDependencies": false
+        },
+        "ghcr.io/azure/azure-dev/azd:latest": {}
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "GitHub.vscode-github-actions",
+                "ms-azuretools.azure-dev",
+                "ms-azuretools.vscode-azurefunctions",
+                "ms-azuretools.vscode-bicep",
+                "ms-azuretools.vscode-docker",
+                "ms-dotnettools.csharp",
+                "ms-dotnettools.vscode-dotnet-runtime",
+                "ms-vscode.vscode-node-azure-pack"
+            ]
+        }
+    },
+    "forwardPorts": [
+        3000,
+        3100
+    ],
+    "postCreateCommand": "",
+    "remoteUser": "vscode",
+    "hostRequirements": {
+        "memory": "8gb"
+    }
+}
\ No newline at end of file
diff --git a/templates/common/.devcontainer/devcontainer.json/java/devcontainer.json b/templates/common/.devcontainer/devcontainer.json/java/devcontainer.json
index 697392d20f5..21b3e499f75 100644
--- a/templates/common/.devcontainer/devcontainer.json/java/devcontainer.json
+++ b/templates/common/.devcontainer/devcontainer.json/java/devcontainer.json
@@ -1,15 +1,11 @@
 {
     "name": "Azure Developer CLI",
-    "build": {
-        "dockerfile": "Dockerfile",
-        "args": {
-            "IMAGE": "javascript-node:16-bullseye"
-        }
-    },
+    "image": "mcr.microsoft.com/devcontainers/javascript-node:16-bullseye",
     "features": {
         "ghcr.io/devcontainers/features/docker-in-docker:2": {
         },
-        "ghcr.io/devcontainers/features/java:1": {}
+        "ghcr.io/devcontainers/features/java:1": {},
+        "ghcr.io/azure/azure-dev/azd:latest": {}
     },
     "customizations": {
         "vscode": {
diff --git a/templates/common/.devcontainer/devcontainer.json/java/terraform/devcontainer.json b/templates/common/.devcontainer/devcontainer.json/java/terraform/devcontainer.json
index 872cb1f2635..3ec6d2ba6d0 100644
--- a/templates/common/.devcontainer/devcontainer.json/java/terraform/devcontainer.json
+++ b/templates/common/.devcontainer/devcontainer.json/java/terraform/devcontainer.json
@@ -14,7 +14,8 @@
         "ghcr.io/devcontainers/features/terraform:1": {
             "version": "latest"
         },
-        "ghcr.io/devcontainers/features/java:1": {}
+        "ghcr.io/devcontainers/features/java:1": {},
+        "ghcr.io/azure/azure-dev/azd:latest": {}
     },
     "customizations": {
         "vscode": {
diff --git a/templates/common/.devcontainer/devcontainer.json/nodejs/devcontainer.json b/templates/common/.devcontainer/devcontainer.json/nodejs/devcontainer.json
index 8e26bffc34c..8136fda69bb 100644
--- a/templates/common/.devcontainer/devcontainer.json/nodejs/devcontainer.json
+++ b/templates/common/.devcontainer/devcontainer.json/nodejs/devcontainer.json
@@ -1,14 +1,10 @@
 {
     "name": "Azure Developer CLI",
-    "build": {
-        "dockerfile": "Dockerfile",
-        "args": {
-            "IMAGE": "javascript-node:16-bullseye"
-        }
-    },
+    "image": "mcr.microsoft.com/devcontainers/javascript-node:16-bullseye",
     "features": {
         "ghcr.io/devcontainers/features/docker-in-docker:2": {
-        }
+        },
+        "ghcr.io/azure/azure-dev/azd:latest": {}
     },
     "customizations": {
         "vscode": {
diff --git a/templates/common/.devcontainer/devcontainer.json/nodejs/func/devcontainer.json b/templates/common/.devcontainer/devcontainer.json/nodejs/func/devcontainer.json
new file mode 100644
index 00000000000..f9c646f84d6
--- /dev/null
+++ b/templates/common/.devcontainer/devcontainer.json/nodejs/func/devcontainer.json
@@ -0,0 +1,38 @@
+{
+    "name": "Azure Developer CLI",
+    "build": {
+        "dockerfile": "Dockerfile",
+        "args": {
+            "IMAGE": "javascript-node:16-bullseye"
+        }
+    },
+    "features": {
+        "ghcr.io/devcontainers/features/docker-in-docker:2": {
+        },
+        "ghcr.io/azure/azure-dev/azd:latest": {}
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "dbaeumer.vscode-eslint",
+                "esbenp.prettier-vscode",
+                "GitHub.vscode-github-actions",
+                "ms-azuretools.azure-dev",
+                "ms-azuretools.vscode-azurefunctions",
+                "ms-azuretools.vscode-bicep",
+                "ms-azuretools.vscode-docker",
+                "ms-vscode.js-debug",
+                "ms-vscode.vscode-node-azure-pack"
+            ]
+        }
+    },
+    "forwardPorts": [
+        3000,
+        3100
+    ],
+    "postCreateCommand": "",
+    "remoteUser": "node",
+    "hostRequirements": {
+        "memory": "8gb"
+    }
+}
\ No newline at end of file
diff --git a/templates/common/.devcontainer/devcontainer.json/nodejs/terraform/devcontainer.json b/templates/common/.devcontainer/devcontainer.json/nodejs/terraform/devcontainer.json
index 64fca29094c..2f659399234 100644
--- a/templates/common/.devcontainer/devcontainer.json/nodejs/terraform/devcontainer.json
+++ b/templates/common/.devcontainer/devcontainer.json/nodejs/terraform/devcontainer.json
@@ -1,11 +1,6 @@
 {
     "name": "Azure Developer CLI",
-    "build": {
-        "dockerfile": "Dockerfile",
-        "args": {
-            "IMAGE": "javascript-node:16-bullseye"
-        }
-    },
+    "image": "mcr.microsoft.com/devcontainers/javascript-node:16-bullseye",
     "features": {
         "ghcr.io/devcontainers/features/azure-cli:1": {
         },
@@ -13,7 +8,8 @@
         },
         "ghcr.io/devcontainers/features/terraform:1": {
             "version": "latest"
-        }
+        },
+        "ghcr.io/azure/azure-dev/azd:latest": {}
     },
     "customizations": {
         "vscode": {
diff --git a/templates/common/.devcontainer/devcontainer.json/python/devcontainer.json b/templates/common/.devcontainer/devcontainer.json/python/devcontainer.json
index 688c3b51c73..780a635dfa2 100644
--- a/templates/common/.devcontainer/devcontainer.json/python/devcontainer.json
+++ b/templates/common/.devcontainer/devcontainer.json/python/devcontainer.json
@@ -1,18 +1,14 @@
 {
     "name": "Azure Developer CLI",
-    "build": {
-        "dockerfile": "Dockerfile",
-        "args": {
-            "IMAGE": "python:3.10-bullseye"
-        }
-    },
+    "image": "mcr.microsoft.com/devcontainers/python:3.10-bullseye",
     "features": {
         "ghcr.io/devcontainers/features/docker-in-docker:2": {
         },
         "ghcr.io/devcontainers/features/node:1": {
             "version": "16",
             "nodeGypDependencies": false
-        }
+        },
+        "ghcr.io/azure/azure-dev/azd:latest": {}
     },
     "customizations": {
         "vscode": {
diff --git a/templates/common/.devcontainer/devcontainer.json/python/func/devcontainer.json b/templates/common/.devcontainer/devcontainer.json/python/func/devcontainer.json
new file mode 100644
index 00000000000..a2f59d686b4
--- /dev/null
+++ b/templates/common/.devcontainer/devcontainer.json/python/func/devcontainer.json
@@ -0,0 +1,40 @@
+{
+    "name": "Azure Developer CLI",
+    "build": {
+        "dockerfile": "Dockerfile",
+        "args": {
+            "IMAGE": "python:3.10-bullseye"
+        }
+    },
+    "features": {
+        "ghcr.io/devcontainers/features/docker-in-docker:2": {
+        },
+        "ghcr.io/devcontainers/features/node:1": {
+            "version": "16",
+            "nodeGypDependencies": false
+        },
+        "ghcr.io/azure/azure-dev/azd:latest": {}
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "GitHub.vscode-github-actions",
+                "ms-azuretools.azure-dev",
+                "ms-azuretools.vscode-azurefunctions",
+                "ms-azuretools.vscode-bicep",
+                "ms-azuretools.vscode-docker",
+                "ms-python.python",
+                "ms-vscode.vscode-node-azure-pack"
+            ]
+        }
+    },
+    "forwardPorts": [
+        3000,
+        3100
+    ],
+    "postCreateCommand": "",
+    "remoteUser": "vscode",
+    "hostRequirements": {
+        "memory": "8gb"
+    }
+}
\ No newline at end of file
diff --git a/templates/common/.devcontainer/devcontainer.json/python/terraform/devcontainer.json b/templates/common/.devcontainer/devcontainer.json/python/terraform/devcontainer.json
index 9edcf2e1239..cb064c6cc8c 100644
--- a/templates/common/.devcontainer/devcontainer.json/python/terraform/devcontainer.json
+++ b/templates/common/.devcontainer/devcontainer.json/python/terraform/devcontainer.json
@@ -1,11 +1,6 @@
 {
     "name": "Azure Developer CLI",
-    "build": {
-        "dockerfile": "Dockerfile",
-        "args": {
-            "IMAGE": "python:3.10-bullseye"
-        }
-    },
+    "image": "mcr.microsoft.com/devcontainers/python:3.10-bullseye",
     "features": {
         "ghcr.io/devcontainers/features/azure-cli:1": {
         },
@@ -17,7 +12,8 @@
         },
         "ghcr.io/devcontainers/features/terraform:1": {
             "version": "latest"
-        }
+        },
+        "ghcr.io/azure/azure-dev/azd:latest": {}
     },
     "customizations": {
         "vscode": {
diff --git a/templates/common/.devcontainer/devcontainer.json/terraform-starter/devcontainer.json b/templates/common/.devcontainer/devcontainer.json/terraform-starter/devcontainer.json
index d654200a1f9..58c3d2bd407 100644
--- a/templates/common/.devcontainer/devcontainer.json/terraform-starter/devcontainer.json
+++ b/templates/common/.devcontainer/devcontainer.json/terraform-starter/devcontainer.json
@@ -1,12 +1,6 @@
 {
     "name": "Azure Developer CLI",
-    "build": {
-        "dockerfile": "Dockerfile",
-        "args": {
-            // List of images: https://github.com/devcontainers/images/tree/main/src
-            "IMAGE": "python:3.10-bullseye"
-        }
-    },
+    "image": "mcr.microsoft.com/devcontainers/python:3.10-bullseye",
     "features": {
         // terraform and az (required for auth) are installed by default
         // See https://containers.dev/features for list of features
@@ -16,7 +10,8 @@
         },
         "ghcr.io/devcontainers/features/terraform:1": {
             "version": "latest"
-        }
+        },
+        "ghcr.io/azure/azure-dev/azd:latest": {}
     },
     "customizations": {
         "vscode": {
diff --git a/templates/starter/bicep/repo.yaml b/templates/starter/bicep/repo.yaml
index a93624c4be5..d2e2f9aa6f8 100644
--- a/templates/starter/bicep/repo.yaml
+++ b/templates/starter/bicep/repo.yaml
@@ -42,7 +42,3 @@ repo:
     - from: ../../common/.devcontainer/devcontainer.json/bicep-starter/devcontainer.json
       to: ./.devcontainer/devcontainer.json
 
-    # .devcontainer common (Dockerfile)
-    - from: ../../common/.devcontainer/Dockerfile/base
-      to: ./.devcontainer
-
diff --git a/templates/starter/terraform/repo.yaml b/templates/starter/terraform/repo.yaml
index 1dc6dbb83fa..ebac96a700a 100644
--- a/templates/starter/terraform/repo.yaml
+++ b/templates/starter/terraform/repo.yaml
@@ -31,7 +31,3 @@ repo:
     - from: ../../common/.devcontainer/devcontainer.json/terraform-starter/devcontainer.json
       to: ./.devcontainer/devcontainer.json
 
-    # .devcontainer common (Dockerfile)
-    - from: ../../common/.devcontainer/Dockerfile/base
-      to: ./.devcontainer
-
diff --git a/templates/todo/projects/csharp-cosmos-sql/.repo/bicep/repo.yaml b/templates/todo/projects/csharp-cosmos-sql/.repo/bicep/repo.yaml
index 4907b40a0de..252cf73f14f 100644
--- a/templates/todo/projects/csharp-cosmos-sql/.repo/bicep/repo.yaml
+++ b/templates/todo/projects/csharp-cosmos-sql/.repo/bicep/repo.yaml
@@ -149,10 +149,6 @@ repo:
     - from: ../../../../../common/.devcontainer/devcontainer.json/csharp
       to: ./.devcontainer
 
-    # .devcontainer common (Dockerfile)
-    - from: ../../../../../common/.devcontainer/Dockerfile/base
-      to: ./.devcontainer
-
     # Assets common
     - from: ../../../../common/assets
       to: ./assets
diff --git a/templates/todo/projects/csharp-sql-swa-func/.repo/bicep/repo.yaml b/templates/todo/projects/csharp-sql-swa-func/.repo/bicep/repo.yaml
index 05d59825583..ed5adebaede 100644
--- a/templates/todo/projects/csharp-sql-swa-func/.repo/bicep/repo.yaml
+++ b/templates/todo/projects/csharp-sql-swa-func/.repo/bicep/repo.yaml
@@ -146,7 +146,7 @@ repo:
       to: ./infra
 
     # .devcontainer common (devcontainer.json)
-    - from: ../../../../../common/.devcontainer/devcontainer.json/csharp
+    - from: ../../../../../common/.devcontainer/devcontainer.json/csharp/func
       to: ./.devcontainer
 
     # .devcontainer common (Dockerfile)
diff --git a/templates/todo/projects/csharp-sql/.repo/bicep/repo.yaml b/templates/todo/projects/csharp-sql/.repo/bicep/repo.yaml
index 17de527a8c4..71e74ba585f 100644
--- a/templates/todo/projects/csharp-sql/.repo/bicep/repo.yaml
+++ b/templates/todo/projects/csharp-sql/.repo/bicep/repo.yaml
@@ -150,10 +150,6 @@ repo:
     - from: ../../../../../common/.devcontainer/devcontainer.json/csharp
       to: ./.devcontainer
 
-    # .devcontainer common (Dockerfile)
-    - from: ../../../../../common/.devcontainer/Dockerfile/base
-      to: ./.devcontainer
-
     # Assets common
     - from: ../../../../common/assets
       to: ./assets
diff --git a/templates/todo/projects/java-mongo-aca/.repo/bicep/repo.yaml b/templates/todo/projects/java-mongo-aca/.repo/bicep/repo.yaml
index 29acafeedd6..cecbcaffa15 100644
--- a/templates/todo/projects/java-mongo-aca/.repo/bicep/repo.yaml
+++ b/templates/todo/projects/java-mongo-aca/.repo/bicep/repo.yaml
@@ -153,10 +153,6 @@ repo:
     - from: ../../../../../common/.devcontainer/devcontainer.json/java
       to: ./.devcontainer
 
-    # .devcontainer common (Dockerfile)
-    - from: ../../../../../common/.devcontainer/Dockerfile/base
-      to: ./.devcontainer
-
     # Assets common
     - from: ../../../../common/assets
       to: ./assets
diff --git a/templates/todo/projects/java-mongo/.repo/bicep/repo.yaml b/templates/todo/projects/java-mongo/.repo/bicep/repo.yaml
index f21430e8efd..cf545e5dd81 100644
--- a/templates/todo/projects/java-mongo/.repo/bicep/repo.yaml
+++ b/templates/todo/projects/java-mongo/.repo/bicep/repo.yaml
@@ -146,10 +146,6 @@ repo:
     - from: ../../../../../common/.devcontainer/devcontainer.json/java
       to: ./.devcontainer
 
-    # .devcontainer common (Dockerfile)
-    - from: ../../../../../common/.devcontainer/Dockerfile/base
-      to: ./.devcontainer
-
     # Assets common
     - from: ../../../../common/assets
       to: ./assets
diff --git a/templates/todo/projects/nodejs-mongo-aca/.repo/bicep/repo.yaml b/templates/todo/projects/nodejs-mongo-aca/.repo/bicep/repo.yaml
index 88fb236eaf2..c23a26c103e 100644
--- a/templates/todo/projects/nodejs-mongo-aca/.repo/bicep/repo.yaml
+++ b/templates/todo/projects/nodejs-mongo-aca/.repo/bicep/repo.yaml
@@ -156,10 +156,6 @@ repo:
     - from: ../../../../../common/.devcontainer/devcontainer.json/nodejs/devcontainer.json
       to: ./.devcontainer/devcontainer.json
 
-    # .devcontainer common (Dockerfile)
-    - from: ../../../../../common/.devcontainer/Dockerfile/base
-      to: ./.devcontainer
-
     # Assets common
     - from: ../../../../common/assets
       to: ./assets
diff --git a/templates/todo/projects/nodejs-mongo-aks/.repo/bicep/repo.yaml b/templates/todo/projects/nodejs-mongo-aks/.repo/bicep/repo.yaml
index 495bfd8e8c9..5097f25078a 100644
--- a/templates/todo/projects/nodejs-mongo-aks/.repo/bicep/repo.yaml
+++ b/templates/todo/projects/nodejs-mongo-aks/.repo/bicep/repo.yaml
@@ -129,10 +129,6 @@ repo:
     - from: ../../../../../common/.devcontainer/devcontainer.json/aks/nodejs/devcontainer.json
       to: ./.devcontainer/devcontainer.json
 
-    # .devcontainer common (Dockerfile)
-    - from: ../../../../../common/.devcontainer/Dockerfile/base
-      to: ./.devcontainer
-
     # Assets common
     - from: ../../../../common/assets
       to: ./assets
diff --git a/templates/todo/projects/nodejs-mongo-swa-func/.repo/bicep/repo.yaml b/templates/todo/projects/nodejs-mongo-swa-func/.repo/bicep/repo.yaml
index 8e0f721ddda..44fea3f5990 100644
--- a/templates/todo/projects/nodejs-mongo-swa-func/.repo/bicep/repo.yaml
+++ b/templates/todo/projects/nodejs-mongo-swa-func/.repo/bicep/repo.yaml
@@ -146,7 +146,7 @@ repo:
       to: ./infra
 
     # .devcontainer common (devcontainer.json)
-    - from: ../../../../../common/.devcontainer/devcontainer.json/nodejs/devcontainer.json
+    - from: ../../../../../common/.devcontainer/devcontainer.json/nodejs/func/devcontainer.json
       to: ./.devcontainer/devcontainer.json
 
     # .devcontainer common (Dockerfile)
diff --git a/templates/todo/projects/nodejs-mongo/.repo/bicep/repo.yaml b/templates/todo/projects/nodejs-mongo/.repo/bicep/repo.yaml
index d3fcb764905..4919ab1fe67 100644
--- a/templates/todo/projects/nodejs-mongo/.repo/bicep/repo.yaml
+++ b/templates/todo/projects/nodejs-mongo/.repo/bicep/repo.yaml
@@ -146,10 +146,6 @@ repo:
     - from: ../../../../../common/.devcontainer/devcontainer.json/nodejs/devcontainer.json
       to: ./.devcontainer/devcontainer.json
 
-    # .devcontainer common (Dockerfile)
-    - from: ../../../../../common/.devcontainer/Dockerfile/base
-      to: ./.devcontainer
-
     # Assets common
     - from: ../../../../common/assets
       to: ./assets
diff --git a/templates/todo/projects/nodejs-mongo/.repo/terraform/repo.yaml b/templates/todo/projects/nodejs-mongo/.repo/terraform/repo.yaml
index b8f1681214e..3b0a19a6274 100644
--- a/templates/todo/projects/nodejs-mongo/.repo/terraform/repo.yaml
+++ b/templates/todo/projects/nodejs-mongo/.repo/terraform/repo.yaml
@@ -140,10 +140,6 @@ repo:
     - from: ../../../../../common/.devcontainer/devcontainer.json/nodejs/terraform
       to: ./.devcontainer
 
-    # .devcontainer common (Dockerfile)
-    - from: ../../../../../common/.devcontainer/Dockerfile/base
-      to: ./.devcontainer
-
     # Assets common
     - from: ../../../../common/assets
       to: ./assets
diff --git a/templates/todo/projects/python-mongo-aca/.repo/bicep/repo.yaml b/templates/todo/projects/python-mongo-aca/.repo/bicep/repo.yaml
index 73ecfa6e64c..0eca56eb17e 100644
--- a/templates/todo/projects/python-mongo-aca/.repo/bicep/repo.yaml
+++ b/templates/todo/projects/python-mongo-aca/.repo/bicep/repo.yaml
@@ -156,10 +156,6 @@ repo:
     - from: ../../../../../common/.devcontainer/devcontainer.json/python/devcontainer.json
       to: ./.devcontainer/devcontainer.json
 
-    # .devcontainer common (Dockerfile)
-    - from: ../../../../../common/.devcontainer/Dockerfile/base
-      to: ./.devcontainer
-
     # Assets common
     - from: ../../../../common/assets
       to: ./assets
diff --git a/templates/todo/projects/python-mongo-swa-func/.repo/bicep/repo.yaml b/templates/todo/projects/python-mongo-swa-func/.repo/bicep/repo.yaml
index fe9f2a136e5..afd55410db1 100644
--- a/templates/todo/projects/python-mongo-swa-func/.repo/bicep/repo.yaml
+++ b/templates/todo/projects/python-mongo-swa-func/.repo/bicep/repo.yaml
@@ -146,7 +146,7 @@ repo:
       to: ./infra
 
     # .devcontainer common (devcontainer.json)
-    - from: ../../../../../common/.devcontainer/devcontainer.json/python/devcontainer.json
+    - from: ../../../../../common/.devcontainer/devcontainer.json/python/func/devcontainer.json
       to: ./.devcontainer/devcontainer.json
 
     # .devcontainer common (Dockerfile)
diff --git a/templates/todo/projects/python-mongo/.repo/bicep/repo.yaml b/templates/todo/projects/python-mongo/.repo/bicep/repo.yaml
index f41ac3b3218..5694b98a5b4 100644
--- a/templates/todo/projects/python-mongo/.repo/bicep/repo.yaml
+++ b/templates/todo/projects/python-mongo/.repo/bicep/repo.yaml
@@ -159,10 +159,6 @@ repo:
     - from: ../../../../../common/.devcontainer/devcontainer.json/python/devcontainer.json
       to: ./.devcontainer/devcontainer.json
 
-    # .devcontainer common (Dockerfile)
-    - from: ../../../../../common/.devcontainer/Dockerfile/base
-      to: ./.devcontainer
-
     # Assets common
     - from: ../../../../common/assets
       to: ./assets
diff --git a/templates/todo/projects/python-mongo/.repo/terraform/repo.yaml b/templates/todo/projects/python-mongo/.repo/terraform/repo.yaml
index 60db92ac313..70a98d8d2cb 100644
--- a/templates/todo/projects/python-mongo/.repo/terraform/repo.yaml
+++ b/templates/todo/projects/python-mongo/.repo/terraform/repo.yaml
@@ -148,10 +148,6 @@ repo:
     - from: ../../../../../common/.devcontainer/devcontainer.json/python/terraform
       to: ./.devcontainer
 
-    # .devcontainer common (Dockerfile)
-    - from: ../../../../../common/.devcontainer/Dockerfile/base
-      to: ./.devcontainer
-
     # Assets common
     - from: ../../../../common/assets
       to: ./assets