diff --git a/eic-spack.sh b/eic-spack.sh
index d5fef3e558e1f341d07b64eb9cc8411853fc6f9a..faa1a438c8727bed98b571b778decdd9765307e7 100644
--- a/eic-spack.sh
+++ b/eic-spack.sh
@@ -3,11 +3,13 @@ EICSPACK_ORGREPO="eic/eic-spack"
 
 ## EIC spack github version, e.g. v0.19.7 or commit hash
 ## note: nightly builds will use e.g. releases/v0.19
-EICSPACK_VERSION="dd4hep-pr1161"
+EICSPACK_VERSION="v0.20.18"
 
 ## Space-separated list of eic-spack cherry-picks
 read -r -d '' EICSPACK_CHERRYPICKS <<- \
 --- || true
+e976b3790a2fe6193d58484c473110bc8d089ee4
+3913a77446e4318962e546eb3159e7127967c860
 ---
 ## Ref: https://github.com/eic/eic-spack/commit/[hash]
 ## [hash]: [description]