diff --git a/cuda-11/Dockerfile b/cuda-11/Dockerfile
index c32399b..780171f 100644
--- a/cuda-11/Dockerfile
+++ b/cuda-11/Dockerfile
@@ -73,7 +73,7 @@ ENTRYPOINT ["/bin/bash", "/opt/spack/share/spack/docker/entrypoint.bash"]
 CMD ["interactive-shell"]
 
 # Build stage with Spack pre-installed and ready to be used
-FROM nvidia/cuda:11.8.0-devel-ubuntu22.04 as builder
+FROM bootstrap as builder
 
 # Install OS packages needed to build the software
 RUN apt-get -yqq update && apt-get -yqq upgrade \
@@ -156,6 +156,7 @@ RUN { \
 && chmod a+x /entrypoint.sh \
 && ln -s /opt/views/view /opt/view
 
+RUN apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/3bf863cc.pub
 
 RUN apt-get -yqq update && apt-get -yqq upgrade \
  && apt-get -yqq install build-essential bash git cmake wget gfortran tar \
diff --git a/cuda-12/Dockerfile b/cuda-12/Dockerfile
index d99ce20..4b69142 100644
--- a/cuda-12/Dockerfile
+++ b/cuda-12/Dockerfile
@@ -73,7 +73,7 @@ ENTRYPOINT ["/bin/bash", "/opt/spack/share/spack/docker/entrypoint.bash"]
 CMD ["interactive-shell"]
 
 # Build stage with Spack pre-installed and ready to be used
-FROM nvidia/cuda:12.4.1-devel-ubuntu22.04 as builder
+FROM bootstrap as builder
 
 # Install OS packages needed to build the software
 RUN apt-get -yqq update && apt-get -yqq upgrade \
diff --git a/ubuntu-clang/Dockerfile b/ubuntu-clang/Dockerfile
index 0f18f9f..5517de7 100644
--- a/ubuntu-clang/Dockerfile
+++ b/ubuntu-clang/Dockerfile
@@ -113,6 +113,10 @@ RUN { \
 && chmod a+x /entrypoint.sh \
 && ln -s /opt/views/view /opt/view
 
+RUN apt-get -yqq update && apt-get -yqq upgrade \
+ && apt-get -yqq install build-essential bash git tar gfortran curl wget \
+ && rm -rf /var/lib/apt/lists/*
+
 # Install LLVM in the final image
 RUN apt-get -yqq update && apt-get -yqq install lsb-release software-properties-common
 RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
@@ -120,9 +124,6 @@ RUN add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 m
 RUN apt-get -yqq update
 RUN apt-get -yqq install clang-17 libc++-17-dev libc++abi-17-dev libomp-17-dev libclang-rt-17-dev
 
-RUN apt-get -yqq update && apt-get -yqq upgrade \
- && apt-get -yqq install build-essential bash git tar gfortran curl wget \
- && rm -rf /var/lib/apt/lists/*
 ENTRYPOINT [ "/entrypoint.sh" ]
 CMD [ "/bin/bash" ]