diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 1817105..15aac4f 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,9 +2,7 @@
     "name": ".NET in Codespaces",
     "image": "mcr.microsoft.com/dotnet/sdk:8.0-preview",
     "features": {
-        "ghcr.io/devcontainers/features/docker-from-docker:1": {
-            "version": "20.10"
-        },
+        "ghcr.io/devcontainers/features/docker-in-docker:2": {},
         "ghcr.io/devcontainers/features/github-cli:1": {
             "version": "2"
         },
@@ -13,7 +11,8 @@
         },
         "ghcr.io/azure/azure-dev/azd:0": {
             "version": "latest"
-        }
+        },
+        "ghcr.io/devcontainers/features/common-utils:2": {}
     },
     "customizations": {
         "vscode": {
@@ -32,23 +31,23 @@
         8080,
         8081
     ],
-    "postCreateCommand": "dotnet restore",
-    "remoteUser": "vscode",
+    "postCreateCommand": "cd ./SampleApp && dotnet restore",
     "hostRequirements": {
         "memory": "8gb",
         "cpus": 4
     },
     "remoteEnv": {
-        "PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}",
         "DOTNET_MULTILEVEL_LOOKUP": "0",
         "TARGET": "net8.0"
     },
     "portsAttributes": {
         "8080": {
-            "label": "Weather API"
+            "label": "Weather API",
+            "onAutoForward": "notify"
         },
         "8081": {
-            "label": "Weather Front End"
+            "label": "Weather Front End",
+            "onAutoForward": "notify"
         }
     }
 }