diff --git a/.github/workflows/concretize.yaml b/.github/workflows/concretize.yaml
index f85201f6..e3587c09 100644
--- a/.github/workflows/concretize.yaml
+++ b/.github/workflows/concretize.yaml
@@ -39,14 +39,6 @@ jobs:
 
             name=$(echo "${{ github.event.repository.name }}" | tr '[:upper:]' '[:lower:]')
 
-            if [ "${{ matrix.build_type }}" = "release" ]; then
-                env=key4hep-release
-            elif [ "${{ matrix.build_type }}" = "nightly" ]; then
-                env=key4hep-nightly-opt
-            else
-                echo "Unknown build type"
-                exit 1
-            fi
 
             cd /
             ls -lah /
@@ -59,6 +51,15 @@ jobs:
             git checkout $(cat /${name}/.latest-commit)
             source /${name}/.cherry-pick
 
+            if [ "${{ matrix.build_type }}" = "release" ]; then
+                env=key4hep-release
+            elif [ "${{ matrix.build_type }}" = "nightly" ]; then
+                env=key4hep-nightly-opt
+                python3 ${name}/scripts/fetch_nightly_versions.py --path ${name}/environments/key4hep-common/packages.yaml --extra-path ${name}/environments/key4hep-nightly-opt/packages.yaml ""
+            else
+                echo "Unknown build type"
+                exit 1
+            fi
             cd /${name}/environments/${env}
             spack env activate .
             spack concretize