diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index ccd739b24..abdf64c8d 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,11 +2,12 @@
     "name": "Multi Agent Custom Automation Engine Solution Accelerator",
     "image": "mcr.microsoft.com/devcontainers/python:3.11-bullseye",
     "features": {
-        "ghcr.io/devcontainers/features/docker-in-docker:2": {},
+        "ghcr.io/devcontainers/features/docker-in-docker:2": {"version": "latest"},
         "ghcr.io/azure/azure-dev/azd:latest": {},
         "ghcr.io/devcontainers/features/node:1": {},
         "ghcr.io/devcontainers/features/azure-cli:1": {},
-        "ghcr.io/jsburckhardt/devcontainer-features/uv:1": {}
+        "ghcr.io/jsburckhardt/devcontainer-features/uv:1": {"shellautocompletion": true,
+            "version": "latest"}
     },
     "customizations": {
         "vscode": {
diff --git a/.devcontainer/setupEnv.sh b/.devcontainer/setupEnv.sh
index 0ff00c7b8..c771fb815 100755
--- a/.devcontainer/setupEnv.sh
+++ b/.devcontainer/setupEnv.sh
@@ -1,25 +1,25 @@
-#!/bin/bash
-
-cd ./src/backend
-uv add -r requirements.txt
-
-cd ../frontend
-uv add -r requirements.txt
-
-cd ..
-
-
+#!/bin/sh
 
+echo "Pull latest code for the current branch"
+git fetch
+git pull
 
+set -e 
 
+echo "Setting up Backend..."
+cd ./src/backend
+uv sync --frozen
+cd ../../
 
+echo "Setting up Frontend..."
+cd ./src/frontend
+npm install
+pip install -r requirements.txt
+cd ../../
 
-# pip install --upgrade pip
-
-
-# (cd ./src/frontend; pip install -r requirements.txt)
-
-
-# (cd ./src/backend; pip install -r requirements.txt)
-
+echo "Setting up MCP..."
+cd ./src/mcp_server
+uv sync --frozen
+cd ../../
 
+echo "Setup complete! 🎉"
\ No newline at end of file