diff --git a/.devcontainer/.env b/.devcontainer/.env
new file mode 100644
index 00000000000..0a2bcbfbe0c
--- /dev/null
+++ b/.devcontainer/.env
@@ -0,0 +1,4 @@
+AAZ_CLI_PATH=/workspaces/azure-cli
+AAZ_CLI_EXTENSION_PATH=/workspaces/azure-cli-extensions
+AAZ_SWAGGER_PATH=/workspaces/azure-rest-api-specs
+AAZ_PATH=/workspaces/aaz
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 81e371441e5..82903b8ee52 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -13,5 +13,6 @@
     "cpus": 16,
     "memory": "64gb",
     "storage": "128gb"
-  }
+  },
+  "runArgs": ["--env-file", ".devcontainer/.env"],
 }
diff --git a/.devcontainer/init.sh b/.devcontainer/init.sh
index e7ea93abc75..2a60f6338df 100644
--- a/.devcontainer/init.sh
+++ b/.devcontainer/init.sh
@@ -66,9 +66,7 @@ if ! command -v aaz-dev &> /dev/null; then
     ELAPSED_TIME=$SECONDS
 
     echo -e "\n${YELLOW}Elapsed time: $((ELAPSED_TIME / 60))m $((ELAPSED_TIME % 60))s.${NC}"
-    echo -e "\n${GREEN}Finished setup! Please launch the codegen tool via:${NC}"
-    echo -e "${GREEN}\$ aaz-dev run -c azure-cli -e azure-cli-extensions -s azure-rest-api-specs -a aaz${NC}\n"
+    echo -e "\n${GREEN}Finished setup! Please launch the codegen tool via: aaz-dev run${NC}\n"
 else
-    echo -e "\nPlease launch the codegen tool via:"
-    echo -e "$ aaz-dev run -c azure-cli -e azure-cli-extensions -s azure-rest-api-specs -a aaz\n"
+    echo -e "\nPlease launch the codegen tool via: aaz-dev run\n"
 fi