diff --git a/.github/workflows/mirror.yaml b/.github/workflows/mirror.yaml
index 187069e5..9042a4ff 100644
--- a/.github/workflows/mirror.yaml
+++ b/.github/workflows/mirror.yaml
@@ -23,6 +23,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Push to EICweb
+      if: ${{ github.event_name == 'push' }}
       uses: eic/gitlab-sync@master
       with:
         url: https://eicweb.phy.anl.gov/containers/eic_container.git/
diff --git a/containers/debian/Dockerfile b/containers/debian/Dockerfile
index 196453b0..8ed52893 100644
--- a/containers/debian/Dockerfile
+++ b/containers/debian/Dockerfile
@@ -195,8 +195,8 @@ ARG SPACKPACKAGES_CHERRYPICKS_FILES=""
 ADD https://api.github.com/repos/${SPACKPACKAGES_ORGREPO}/commits/${SPACKPACKAGES_VERSION} /tmp/spack-packages.json
 RUN <<EOF
 set -e
-git clone --filter=tree:0 https://github.com/${SPACKPACKAGES_ORGREPO}.git ${SPACKPACKAGES_ROOT}
-git -C ${SPACKPACKAGES_ROOT} checkout ${SPACKPACKAGES_VERSION}
+spack repo add --scope site --name builtin https://github.com/${SPACKPACKAGES_ORGREPO}.git ${SPACKPACKAGES_ROOT}
+spack repo update --scope site --tag ${SPACKPACKAGES_VERSION} builtin
 if [ -n "${SPACKPACKAGES_CHERRYPICKS}" ] ; then
   SPACKPACKAGES_CHERRYPICKS=$(git -C ${SPACKPACKAGES_ROOT} rev-list --topo-order ${SPACKPACKAGES_CHERRYPICKS} | grep -m $(echo ${SPACKPACKAGES_CHERRYPICKS} | wc -w)  "${SPACKPACKAGES_CHERRYPICKS}" | tac)
   eval "declare -A SPACKPACKAGES_CHERRYPICKS_FILES_ARRAY=(${SPACKPACKAGES_CHERRYPICKS_FILES})"
@@ -210,7 +210,6 @@ if [ -n "${SPACKPACKAGES_CHERRYPICKS}" ] ; then
   done
 fi
 git -C ${SPACKPACKAGES_ROOT} gc --prune=all --aggressive
-spack repo add --scope site "${SPACKPACKAGES_ROOT}/repos/spack_repo/builtin"
 EOF
 
 ## Setup build configuration