diff --git a/Dockerfile b/deploy/docker/Dockerfile
similarity index 100%
rename from Dockerfile
rename to deploy/docker/Dockerfile
diff --git a/Dockerfile.gpu b/deploy/docker/Dockerfile.gpu
similarity index 100%
rename from Dockerfile.gpu
rename to deploy/docker/Dockerfile.gpu
diff --git a/Dockerfile.gpu.rocm b/deploy/docker/Dockerfile.gpu.rocm
similarity index 100%
rename from Dockerfile.gpu.rocm
rename to deploy/docker/Dockerfile.gpu.rocm
diff --git a/Dockerfile.sandbox b/deploy/docker/Dockerfile.sandbox
similarity index 100%
rename from Dockerfile.sandbox
rename to deploy/docker/Dockerfile.sandbox
diff --git a/deploy/docker/docker-compose.gpu.rocm.yml b/deploy/docker/docker-compose.gpu.rocm.yml
new file mode 100644
index 00000000..8e40b6c4
--- /dev/null
+++ b/deploy/docker/docker-compose.gpu.rocm.yml
@@ -0,0 +1,15 @@
+# ROCm GPU override — use with:
+#   docker compose -f deploy/docker/docker-compose.yml -f deploy/docker/docker-compose.gpu.rocm.yml up
+version: "3.9"
+
+services:
+  jarvis:
+    build:
+      context: ../..
+      dockerfile: deploy/docker/Dockerfile.gpu.rocm
+    devices:
+      - /dev/kfd
+      - /dev/dri
+    group_add:
+      - video
+      - render
diff --git a/docker-compose.yml b/deploy/docker/docker-compose.yml
similarity index 86%
rename from docker-compose.yml
rename to deploy/docker/docker-compose.yml
index d1637a8a..a19268ef 100644
--- a/docker-compose.yml
+++ b/deploy/docker/docker-compose.yml
@@ -3,8 +3,8 @@ version: "3.9"
 services:
   jarvis:
     build:
-      context: .
-      dockerfile: Dockerfile
+      context: ../..
+      dockerfile: deploy/docker/Dockerfile
     ports:
       - "8000:8000"
     environment:
diff --git a/docker-compose.gpu.rocm.yml b/docker-compose.gpu.rocm.yml
deleted file mode 100644
index f3c0e600..00000000
--- a/docker-compose.gpu.rocm.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# ROCm GPU override — use with:
-#   docker compose -f docker-compose.yml -f docker-compose.gpu.rocm.yml up
-version: "3.9"
-
-services:
-  jarvis:
-    build:
-      context: .
-      dockerfile: Dockerfile.gpu.rocm
-    devices:
-      - /dev/kfd
-      - /dev/dri
-    group_add:
-      - video
-      - render