diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6b864a3d..4c77ab5e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -324,10 +324,8 @@ jug_dev:
                    --build-arg INTERNAL_TAG=${INTERNAL_TAG}
                    --build-arg SPACK_ORGREPO=${SPACK_ORGREPO}
                    --build-arg SPACK_VERSION=${SPACK_VERSION}
-                   --build-arg SPACK_CHERRYPICKS="${SPACK_CHERRYPICKS}"
                    --build-arg EICSPACK_ORGREPO=${EICSPACK_ORGREPO}
                    --build-arg EICSPACK_VERSION=${EICSPACK_VERSION}
-                   --build-arg EICSPACK_CHERRYPICKS="${EICSPACK_CHERRYPICKS}"
                    --build-arg S3_ACCESS_KEY=${S3_ACCESS_KEY}
                    --build-arg S3_SECRET_KEY=${S3_SECRET_KEY}
                    --build-arg JUG_VERSION=${EXPORT_TAG}-${BUILD_TYPE}-$(git rev-parse HEAD)
diff --git a/containers/jug/dev.Dockerfile b/containers/jug/dev.Dockerfile
index 1ddbced2..c7741b96 100644
--- a/containers/jug/dev.Dockerfile
+++ b/containers/jug/dev.Dockerfile
@@ -30,18 +30,13 @@ EOF
 
 ## Setup spack
 ENV SPACK_ROOT=/opt/spack
-ARG SPACK_ORGREPO="spack/spack"
-ARG SPACK_VERSION="releases/v0.20"
-ARG SPACK_CHERRYPICKS=""
+ARG SPACK_ORGREPO="eic/spack"
+ARG SPACK_VERSION="releases/v0.21.0"
 ADD https://api.github.com/repos/${SPACK_ORGREPO}/commits/${SPACK_VERSION} /tmp/spack.json
 RUN <<EOF
 git config --global advice.detachedHead false
 git clone --filter=tree:0 https://github.com/${SPACK_ORGREPO}.git ${SPACK_ROOT}
 git -C ${SPACK_ROOT} checkout ${SPACK_VERSION}
-if [ -n "${SPACK_CHERRYPICKS}" ] ; then
-  SPACK_CHERRYPICKS=$(git -C ${SPACK_ROOT} rev-list --topo-order ${SPACK_CHERRYPICKS} | grep -m $(echo ${SPACK_CHERRYPICKS} | wc -w)  "${SPACK_CHERRYPICKS}" | tac)
-  git -C ${SPACK_ROOT} cherry-pick -n ${SPACK_CHERRYPICKS}
-fi
 ln -s $SPACK_ROOT/share/spack/docker/entrypoint.bash /usr/bin/docker-shell
 ln -s $SPACK_ROOT/share/spack/docker/entrypoint.bash /usr/bin/interactive-shell
 ln -s $SPACK_ROOT/share/spack/docker/entrypoint.bash /usr/bin/spack-env
@@ -94,15 +89,11 @@ EOF
 ENV EICSPACK_ROOT=${SPACK_ROOT}/var/spack/repos/eic-spack
 ARG EICSPACK_ORGREPO="eic/eic-spack"
 ARG EICSPACK_VERSION="$SPACK_VERSION"
-ARG EICSPACK_CHERRYPICKS=""
 ADD https://api.github.com/repos/${EICSPACK_ORGREPO}/commits/${EICSPACK_VERSION} /tmp/eic-spack.json
 RUN <<EOF
 set -e
 git clone --filter=tree:0 https://github.com/${EICSPACK_ORGREPO}.git ${EICSPACK_ROOT}
 git -C ${EICSPACK_ROOT} checkout ${EICSPACK_VERSION}
-if [ -n "${EICSPACK_CHERRYPICKS}" ] ; then
-  git -C ${EICSPACK_ROOT} cherry-pick -n ${EICSPACK_CHERRYPICKS}
-fi
 spack repo add --scope site "${EICSPACK_ROOT}"
 EOF
 
diff --git a/eic-spack.sh b/eic-spack.sh
index d77d563d..ca9890c1 100644
--- a/eic-spack.sh
+++ b/eic-spack.sh
@@ -3,11 +3,4 @@ EICSPACK_ORGREPO="eic/eic-spack"
 
 ## EIC spack commit hash or github version, e.g. v0.19.7
 ## note: nightly builds could use a branch e.g. releases/v0.19
-EICSPACK_VERSION="bc6a4382636dd8c8bcd8c665163840815d48a25e"
-
-## Space-separated list of eic-spack cherry-picks
-read -r -d '' EICSPACK_CHERRYPICKS <<- \
---- || true
----
-## Ref: https://github.com/eic/eic-spack/commit/[hash]
-## [hash]: [description]
+EICSPACK_VERSION="bc6a4382636dd8c8bcd8c665163840815d48a25e"
\ No newline at end of file
diff --git a/spack.sh b/spack.sh
index 26526917..bbb96d02 100644
--- a/spack.sh
+++ b/spack.sh
@@ -1,53 +1,6 @@
 ## Spack organization and repository, e.g. spack/spack
