diff --git a/docker/Dockerfile.devito b/docker/Dockerfile.devito
index 635e5d7899..7908497ca5 100644
--- a/docker/Dockerfile.devito
+++ b/docker/Dockerfile.devito
@@ -26,8 +26,8 @@ RUN python3 -m venv /venv && \
     /venv/bin/pip install --no-cache-dir --upgrade pip && \
     /venv/bin/pip install --no-cache-dir jupyter && \
     /venv/bin/pip install --no-cache-dir wheel && \
-    eval $MPI4PY_FLAGS /venv/bin/pip install --no-cache-dir mpi4py && \
-    /venv/bin/pip install --no-cache-dir -e /app/devito[extras,mpi,tests] && \
+    eval "$MPI4PY_FLAGS /venv/bin/pip install --no-cache-dir -r /app/devito/requirements-mpi.txt" && \
+    /venv/bin/pip install --no-cache-dir -e /app/devito[extras,tests] && \
     rm -rf ~/.cache/pip
 
 # Usefull utilities
diff --git a/docker/Dockerfile.intel b/docker/Dockerfile.intel
index 5b75f203b5..24e57ea147 100644
--- a/docker/Dockerfile.intel
+++ b/docker/Dockerfile.intel
@@ -59,7 +59,7 @@ RUN apt-get update -y && apt-get dist-upgrade -y && \
             # Development packages
             libigc-dev intel-igc-cm libigdfcl-dev libigfxcmrt-dev level-zero-dev
 
-ENV MPI4PY_FLAGS='. /opt/intel/oneapi/setvars.sh intel64'
+ENV MPI4PY_FLAGS='. /opt/intel/oneapi/setvars.sh intel64 && '
 
 ##############################################################
 # ICC image