diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 41fb6604b..000000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-version: "3.9"
-
-services:
-  app:
-    image: comfyui:1
-    build: .
-
-    ports:
-      - "8188:8188"
-    volumes:
-      - ./models:/opt/comfy_ui/models
-      - ./output:/opt/comfy_ui/output
-      - ./input:/opt/comfy_ui/input
-      - ./custom_nodes:/opt/comfy_ui/custom_nodes      
-
-    environment:
-      - CLI_ARGS=--listen --port 8188
-
-    deploy:
-      resources:
-        reservations:
-          devices:
-              - driver: nvidia
-                device_ids: ["0"]
-                capabilities: [gpu]
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
new file mode 100644
index 000000000..3b627230b
--- /dev/null
+++ b/docker/docker-compose.yml
@@ -0,0 +1,75 @@
+version: "3.9"
+name: "comfyui"
+
+
+x-base_service: &base_service
+  image: comfyui:1
+  build:
+    context: ..
+    dockerfile: docker/docker_files/default.Dockerfile
+
+  environment:
+    - CLI_ARGS=--listen --port 8188
+
+  ports:
+    - "8188:8188"
+  volumes:
+    - models:/opt/comfy_ui/models
+    - output:/opt/comfy_ui/output
+    - input:/opt/comfy_ui/input
+    - custom_nodes:/opt/comfy_ui/custom_nodes
+  restart: unless-stopped
+
+x-nvidia_docker: &nvidia_docker
+  deploy:
+    resources:
+      reservations:
+        devices:
+          - driver: nvidia
+            device_ids: ["0"]
+            capabilities: [gpu]
+
+x-base_service_amd: &amd_docker
+  build:
+    context: ..
+    dockerfile: docker/docker_files/amd.Dockerfile
+
+  group_add:
+    - video
+  devices:
+    - "/dev/dri"
+    - "/dev/kfd"
+
+
+services:
+  nvidia:
+    <<: *base_service
+    <<: *nvidia_docker
+    profiles: ["nvidia"]
+
+  amd:
+    <<: *base_service
+    <<: *amd_docker
+    profiles: ["amd"]
+
+  amd6600:
+    <<: *base_service
+    <<: *amd_docker
+    profiles: ["amd6600"]
+
+    environment:
+      - HSA_OVERRIDE_GFX_VERSION=10.3.0
+      - CLI_ARGS=--listen --port 8188
+
+  cpu:
+    <<: *base_service
+    profiles: ["cpu"]
+    environment:
+      - CLI_ARGS=--listen --port 8188 --cpu
+
+
+volumes:
+  models:
+  output:
+  input:
+  custom_nodes:
diff --git a/docker/docker_files/amd.Dockerfile b/docker/docker_files/amd.Dockerfile
new file mode 100644
index 000000000..e5392c037
--- /dev/null
+++ b/docker/docker_files/amd.Dockerfile
@@ -0,0 +1,17 @@
+FROM python:3.10-slim
+
+
+WORKDIR /opt/comfy_ui
+
+
+RUN PIP_NO_CACHE_DIR=1 pip install --extra-index-url https://download.pytorch.org/whl/rocm5.4.2 \
+torch \
+torchvision \
+torchaudio
+
+COPY . /opt/comfy_ui
+RUN pip install -r requirements.txt
+
+
+ENV CLI_ARGS=""
+CMD python main.py ${CLI_ARGS}
diff --git a/Dockerfile b/docker/docker_files/default.Dockerfile
similarity index 100%
rename from Dockerfile
rename to docker/docker_files/default.Dockerfile