diff --git a/containers/debian/Dockerfile b/containers/debian/Dockerfile
index 0c85d2d0..44151e3b 100644
--- a/containers/debian/Dockerfile
+++ b/containers/debian/Dockerfile
@@ -119,7 +119,7 @@ fi
 # Install packages
 apt-get -yqq update
 apt-get -yqq install cpp${GCC} gcc${GCC} g++${GCC} gfortran${GCC}
-apt-get -yqq install clang${CLANG} clang-tidy${CLANG} clang-format${CLANG} libclang${CLANG}-dev libc++${CLANG}-dev
+apt-get -yqq install clang${CLANG} clang-tidy${CLANG} clang-format${CLANG} libclang${CLANG}-dev libc++${CLANG}-dev libedit-dev llvm${CLANG}-dev
 apt-get -yqq autoremove
 # Remove symlinks loop in nvidia/cuda:12.5.1-devel-ubuntu24.04
 rm -f /usr/bin/cpp /etc/alternatives/cpp
diff --git a/eic-spack.sh b/eic-spack.sh
index bfed8ed9..f0c466df 100644
--- a/eic-spack.sh
+++ b/eic-spack.sh
@@ -5,4 +5,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="8ee145fad9aa0b0f24751c91716827b859b8c2d1"
+EICSPACK_VERSION="e95447a59f560fedd6c6a2a91804a7ec925e50dc"
diff --git a/spack-environment/packages.yaml b/spack-environment/packages.yaml
index d9a05626..09ad121b 100644
--- a/spack-environment/packages.yaml
+++ b/spack-environment/packages.yaml
@@ -611,7 +611,7 @@ packages:
   root:
     require:
     - '@6.38.04'
-    - cxxstd=20 +fftw +fortran +gdml +http -ipo +mlp +python +root7 +tmva +tmva-sofie +x +xrootd +ssl
+    - cxxstd=20 ~builtin_llvm +fftw +fortran +gdml +http -ipo +mlp +python +root7 +tmva +tmva-sofie +x +xrootd +ssl
     - any_of: [+opengl +webgui, -opengl -webgui]
   sherpa:
     require:
diff --git a/spack-packages.sh b/spack-packages.sh
index f3d0cf64..4b30b22e 100644
--- a/spack-packages.sh
+++ b/spack-packages.sh
@@ -38,6 +38,10 @@ a77a7ed0d2630466cac71165026387b1381b058a
 88800eeac4ee97b7689b0a84d066e4f634f32b46
 d8271eec35998674d3c67c7613b010fa98519df3
 86e2acd247221d45f9944ac2f69518b8766baec3
+30e69adca31b9ba98e61c42b4126188911e3537c
+93acd58e1399d787dac69d61ecbbd1695c8a2bac
+ad4b252d254d49db587abd6fd06c375c71d27a01
+8cd9959e3fd4e54d79bbf75210e335ab842e1af0
 ---
 ## Optional hash table with comma-separated file list
 ## For these commits, the cherry-pick will be restricted to the listed files only.
@@ -73,3 +77,7 @@ read -r -d '' SPACKPACKAGES_CHERRYPICKS_FILES <<- \
 ## 88800eeac4ee97b7689b0a84d066e4f634f32b46: py-boto3: add v1.42.85 and py-botocore: add v1.42.85
 ## d8271eec35998674d3c67c7613b010fa98519df3: py-setuptools-scm: Earlier versions require setuptools-scm too
 ## 86e2acd247221d45f9944ac2f69518b8766baec3: py-boto3: add v1.43.17, updated dependencies
+## 30e69adca31b9ba98e61c42b4126188911e3537c: root: cleanup recipe since the minimum version is 6.28.00
+## 93acd58e1399d787dac69d61ecbbd1695c8a2bac: Miscellaneous package fixes
+## ad4b252d254d49db587abd6fd06c375c71d27a01: root: add v6.36.12
+## 8cd9959e3fd4e54d79bbf75210e335ab842e1af0: root: add builtin_llvm variant to allow external LLVM