diff --git a/builders/Dockerfile.cuda-env b/builders/Dockerfile.cuda-env
index 01fa43a70..8a2ba3334 100644
--- a/builders/Dockerfile.cuda-env
+++ b/builders/Dockerfile.cuda-env
@@ -8,3 +8,7 @@ RUN dnf install -y epel-release
 RUN dnf update -y
 RUN dnf -y module install nvidia-driver:latest-dkms
 RUN dnf -y install cuda
+
+FROM scratch
+COPY --from=0 /usr/local/cuda-11.7/ /usr/local/cuda-11.7/
+COPY --from=0 /usr/lib64/libcuda.so* /usr/lib64/
diff --git a/builders/Dockerfile.hpx-env b/builders/Dockerfile.hpx-env
index 8c0b81735..98c35aaa4 100644
--- a/builders/Dockerfile.hpx-env
+++ b/builders/Dockerfile.hpx-env
@@ -21,5 +21,5 @@ RUN cd build && cmake \
 		-DHPX_WITH_MALLOC=system ..
 RUN cd build && make -j2
 
-FROM quay.io/pypa/manylinux_2_28_x86_64
+FROM scratch
 COPY --from=0 /hpx/ /hpx/