-SPACK_ORGREPO="spack/spack"
+SPACK_ORGREPO="eic/spack"
 
-## Spack github version, e.g. v0.18.1 or commit hash
-## note: nightly builds will use e.g. releases/v0.19
-SPACK_VERSION="v0.21.0"
-
-## Space-separated list of spack cherry-picks
-read -r -d '' SPACK_CHERRYPICKS <<- \
---- || true
-ed8ecc469e7b87842a876323878831e301f136a2
-53a45c820c983867e8b05cab3df34e98b468f932
-4991a60eacb5df289383f755e40702b720ed0513
-81e73b4dd4ea0bf6c6947359d3cee9d4270df13d
-c485709f625429a88a184a099373d76c9438f8e3
-6f08daf67020289e6a5ed1df9783ac5b2919e477
-50051b56199992eb4395b8ff22913c1995311a8c
-f01774f1d41781bc4b9e5abb5469e234168da663
-16f4c53cd4cfb4bc6c9390f6e65217fc9ccc58c9
-d171f314c77ba61b3cd780f159afe6abced5707d
-b111064e221aae83e62226672cd8bf9a7524423d
-3c54177c5d9032cb36cf154b553d739cbeb2d024
-c07ddf83c32b7129247fe90eed486dd844047087
-00875fbc749a7e4e979c35d59c0a8d60d32d4cd7
-64cf67822471ec2d3df2625a6d713f80cbe7ff43
-7a0c4e8017033430e5f15ed628be6b539e935ba9
-48fcfda1e7c1781cab4cada6d099823b263ab0cc
-8c29e90fa9962f4a44f39f47217b46c85176af28
-1255620a14afa3ad4aad681a847a3a1704141976
-0fed2d66bf0eec799707dd1b88ac9419f6ae14e1
----
-## Ref: https://github.com/spack/spack/commit/[hash]
-## [hash]: [description]
-## ed8ecc469e7b87842a876323878831e301f136a2: podio: Add the latest tag (0.17.2)
-## 53a45c820c983867e8b05cab3df34e98b468f932: docker entrypoint.sh: fail multi-line RUN on first error with set -e
-## 4991a60eacb5df289383f755e40702b720ed0513: podio: Add latest tag 0.17.3
-## 81e73b4dd4ea0bf6c6947359d3cee9d4270df13d: root: new version 6.30.00
-## c485709f625429a88a184a099373d76c9438f8e3: iwyu: new versions up 0.21 (depends_on llvm-17)
-## 6f08daf67020289e6a5ed1df9783ac5b2919e477: root: add a webgui patch
-## 50051b56199992eb4395b8ff22913c1995311a8c: geant4: new version 11.1.3
-## f01774f1d41781bc4b9e5abb5469e234168da663: hepmc3: fix from_variant -> self.define
-## 16f4c53cd4cfb4bc6c9390f6e65217fc9ccc58c9: py-bokeh: new version 3.3.1, and supporting packages
-## d171f314c77ba61b3cd780f159afe6abced5707d: py-pygithub: new versions, dependencies
-## b111064e221aae83e62226672cd8bf9a7524423d: py-htgettoken: use os.environ, avoid AttributeError
-## 3c54177c5d9032cb36cf154b553d739cbeb2d024: edm4hep: add latest tag for 0.10.2
-## c07ddf83c32b7129247fe90eed486dd844047087: py-torch: set env OpenBLAS_HOME
-## 00875fbc749a7e4e979c35d59c0a8d60d32d4cd7: py-torch: patch for ${OpenBLAS_HOME}/include/openblas
-## 64cf67822471ec2d3df2625a6d713f80cbe7ff43: py-torch: move patch before def patch
-## 7a0c4e8017033430e5f15ed628be6b539e935ba9: acts: new versions 31.*
-## 48fcfda1e7c1781cab4cada6d099823b263ab0cc: setup-env.sh: if exe contains qemu, use /proc/$$/comm instead
-## 8c29e90fa9962f4a44f39f47217b46c85176af28: Build cache: make signed/unsigned a mirror property
-## 1255620a14afa3ad4aad681a847a3a1704141976: Fix infinite recursion when computing concretization errors
-## 0fed2d66bf0eec799707dd1b88ac9419f6ae14e1: (py-)onnx: new version 1.14.{0,1}, 1.15.0
+## Spack commit hash or github version, e.g. v0.21.0
+## note: nightly builds will use e.g. releases/v0.21.0
+SPACK_VERSION="8316d7518b2a75dd8d7a0b64d84157394dc46644"
\ No newline at end of file