diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8dc73bdb2948111cf0779c9895acd847ee27840b..b83dcbd20a7ef4cec20a637c09df8185b9a13801 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,9 +16,9 @@ variables:
   ## adc9f887eac78a81bb8189d603f4dc45ed3509c1: acts-dd4hep: new package; acts: new version
   ## 5bd44a795c76a61f0f9fbfeedcf7e917a0bf40b0: lcio, podio, edm4hep: add latest versions
 
-  ## Spack github version, e.g. v0.18 or commit hash
-  EICSPACK_VERSION: "d7606f67a36708dcc0c045a269621f4189345aad"
-  ## Space-separated list of eic=spack cherry-picks
+  ## Spack github version, e.g. v0.18 branch, v0.18.1 tag, or commit hash
+  EICSPACK_VERSION: "v0.18.3"
+  ## Space-separated list of eic-spack cherry-picks
   EICSPACK_CHERRYPICKS: "" 
 
   ## We need to enable Docker Buildkit to use cache mounts and better
diff --git a/spack.yaml b/spack.yaml
index 26d5d31664351d06543f79a664ff448fb36f9472..b4528544b2e9584bcbc5c9da11fb25335a9769ab 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -8,7 +8,7 @@ spack:
     - dawn@3_91a
     - dawncut@1_54a
     - dd4hep@1.20.2 +ddg4 -ddcad +hepmc3 +ipo +lcio
-    - edm4hep@0.4.1 cxxstd=17 -ipo
+    - edm4hep@0.6 cxxstd=17 -ipo
     - eigen@3.4.0
     - emacs@27.2 toolkit=athena
     - fastjet@3.3.4
@@ -26,7 +26,7 @@ spack:
     - nlohmann-json@3.10.5
     - opencascade@7.6.0
     - pkg-config@0.29.2
-    - podio@0.14.1 build_type=RelWithDebInfo
+    - podio@0.15 build_type=RelWithDebInfo
     - pythia8@8.306 +fastjet
     - python@3.10.4
     - py-numpy@1.22.3