diff --git a/AMD.Dockerfile b/AMD.Dockerfile
new file mode 100644
index 000000000..a31b961b1
--- /dev/null
+++ b/AMD.Dockerfile
@@ -0,0 +1,17 @@
+FROM python:3.12.5-bookworm
+
+RUN pip install jinja2 numpy
+RUN pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/rocm6.0
+#RUN pip install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/rocm6.1
+RUN apt update -y
+RUN apt install -y git
+RUN git clone https://github.com/comfyanonymous/ComfyUI.git
+RUN apt install -y cargo cmake g++ gcc python3-dev musl-dev make nasm
+RUN pip install -r /ComfyUI/requirements.txt
+
+RUN apt remove -y git cargo cmake g++ gcc python3-dev musl-dev make nasm
+RUN apt autoremove -y && apt clean -y
+
+RUN chmod +x /ComfyUI/main.py
+
+ENTRYPOINT ["python", "/ComfyUI/main.py", "--listen"]
diff --git a/NVIDIA.Dockerfile b/NVIDIA.Dockerfile
new file mode 100644
index 000000000..3e694f728
--- /dev/null
+++ b/NVIDIA.Dockerfile
@@ -0,0 +1,17 @@
+FROM python:3.12.5-bookworm
+
+RUN pip install jinja2 numpy
+RUN pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/rocm6.0
+#RUN pip install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu121
+RUN apt update -y
+RUN apt install -y git
+RUN git clone https://github.com/comfyanonymous/ComfyUI.git
+RUN apt install -y cargo cmake g++ gcc python3-dev musl-dev make nasm
+RUN pip install -r /ComfyUI/requirements.txt
+
+RUN apt remove -y git cargo cmake g++ gcc python3-dev musl-dev make nasm
+RUN apt autoremove -y && apt clean -y
+
+RUN chmod +x /ComfyUI/main.py
+
+ENTRYPOINT ["python", "/ComfyUI/main.py", "--listen"]
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 000000000..e58ced534
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,27 @@
+services:
+  comfy-ui:
+    build:
+      context: ./
+      # AMD Users uncomment:
+      dockerfile: ./AMD.Dockerfile
+      # NVIDIA Users uncomment:
+      #dockerfile: ./NVIDIA.Dockerfile
+    restart: unless-stopped
+    volumes:
+      - ./models/checkpoints:/ComfyUI/models/checkpoints
+      - ./models/vae:/ComfyUI/models/vae
+      - ./models/unet:/ComfyUI/models/unet
+      - ./models/clip:/ComfyUI/models/clip
+      - $OUTPUTDIRECTORY:ComfyUI/output
+    ports:
+      - 8188:8188
+    devices:
+      - "/dev/dri:/dev/dri"
+      ## For AMD GPU
+      - "/dev/kfd:/dev/kfd"
+    healthcheck:
+      test: curl --fail http://localhost:8188/ || exit 
+      interval: 40s
+      timeout: 30s
+      retries: 3
+      start_period: 60s