diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c98d9c21b6e5b4d3af8ca2277243ac37d45501fc..d2d3148540995695789ecec29a8cbd9ba6bf2047 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ variables:
   ## 8bdc5065792c185be9934ab0c2a5b087b8845bd1: emacs: Add option to install version 28.1
 
   ## Spack github version, e.g. v0.18 branch, v0.18.1 tag, or commit hash
-  EICSPACK_VERSION: "v0.18.15"
+  EICSPACK_VERSION: "v0.18"
   ## Space-separated list of eic-spack cherry-picks
   EICSPACK_CHERRYPICKS: "" 
 
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index 637eec672e5870f2667bb572ddfb3886a5690cd2..63f6023b9303e079474c8cf086c863e8a953ffcf 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -24,6 +24,7 @@ RUN --mount=type=cache,target=/var/cache/apt                            \
 ENV SPACK_ROOT=/opt/spack
 ARG SPACK_VERSION="develop"
 ARG SPACK_CHERRYPICKS=""
+ADD https://api.github.com/repos/spack/spack/commits/$SPACK_VERSION /tmp/spack.json
 RUN echo "Part 1: regular spack install (as in containerize)"           \
  && git clone https://github.com/spack/spack.git /tmp/spack-staging     \
  && cd /tmp/spack-staging                                               \
@@ -81,6 +82,7 @@ ARG CACHE_NUKE=""
 ## Setup our custom package overrides
 ENV EICSPACK_ROOT=$SPACK_ROOT/var/spack/repos/eic-spack
 ARG EICSPACK_VERSION="$SPACK_VERSION"
+ADD https://api.github.com/repos/eic/eic-spack/commits/$EICSPACK_VERSION /tmp/eic-spack.json
 RUN git clone https://github.com/eic/eic-spack.git ${EICSPACK_ROOT}     \
  && git -C ${EICSPACK_ROOT} checkout ${EICSPACK_VERSION}                \
  && if [ -n "${EICSPACK_CHERRYPICKS}" ] ; then                          \