diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index 43b8a9ae638419c876ad6fc5730f2efc21d014a7..61b9c51f28a47fe8eaaca268cf56cebc3a485dd3 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -222,6 +222,13 @@ RUN cd /opt/spack-environment                                           \
  && spack env activate .                                                \
  && spack gc -y
 
+# Garbage collect in git
+RUN cd $SPACK_ROOT                                                      \
+ && du -sh $SPACK_ROOT                                                  \
+ && git fetch --depth=1                                                 \
+ && git gc --prune=all --aggressive                                     \
+ && du -sh $SPACK_ROOT
+
 ## Bugfix to address issues loading the Qt5 libraries on Linux kernels prior to 3.15
 ## See
 #https://askubuntu.com/questions/1034313/ubuntu-18-4-libqt5core-so-5-cannot-open-shared-object-file-no-such-file-or-dir
@@ -262,6 +269,7 @@ LABEL maintainer="Sylvester Joosten <sjoosten@anl.gov>" \
 ## copy over everything we need from staging in a single layer :-)
 RUN --mount=from=staging,target=/staging                                \
     rm -rf /usr/local                                                   \
+ && cp -r /staging/opt/spack /opt/spack                                 \
  && cp -r /staging/opt/spack-environment /opt/spack-environment         \
  && cp -r /staging/opt/software /opt/software                           \
  && cp -r /staging/usr/._local /usr/._local                             \