diff --git a/autogpt_platform/.devcontainer/README.md b/.devcontainer/platform/README.md
similarity index 100%
rename from autogpt_platform/.devcontainer/README.md
rename to .devcontainer/platform/README.md
diff --git a/autogpt_platform/.devcontainer/devcontainer.json b/.devcontainer/platform/devcontainer.json
similarity index 89%
rename from autogpt_platform/.devcontainer/devcontainer.json
rename to .devcontainer/platform/devcontainer.json
index 85ab42aa11..660d186de6 100644
--- a/autogpt_platform/.devcontainer/devcontainer.json
+++ b/.devcontainer/platform/devcontainer.json
@@ -1,7 +1,7 @@
 {
   "name": "AutoGPT Platform",
   "dockerComposeFile": [
-    "../docker-compose.yml",
+    "../../autogpt_platform/docker-compose.yml",
     "docker-compose.devcontainer.yml"
   ],
   "service": "devcontainer",
@@ -24,15 +24,10 @@
     }
   },
 
-  // Lifecycle scripts
-  // onCreateCommand runs during prebuild - do heavy lifting here
-  "onCreateCommand": "bash .devcontainer/scripts/oncreate.sh",
-  
-  // postCreateCommand runs after container creation - user-specific setup
-  "postCreateCommand": "bash .devcontainer/scripts/postcreate.sh",
-  
-  // postStartCommand runs every time the container starts (including resume)
-  "postStartCommand": "bash .devcontainer/scripts/poststart.sh",
+  // Lifecycle scripts - paths relative to repo root
+  "onCreateCommand": "bash .devcontainer/platform/scripts/oncreate.sh",
+  "postCreateCommand": "bash .devcontainer/platform/scripts/postcreate.sh",
+  "postStartCommand": "bash .devcontainer/platform/scripts/poststart.sh",
 
   // Port forwarding
   "forwardPorts": [
diff --git a/autogpt_platform/.devcontainer/docker-compose.devcontainer.yml b/.devcontainer/platform/docker-compose.devcontainer.yml
similarity index 90%
rename from autogpt_platform/.devcontainer/docker-compose.devcontainer.yml
rename to .devcontainer/platform/docker-compose.devcontainer.yml
index d9a6b20ba6..ec847b350b 100644
--- a/autogpt_platform/.devcontainer/docker-compose.devcontainer.yml
+++ b/.devcontainer/platform/docker-compose.devcontainer.yml
@@ -1,11 +1,11 @@
 # Docker Compose override for dev container
-# This extends the main docker-compose.yml to add a dev container service
+# This extends the main autogpt_platform/docker-compose.yml
 
 services:
   devcontainer:
     image: mcr.microsoft.com/devcontainers/base:ubuntu-24.04
     volumes:
-      # Mount the entire AutoGPT repo (parent of autogpt_platform)
+      # Mount the entire AutoGPT repo
       - ../..:/workspaces/AutoGPT:cached
       # Docker-in-Docker socket
       - /var/run/docker.sock:/var/run/docker-host.sock
@@ -38,7 +38,7 @@ services:
       - SUPABASE_SERVICE_ROLE_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyAgCiAgICAicm9sZSI6ICJzZXJ2aWNlX3JvbGUiLAogICAgImlzcyI6ICJzdXBhYmFzZS1kZW1vIiwKICAgICJpYXQiOiAxNjQxNzY5MjAwLAogICAgImV4cCI6IDE3OTk1MzU2MDAKfQ.DaYlNEoUrrEn2Ig7tqibS-PHK5vgusbcbo7X36XVt4Q
       - JWT_VERIFY_KEY=your-super-secret-jwt-token-with-at-least-32-characters-long
       
-      # Frontend URLs (Codespaces will rewrite these)
+      # Frontend URLs
       - NEXT_PUBLIC_SUPABASE_URL=http://localhost:8000
       - NEXT_PUBLIC_AGPT_SERVER_URL=http://localhost:8006/api
       - NEXT_PUBLIC_AGPT_WS_SERVER_URL=ws://localhost:8001/ws
diff --git a/autogpt_platform/.devcontainer/scripts/oncreate.sh b/.devcontainer/platform/scripts/oncreate.sh
similarity index 100%
rename from autogpt_platform/.devcontainer/scripts/oncreate.sh
rename to .devcontainer/platform/scripts/oncreate.sh
diff --git a/autogpt_platform/.devcontainer/scripts/postcreate.sh b/.devcontainer/platform/scripts/postcreate.sh
similarity index 100%
rename from autogpt_platform/.devcontainer/scripts/postcreate.sh
rename to .devcontainer/platform/scripts/postcreate.sh
diff --git a/autogpt_platform/.devcontainer/scripts/poststart.sh b/.devcontainer/platform/scripts/poststart.sh
similarity index 100%
rename from autogpt_platform/.devcontainer/scripts/poststart.sh
rename to .devcontainer/platform/scripts/poststart.sh
diff --git a/autogpt_platform/.devcontainer/vscode-templates/launch.json b/.devcontainer/platform/vscode-templates/launch.json
similarity index 100%
rename from autogpt_platform/.devcontainer/vscode-templates/launch.json
rename to .devcontainer/platform/vscode-templates/launch.json
diff --git a/autogpt_platform/.devcontainer/vscode-templates/tasks.json b/.devcontainer/platform/vscode-templates/tasks.json
similarity index 100%
rename from autogpt_platform/.devcontainer/vscode-templates/tasks.json
rename to .devcontainer/platform/vscode-templates/tasks.json