diff --git a/cmake/onnxruntime_unittests.cmake b/cmake/onnxruntime_unittests.cmake
index e6138deaebb60..0916aeb3dd92c 100644
--- a/cmake/onnxruntime_unittests.cmake
+++ b/cmake/onnxruntime_unittests.cmake
@@ -883,6 +883,12 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Emscripten" OR IOS)
       "${TEST_SRC_DIR}/providers/cpu/model_tests.cc"
     )
 endif()
+if (USE_ROCM)
+    # The following unit test takes about 40 minutes.
+    list(REMOVE_ITEM all_tests
+      "${TEST_SRC_DIR}/contrib_ops/matmul_4bits_test.cc"
+    )
+endif()
 
 set(test_all_args)
 if (onnxruntime_USE_TENSORRT)
diff --git a/tools/ci_build/github/azure-pipelines/linux-rocm-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/linux-rocm-ci-pipeline.yml
index 916e8e63f7437..40b7752fbbf4a 100644
--- a/tools/ci_build/github/azure-pipelines/linux-rocm-ci-pipeline.yml
+++ b/tools/ci_build/github/azure-pipelines/linux-rocm-ci-pipeline.yml
@@ -61,8 +61,8 @@ jobs:
     parameters:
       Dockerfile: tools/ci_build/github/linux/docker/rocm-ci-pipeline-env.Dockerfile
       Context: tools/ci_build/github/linux/docker
-      DockerBuildArgs: "--build-arg ROCM_VERSION=$(RocmVersion)"
-      Repository: onnxruntimerocm-cibuild-rocm$(RocmVersion)
+      DockerBuildArgs: "--build-arg ROCM_VERSION=$(RocmVersion) --build-arg BUILD_UID=1004"
+      Repository: onnxruntimerocm-cibuild-rocm$(RocmVersion)new
 
   - task: Cache@2
     inputs:
@@ -90,7 +90,7 @@ jobs:
           --volume $(CCACHE_DIR):/cache \
           -e CCACHE_DIR=/cache \
           --workdir /onnxruntime_src \
-          onnxruntimerocm-cibuild-rocm$(RocmVersion) \
+          onnxruntimerocm-cibuild-rocm$(RocmVersion)new \
           /bin/bash -c "
             set -ex; \
             env; \
@@ -161,8 +161,8 @@ jobs:
     parameters:
       Dockerfile: tools/ci_build/github/linux/docker/rocm-ci-pipeline-env.Dockerfile
       Context: tools/ci_build/github/linux/docker
-      DockerBuildArgs: "--build-arg ROCM_VERSION=$(RocmVersion)"
-      Repository: onnxruntimerocm-cibuild-rocm$(RocmVersion)
+      DockerBuildArgs: "--build-arg ROCM_VERSION=$(RocmVersion) --build-arg BUILD_UID=1004"
+      Repository: onnxruntimerocm-cibuild-rocm$(RocmVersion)new
 
   - task: CmdLine@2
     inputs:
@@ -179,7 +179,7 @@ jobs:
           --volume $(Build.BinariesDirectory):/build \
           --volume /data/models:/build/models:ro \
           --workdir /build/Release \
-          onnxruntimerocm-cibuild-rocm$(RocmVersion) \
+          onnxruntimerocm-cibuild-rocm$(RocmVersion)new \
           /bin/bash -c "
             set -ex; \
             xargs -a /build/Release/perms.txt chmod a+x; \
@@ -225,10 +225,10 @@ jobs:
           -e KERNEL_EXPLORER_BATCHED_GEMM_MAX_BATCH_SIZE=8 \
           -e KERNEL_EXPLORER_TEST_USE_CUPY=0 \
           -e CUPY_CACHE_DIR=/build/Release \
-          onnxruntimerocm-cibuild-rocm$(RocmVersion) \
+          onnxruntimerocm-cibuild-rocm$(RocmVersion)new \
           /bin/bash -c "
             set -ex; \
-            python --version; \
+            python --version; id ; ls -lha /home ; \
             ls /opt/miniconda/envs/rocm-ci/lib/; \
             pytest /onnxruntime_src/onnxruntime/python/tools/kernel_explorer/ -n 4 --reruns 1 --durations=100"
       workingDirectory: $(Build.SourcesDirectory)
diff --git a/tools/ci_build/github/linux/docker/rocm-ci-pipeline-env.Dockerfile b/tools/ci_build/github/linux/docker/rocm-ci-pipeline-env.Dockerfile
index ec73647cafc55..1cd5f289dd1c9 100644
--- a/tools/ci_build/github/linux/docker/rocm-ci-pipeline-env.Dockerfile
+++ b/tools/ci_build/github/linux/docker/rocm-ci-pipeline-env.Dockerfile
@@ -17,7 +17,7 @@ RUN apt-get update && \
     printf "deb [arch=amd64] https://repo.radeon.com/rocm/apt/$ROCM_VERSION/ jammy main" | tee /etc/apt/sources.list.d/rocm.list   && \
     printf "deb [arch=amd64] https://repo.radeon.com/amdgpu/$AMDGPU_VERSION/ubuntu jammy main" | tee /etc/apt/sources.list.d/amdgpu.list   && \
     apt-get update && apt-get install -y --no-install-recommends \
-    sudo \
+    sudo git \
     libelf1 \
     kmod \
     file zip unzip \
@@ -97,7 +97,6 @@ RUN pip install packaging \
                 scipy==1.14.1 \
                 numpy==1.26.4
 
-RUN apt install -y git
 ARG BUILD_UID=1000
 ARG BUILD_USER=onnxruntimedev
 RUN adduser --gecos 'onnxruntime Build User' --disabled-password $BUILD_USER --uid $BUILD_UID