diff --git a/.devcontainer/dotnet/devcontainer.json b/.devcontainer/dotnet/devcontainer.json
index 59b56a4438..b16fcacd69 100644
--- a/.devcontainer/dotnet/devcontainer.json
+++ b/.devcontainer/dotnet/devcontainer.json
@@ -1,11 +1,15 @@
 {
   "name": "C# (.NET)",
-  "image": "mcr.microsoft.com/devcontainers/dotnet:10.0",
+  //"image": "mcr.microsoft.com/devcontainers/dotnet",
+  // Workaround for https://github.com/devcontainers/images/issues/1752
+  "build": {
+    "dockerfile": "dotnet.Dockerfile"
+  },
   "features": {
-    "ghcr.io/devcontainers/features/dotnet:2.4.0": {},
+    "ghcr.io/devcontainers/features/dotnet:2.4.2": {},
     "ghcr.io/devcontainers/features/powershell:1.5.1": {},
-    "ghcr.io/devcontainers/features/azure-cli:1.2.8": {},
-    "ghcr.io/devcontainers/features/docker-in-docker:2.12.4": {}
+    "ghcr.io/devcontainers/features/azure-cli:1.2.9": {},
+    "ghcr.io/devcontainers/features/docker-in-docker:2.14.0": {}
   },
   "workspaceFolder": "/workspaces/agent-framework/dotnet/",
   "customizations": {
diff --git a/.devcontainer/dotnet/dotnet.Dockerfile b/.devcontainer/dotnet/dotnet.Dockerfile
new file mode 100644
index 0000000000..ecf1b14428
--- /dev/null
+++ b/.devcontainer/dotnet/dotnet.Dockerfile
@@ -0,0 +1,5 @@
+FROM mcr.microsoft.com/devcontainers/dotnet
+
+# Remove Yarn repository with expired GPG key to prevent apt-get update failures
+# Tracking issue: https://github.com/devcontainers/images/issues/1752
+RUN rm -f /etc/apt/sources.list.d/yarn.list
\ No newline at end of file