diff --git a/.devcontainer/dotnet/devcontainer.json b/.devcontainer/dotnet/devcontainer.json
index b16fcacd69..6ec44f9004 100644
--- a/.devcontainer/dotnet/devcontainer.json
+++ b/.devcontainer/dotnet/devcontainer.json
@@ -6,15 +6,29 @@
     "dockerfile": "dotnet.Dockerfile"
   },
   "features": {
-    "ghcr.io/devcontainers/features/dotnet:2.4.2": {},
-    "ghcr.io/devcontainers/features/powershell:1.5.1": {},
     "ghcr.io/devcontainers/features/azure-cli:1.2.9": {},
-    "ghcr.io/devcontainers/features/docker-in-docker:2.14.0": {}
+    "ghcr.io/devcontainers/features/github-cli:1": {
+      "version": "2"
+    },
+    "ghcr.io/devcontainers/features/powershell:1": {
+      "version": "latest"
+    },
+    "ghcr.io/azure/azure-dev/azd:0": {
+      "version": "latest"
+    },
+    "ghcr.io/devcontainers/features/dotnet:2": {
+      "version": "none",
+      "dotnetRuntimeVersions": "10.0",
+      "aspNetCoreRuntimeVersions": "10.0"
+    },
+    "ghcr.io/devcontainers/features/copilot-cli:1": {}
   },
   "workspaceFolder": "/workspaces/agent-framework/dotnet/",
   "customizations": {
     "vscode": {
       "extensions": [
+        "GitHub.copilot",
+        "GitHub.vscode-github-actions",
         "ms-dotnettools.csdevkit",
         "vscode-icons-team.vscode-icons",
         "ms-windows-ai-studio.windows-ai-studio"
diff --git a/.devcontainer/dotnet/dotnet.Dockerfile b/.devcontainer/dotnet/dotnet.Dockerfile
index ecf1b14428..344e4ee813 100644
--- a/.devcontainer/dotnet/dotnet.Dockerfile
+++ b/.devcontainer/dotnet/dotnet.Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/dotnet
+FROM mcr.microsoft.com/devcontainers/universal:latest
 
 # Remove Yarn repository with expired GPG key to prevent apt-get update failures
 # Tracking issue: https://github.com/devcontainers/images/issues/1752