diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 167a069b9c3d88db7a7442290f78145a5cbd9947..eb05c46a7bac6713182129d8750a4a9acc75ed12 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -200,9 +200,9 @@ sync-gitlab-spack-instance:
     - read-write
   image: $GITLAB_BUILD_ENV_DOCKER_IMAGE
   variables:
-    SPACK_NFS_ENV: $CI_COMMIT_BRANCH
     SPACK_REPO_PATH: $SPACK_PATH_GITLAB/ebrains-spack-builds
   script:
+    - SPACK_NFS_ENV=${CI_COMMIT_BRANCH//./-}
     # get latest state of EBRAINS repo
     - rm -rf $SPACK_REPO_PATH && cp -r $CI_PROJECT_DIR $SPACK_REPO_PATH
     # run installation script
@@ -233,11 +233,11 @@ test-gitlab-spack-instance:
     - read-write
   image: $GITLAB_BUILD_ENV_DOCKER_IMAGE
   variables:
-    SPACK_NFS_ENV: $CI_COMMIT_BRANCH
     SPACK_REPO_PATH: $SPACK_PATH_GITLAB/ebrains-spack-builds
     SPACK_USER_CACHE_PATH: $SPACK_PATH_GITLAB/spack/.spack
     SPACK_USER_CONFIG_PATH: $SPACK_PATH_GITLAB/spack/.spack
   script:
+    - SPACK_NFS_ENV=${CI_COMMIT_BRANCH//./-}
     - source $SPACK_PATH_GITLAB/spack/share/spack/setup-env.sh
     - spack env activate $SPACK_NFS_ENV
     # TODO: run all tests when test dependency issue is fixed
diff --git a/packages/.gitkeep b/packages/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/site-config/g100/.gitkeep b/site-config/g100/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/site-config/g100/cineca_setup.sh b/site-config/g100/cineca_setup.sh
new file mode 100755
index 0000000000000000000000000000000000000000..5e0b6c0cf01b2247bc0b4f3b956339a19cb0083e
--- /dev/null
+++ b/site-config/g100/cineca_setup.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+module load profile/global
+module load spack/preprod-0.18.1-01
+export SYSTEMNAME='g100'
+#mkdir -p ../../../ebrains-spack-builds_cineca
+#spack-python ../ymerge.py ../../spack.yaml spack.yaml > ../../../ebrains-spack-builds_cineca/spack.yaml
+#ln -f -s $(pwd)/../../site-config ../../../ebrains-spack-builds_cineca/site-config
+cd ..
+cd ..
+cd ..
+spack env activate ebrains-spack-builds_cineca
+#spack concretize -f 2>&1 | tee cineca_setup.log
+rm ebrains-spack-builds_cineca/spack.lock
+spack install --test root 2>&1 | tee cineca_install.log
diff --git a/site-config/g100/config.yaml b/site-config/g100/config.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2d77f47f1a1d67c5b835845798db9159a663498e
--- /dev/null
+++ b/site-config/g100/config.yaml
@@ -0,0 +1,3 @@
+config:
+  install_tree:
+    root: /g100_work/PROJECTS/spack/preprod/01/ccsdeploy/spack_deploy/envs/ebrains_23.02_pmi/install
diff --git a/site-config/g100/modules.yaml b/site-config/g100/modules.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..98859a35bc64708f065165ba1607c71f4dd25cd1
--- /dev/null
+++ b/site-config/g100/modules.yaml
@@ -0,0 +1,4 @@
+modules:
+  default:
+    roots:
+      tcl: /g100_work/PROJECTS/spack/preprod/01/ccsdeploy/spack_deploy/envs/ebrains_23.02_pmi/modules
diff --git a/site-config/g100/packages.yaml b/site-config/g100/packages.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..9a2ed8b3d21e577edb821caca7184d5fd888844d
--- /dev/null
+++ b/site-config/g100/packages.yaml
@@ -0,0 +1,31 @@
+packages:
+    all:
+        # collab-specific settings
+        target: [x86_64]
+        compiler: [gcc@10.2.0]
+    openmpi:
+        # version from spack 0.17 with pmi
+        externals:
+        - spec: "openmpi@4.1.1"
+          prefix: /g100_work/PROJECTS/spack/v0.17/prod/0.17.1/install/0.17/linux-centos8-cascadelake/gcc-10.2.0/openmpi-4.1.1-xcbaflrhirzvtiy3y5cnglgyfunavtx3
+          buildable: false
+    python:
+        # collab-specific settings
+        version: [3.8.11]
+    r:
+        version: [4.1.3]
+        # EM: +X fixes build for collab
+        variants: [~X]
+    py-torch:
+        # ECM: keep at latest w.r.t. tracked upstream spack
+        version: [1.11.0]
+        # ECM: No cuda nor rocm in collab VMs.
+        #      I did not try to minimize the specification any further.
+        variants: [~cuda~rocm~valgrind~mkldnn~mpi~gloo+tensorpipe~onnx_ml]
+    py-jax:
+        # ECM: No cuda in collab VMs.
+        variants: [~cuda]
+    py-jaxlib:
+        # ECM: No cuda in collab VMs.
+        variants: [~cuda]
+
diff --git a/site-config/g100/repo.yaml b/site-config/g100/repo.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2f235ebc293beb06c5c33738bb7fce4145f7ee57
--- /dev/null
+++ b/site-config/g100/repo.yaml
@@ -0,0 +1,3 @@
+repo:
+  namespace: ebrains-spack-builds
+
diff --git a/site-config/g100/spack.yaml b/site-config/g100/spack.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ff94954d8a846c80b15490817cbe20defc424873
--- /dev/null
+++ b/site-config/g100/spack.yaml
@@ -0,0 +1,10 @@
+spack:
+  specs:
+    - openssl@1.1.1g~docs~shared certs=system
+    - openmpi@4.1.1
+    - openblas
+    - r
+  view: true
+  repos:
+    - ../ebrains-spack-builds
+
diff --git a/site-config/hsmcompute/.gitkeep b/site-config/hsmcompute/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/site-config/hsmcompute/compilers.yaml b/site-config/hsmcompute/compilers.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..49dbb991316a716896d43bebac8a6ce21ea08ca2
--- /dev/null
+++ b/site-config/hsmcompute/compilers.yaml
@@ -0,0 +1,14 @@
+compilers:
+- compiler:
+    spec: gcc@10.1.0
+    paths:
+      cc: /apps/GCC/10.1.0/bin/gcc
+      cxx: /apps/GCC/10.1.0/bin/g++
+      f77: /apps/GCC/10.1.0/bin/gfortran
+      fc: /apps/GCC/10.1.0/bin/gfortran
+    flags: {}
+    operating_system: rhel8
+    target: ppc64le
+    modules: []
+    environment: {}
+    extra_rpaths: []
diff --git a/site-config/hsmcompute/packages.yaml b/site-config/hsmcompute/packages.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5e27238eb081e6c3ffa0b182a0bcef737b862120
--- /dev/null
+++ b/site-config/hsmcompute/packages.yaml
@@ -0,0 +1,40 @@
+packages:
+  cuda:
+    buildable: false
+    compiler: []
+    externals:
+    - modules:
+      - cuda/11.3
+      spec: cuda@11.3.58
+    providers: {}
+    target: []
+    variants: +allow-unsupported-compilers
+    version:
+    - 11.3.58
+  nccl:
+    buildable: false
+    externals:
+    - modules:
+      - nvhpc/21.5
+      spec: nccl@2.8.3 +cuda cuda_arch=72
+      prefix: /apps/NVHPC/2021.215/Linux_ppc64le/21.5/comm_libs/nccl
+    version:
+    - 2.13.4
+  cudnn:
+    buildable: false
+    externals:
+    - modules:
+      - cudnn/8.6.0
+      spec: cudnn@8.6.0
+      prefix: /apps/CUDNN/8.6.0
+    version:
+    - 8.6.0
+  python:
+    version: [3.8.11]
+  all:
+    target: [ppc64le]
+    compiler: [gcc@10.1.0]
+    providers:
+      blas: [essl, openblas, netlib-lapack]
+      lapack: [openblas, netlib-lapack]
+      scalapack: [netlib-scalapack]
diff --git a/site-config/hsmcompute/repos.yaml b/site-config/hsmcompute/repos.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..4e5866275c877ad32447bd676faf26206c30a190
--- /dev/null
+++ b/site-config/hsmcompute/repos.yaml
@@ -0,0 +1,2 @@
+repos:
+- /apps/SPACK/0.19.2/spack-ebrains-releases/ebrains-23-06-stable-hsmcompute
diff --git a/site-config/hsmcompute/spack.yaml b/site-config/hsmcompute/spack.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8bd217ba78cdae8c293e5299b4927c1c374ade1e
--- /dev/null
+++ b/site-config/hsmcompute/spack.yaml
@@ -0,0 +1,4 @@
+spack:
+  specs:
+    - apbs ^openblas
+    - harfbuzz@4.2.1
diff --git a/site-config/jusuf/.gitkeep b/site-config/jusuf/.gitkeep
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000