diff --git a/spack/2a-precomp/Dockerfile b/spack/2a-precomp/Dockerfile
index f1aeaa7..2e380c1 100644
--- a/spack/2a-precomp/Dockerfile
+++ b/spack/2a-precomp/Dockerfile
@@ -32,6 +32,12 @@ RUN set -ex \
  && apt-get autoclean -y
 
 
+# Bootstrap spack (spack bootstrap now is not available in 0.18)
+RUN spack bootstrap root "${SPACK_ROOT}/lib/spack-bootstrap" \
+ && spack solve zlib \
+ && spack clean -a
+
+
 # Detect our bootstrapping compiler
 RUN spack compiler find --scope site \
  && spack config --scope site add 'packages:all:target:[x86_64]' \
diff --git a/spack/3a-precomp/baselibs.lst b/spack/3a-precomp/baselibs.lst
index 57c28f9..9204139 100644
--- a/spack/3a-precomp/baselibs.lst
+++ b/spack/3a-precomp/baselibs.lst
@@ -1,11 +1,6 @@
 cmake
-curl
 doxygen
-m4
-openssl +shared certs=mozilla
 pkgconf
+py-mpi4py
 py-numpy
-py-pip
-py-pyyaml ~libyaml
 python
-zlib
diff --git a/spack/6-optlibs/optlibs.lst b/spack/6-optlibs/optlibs.lst
index 02842af..46cc119 100644
--- a/spack/6-optlibs/optlibs.lst
+++ b/spack/6-optlibs/optlibs.lst
@@ -1,5 +1,4 @@
 hdf5
-libyaml
 netcdf-c
 paraconf
 py-pybind11
diff --git a/spack/7-finalize/Dockerfile b/spack/7-finalize/Dockerfile
index 58558ca..890a6b2 100644
--- a/spack/7-finalize/Dockerfile
+++ b/spack/7-finalize/Dockerfile
@@ -144,7 +144,44 @@ ENV HOME=/home/ci
 
 FROM main AS test
 
+
+USER root:root
+WORKDIR /root
+ENV HOME=/root
+
+RUN set -ex \
+ && export DEBIAN_FRONTEND=noninteractive \
+ && apt-get update -y \
+ && apt-get upgrade -y \
+ && apt-get install -y --no-install-recommends \
+            ca-certificates \
+            curl \
+ && apt-get autoremove -y \
+ && apt-get clean -y \
+ && apt-get autoclean -y
+
+USER ci:ci
+WORKDIR /home/ci
+ENV HOME=/home/ci
+
 RUN curl --output pdi.tar.gz -L https://github.com/pdidev/pdi/archive/refs/heads/main.tar.gz
+
+USER root:root
+WORKDIR /root
+ENV HOME=/root
+
+RUN set -ex \
+ && export DEBIAN_FRONTEND=noninteractive \
+ && apt-get purge -y \
+            ca-certificates \
+            curl \
+ && rm -rf /var/lib/apt/lists/*
+
+USER ci:ci
+WORKDIR /home/ci
+ENV HOME=/home/ci
+
+
 RUN tar -xf pdi.tar.gz
 RUN export VERBOSE=1 \
  && bash pdi*/bin/build_and_run_all_tests