diff --git a/.gitea/workflows/build-comfyui-cuda.yaml b/.gitea/workflows/build-comfyui-cuda.yaml
index 9a05ff6..7cbce01 100644
--- a/.gitea/workflows/build-comfyui-cuda.yaml
+++ b/.gitea/workflows/build-comfyui-cuda.yaml
@@ -35,7 +35,7 @@ jobs:
           docker buildx build \
           --platform=linux/arm64 \
           -t docker.mistox.net/comfyui-cuda-ampere:latest \
-          -t mistox/rocm-aarch64-base:latest \
+          -t mistox/comfyui-cuda-ampere:latest \
           -f comfyui-cuda-dockerfile \
           --push \
           .
\ No newline at end of file
diff --git a/.gitea/workflows/build-comfyui-rocm.yaml b/.gitea/workflows/build-comfyui-rocm.yaml
index 1e82a32..155d65d 100644
--- a/.gitea/workflows/build-comfyui-rocm.yaml
+++ b/.gitea/workflows/build-comfyui-rocm.yaml
@@ -35,16 +35,17 @@ jobs:
           docker buildx build \
           --platform=linux/arm64 \
           -t docker.mistox.net/rocm-aarch64-base:latest \
+          -t mistox/rocm-aarch64-base:latest \
           -f rocm-base-aarch64-dockerfile \
           --push \
           .
 
-      - name: build and push comfyui-cuda
+      - name: build and push comfyui-rocm
         run: |
           docker buildx build \
           --platform=linux/arm64 \
-          -t docker.mistox.net/comfyui-cuda-ampere:latest \
-          -t mistox/rocm-aarch64-base:latest \
+          -t docker.mistox.net/comfyui-rocm-ampere:latest \
+          -t mistox/comfyui-rocm-ampere:latest \
           -f comfyui-rocm-dockerfile \
           --push \
           .
\ No newline at end of file
diff --git a/.gitea/workflows/build-uvicorn.yaml b/.gitea/workflows/build-uvicorn.yaml
index 69d349b..159de9f 100644
--- a/.gitea/workflows/build-uvicorn.yaml
+++ b/.gitea/workflows/build-uvicorn.yaml
@@ -35,7 +35,7 @@ jobs:
           docker buildx build \
           --platform=linux/arm64 \
           -t docker.mistox.net/uvicorn-ampere:latest \
-          -t mistox/rocm-aarch64-base:latest \
+          -t mistox/uvicorn-ampere:latest \
           -f uvicorn-dockerfile \
           --push \
           .
\ No newline at end of file
diff --git a/comfyui-cuda-dockerfile b/comfyui-cuda-dockerfile
index a0245f2..f2cfbd9 100644
--- a/comfyui-cuda-dockerfile
+++ b/comfyui-cuda-dockerfile
@@ -2,6 +2,9 @@
 FROM nvcr.io/nvidia/pytorch:26.04-py3 AS build-deps
 
 # Set ENV
+ENV PIP_BREAK_SYSTEM_PACKAGES=1
+ENV PYTHONUNBUFFERED=1
+ENV DEBIAN_FRONTEND=noninteractive
 ENV USE_CUDA=1
 ENV BUILD_SOX=1
 
diff --git a/comfyui-rocm-dockerfile b/comfyui-rocm-dockerfile
index 1b3b74c..a1d6d7e 100644
--- a/comfyui-rocm-dockerfile
+++ b/comfyui-rocm-dockerfile
@@ -1,13 +1,27 @@
 # Use the rocm-base-aarch64-dockerfile
-FROM ubuntu:26.04 AS reqs
+FROM mistox/rocm-aarch64-base:latest AS base
+
+# Set Workdir
 WORKDIR /app
+
+# Clone ComfyUI
 RUN git clone https://github.com/comfyanonymous/ComfyUI.git .
-RUN pip3 install -r requirements.txt
-# Setup Manager
+
+# Install depencies
+RUN grep -vE "^(torch|#)" requirements.txt | xargs pip install && \
+    pip install torchsde imageio controlnet_aux
+
+# Set custom Nodes
 WORKDIR /app/custom_nodes
+
+# Install ComfyUi Manager
 RUN git clone https://github.com/Comfy-Org/ComfyUI-Manager.git
-# Setup for run
+
+# Go back to root
 WORKDIR /app
+
+# Expose the default ComfyUI port
 EXPOSE 8188
-# Launch
+
+# Launch ComfyUI
 CMD ["python3", "main.py", "--listen", "0.0.0.0"]
\ No newline at end of file