diff --git a/containers/oneapi/onedev.Dockerfile b/containers/oneapi/onedev.Dockerfile
index 12a323937a2d4b9b8cbd507032e3a28e1f9826a7..3061b79327c46515dfabdd5b1135d67398f9129b 100644
--- a/containers/oneapi/onedev.Dockerfile
+++ b/containers/oneapi/onedev.Dockerfile
@@ -15,10 +15,11 @@ ARG INTERNAL_TAG="unstable-mr-290-306"
 FROM ${DOCKER_REGISTRY}debian_stable_base:${INTERNAL_TAG} as builder
 
 ## Install some extra spack dependencies
-RUN --mount=type=cache,target=/var/cache/apt                               \
+## Do not use Cache mount as it conflicts with oneapi stage
+RUN                                                                        \
     rm -f /etc/apt/apt.conf.d/docker-clean                                 \
  && apt-get -yqq update                                                    \
- && apt-get -yqq install --no-install-recommends -o DPkg::Lock::Timeout=-1 \
+ && apt-get -yqq install --no-install-recommends                           \
         python3                                                            \
         python3-dev                                                        \
         python3-distutils                                                  \
@@ -247,7 +248,6 @@ RUN --mount=type=cache,target=/var/cache/apt                            \
     rm -f /etc/apt/apt.conf.d/docker-clean                              \
  && ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime          \
  && echo "US/Eastern" > /etc/timezone                                   \
- && echo ps                                                             \
  && apt-get -yqq update                                                 \
  && apt-get -yqq upgrade                                                \
  && apt-get -yqq install --no-install-recommends                        \