diff --git a/spack/2a-precomp/Dockerfile b/spack/2a-precomp/Dockerfile
index 2e380c1..459e3ec 100644
--- a/spack/2a-precomp/Dockerfile
+++ b/spack/2a-precomp/Dockerfile
@@ -33,7 +33,7 @@ RUN set -ex \
 
 
 # Bootstrap spack (spack bootstrap now is not available in 0.18)
-RUN spack bootstrap root "${SPACK_ROOT}/lib/spack-bootstrap" \
+RUN spack bootstrap root --scope site "${SPACK_ROOT}/lib/spack-bootstrap" \
  && spack solve zlib \
  && spack clean -a
 
diff --git a/spack/7-finalize/Dockerfile b/spack/7-finalize/Dockerfile
index 890a6b2..995db2e 100644
--- a/spack/7-finalize/Dockerfile
+++ b/spack/7-finalize/Dockerfile
@@ -136,6 +136,11 @@ RUN set -ex \
  && ln -s ${SPACK_ROOT}/share/spack/docker/entrypoint.bash /usr/local/bin/spack-env
 
 
+SHELL ["docker-shell"]
+ENTRYPOINT ["/bin/bash", "/opt/spack/share/spack/docker/entrypoint.bash"]
+CMD ["interactive-shell"]
+
+
 USER ci:ci
 WORKDIR /home/ci
 ENV HOME=/home/ci