diff --git a/ci/docker/build.Dockerfile b/ci/docker/build.Dockerfile
index 171ab1ef7e..d1f36e8be5 100644
--- a/ci/docker/build.Dockerfile
+++ b/ci/docker/build.Dockerfile
@@ -8,6 +8,10 @@ LABEL com.jfrog.artifactory.retention.maxDays="21"
 ENV DEBIAN_FRONTEND=noninteractive \
     PATH="$PATH:/opt/spack/bin" \
     SPACK_COLOR=always
+
+# Overwrite entrypoint as NVIDIA images set a script that clog the output.
+ENTRYPOINT []
+CMD [ "/bin/bash" ]
 SHELL ["/bin/bash", "-c"]
 
 ARG EXTRA_APTGET
diff --git a/ci/docker/codecov.Dockerfile b/ci/docker/codecov.Dockerfile
index b9a7c9dcad..7b769839c3 100644
--- a/ci/docker/codecov.Dockerfile
+++ b/ci/docker/codecov.Dockerfile
@@ -27,8 +27,7 @@ RUN spack repo rm --scope site dlaf && \
     spack repo add ${SOURCE}/spack && \
     spack -e ci develop --no-clone --path ${SOURCE} --build-directory ${BUILD} dla-future@master && \
     spack -e ci concretize -f && \
-    spack -e ci --config "config:flags:keep_werror:all" install --jobs ${NUM_PROCS} --keep-stage --verbose && \
-    find ${BUILD} -name CMakeFiles -exec rm -rf {} +
+    spack -e ci --config "config:flags:keep_werror:all" install --jobs ${NUM_PROCS} --keep-stage --verbose
 
 RUN mkdir -p ${BIN} && cp -L ${SOURCE}/ci/{mpi-ctest,check-threads} ${BIN}
 
diff --git a/ci/docker/deploy.Dockerfile b/ci/docker/deploy.Dockerfile
index 54648dd49d..42a11b2264 100644
--- a/ci/docker/deploy.Dockerfile
+++ b/ci/docker/deploy.Dockerfile
@@ -44,6 +44,3 @@ ENV NVIDIA_REQUIRE_CUDA "cuda>=10.2"
 ENV LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
 
 WORKDIR ${BUILD}
-
-ENTRYPOINT []
-CMD [ "/bin/bash" ]