diff --git a/.github/workflows/dunedaq-develop-cpp-ci.yml b/.github/workflows/dunedaq-develop-cpp-ci.yml
index cb376c0e..a4de57a0 100644
--- a/.github/workflows/dunedaq-develop-cpp-ci.yml
+++ b/.github/workflows/dunedaq-develop-cpp-ci.yml
@@ -27,10 +27,10 @@ jobs:
     strategy:
       matrix:
         include:
-          - image: "ghcr.io/dune-daq/sl7-slim-externals:spack-dev"
+          - image: "ghcr.io/dune-daq/sl7-slim-externals:spack-dev-split"
             os_name: "c7"
-          - image: "ghcr.io/dune-daq/c8-slim-externals:spack-dev"
-            os_name: "c8"
+          - image: "ghcr.io/dune-daq/alma9-slim-externals:spack-dev-split"
+            os_name: "al9"
     container:
       image: ${{ matrix.image }}
     defaults:
@@ -49,10 +49,14 @@ jobs:
         
     - name: setup dev area
       run: |
+          export REPO=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')
           source /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh
           setup_dbt latest|| true
-          dbt-create -n last_successful dev-${{ matrix.os_name }}
-          
+          release_name="last_fddaq"
+          #nd_config=$GITHUB_WORKSPACE/daq-release/configs/nddaq/nddaq-develop/release.yaml
+          #if grep -q "name: ${REPO}\n" $nd_config; then release_name="last_nddaq"; fi
+          dbt-create -n $release_name dev-${{ matrix.os_name }}
+
     - name: checkout package for CI
       uses: actions/checkout@v3
       with:
@@ -64,7 +68,7 @@ jobs:
           export REPO=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')
           cd $GITHUB_WORKSPACE/dev-${{ matrix.os_name }}
           source env.sh || true
-          spack unload $REPO
+          spack unload $REPO || true
           cp -pr $GITHUB_WORKSPACE/DUNE-DAQ/$REPO $GITHUB_WORKSPACE/dev-${{ matrix.os_name }}/sourcecode
           dbt-build
           #[[ $REPO == "daq-cmake" ]] && dbt-build || dbt-build --lint