diff --git a/env/rhel7/ffbidx/spack.yaml b/env/rhel7/ffbidx/spack.yaml
deleted file mode 100644
index 852fdab..0000000
--- a/env/rhel7/ffbidx/spack.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-spack:
-  upstreams:
-    spack-instance-1:
-      install_tree: /afs/psi.ch/sys/spack-rhel7/spack/opt/spack
-  config:
-    build_stage:
-    - /scratch/$user/spack-stage
-    install_tree:
-      root: /data/user/$user/spack-install
-  concretizer:
-    unify: true
-  include:
-  - ../sysconfigs/modules.yaml
-  - ../sysconfigs/compilers.yaml
-  - ../sysconfigs/packages.yaml
-  repos:
-  - ../../../
-  specs:
-  - openblas
-  - ffbidx@main%gcc@12.1.0+python+simple_data_files+simple_data_indexer+test_all cuda_arch=60
-  develop:
-    ffbidx:
-      path: /scratch/$user/spack-dev/fast-feedback-indexer
-      spec: ffbidx@main+python+simple_data_files+simple_data_indexer+test_all cuda_arch=60
diff --git a/env/rhel7/hyquas/spack.yaml b/env/rhel7/hyquas/spack.yaml
deleted file mode 100644
index e240fa5..0000000
--- a/env/rhel7/hyquas/spack.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-spack:
-  upstreams:
-    spack-instance-1:
-      install_tree: /afs/psi.ch/sys/spack-rhel7/spack/opt/spack
-  config:
-    build_stage:
-    - /scratch/$user/spack-stage
-    install_tree:
-      root: /data/user/$user/spack-install
-  concretizer:
-    unify: when_possible
-  include:
-  - ../sysconfigs/modules.yaml
-  - ../sysconfigs/compilers.yaml
-  - ../sysconfigs/packages.yaml
-  repos:
-  - ../../../
-  specs:
-  - openmpi@4.0.5%gcc
-  - cuda@11.0.2
-  - hyquas@main%gcc@9.5.0+cuda cuda_arch=70 ~mpi+schedule+use_double+micro_bench+eval_pp~disable_assert
-    backend=mix mat_size=7
-  view: false
-  develop:
-    hyquas:
-      path: /scratch/$user/spack-dev/HyQuas
-      spec: hyquas@main
diff --git a/env/rhel7/py-hiqsimulator/spack.yaml b/env/rhel7/py-hiqsimulator/spack.yaml
deleted file mode 100644
index b82c774..0000000
--- a/env/rhel7/py-hiqsimulator/spack.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-spack:
-  upstreams:
-    spack-instance-1:
-      install_tree: /afs/psi.ch/sys/spack-rhel7/spack/opt/spack
-  config:
-    build_stage:
-    - /scratch/$user/spack-stage
-    install_tree:
-      root: /data/user/$user/spack-install
-  concretizer:
-    unify: true
-  include:
-  - ../sysconfigs/modules.yaml
-  - ../sysconfigs/compilers.yaml
-  - ../sysconfigs/packages.yaml
-  repos:
-  - ../../../
-  specs:
-  - openmpi%gcc@12.1.0
-  - py-hiqsimulator@develop%gcc@12.1.0
-  develop:
-    py-hiqsimulator:
-      path: /scratch/$user/spack-dev/HiQsimulator
-      spec: py-hiqsimulator@develop%gcc@12.1.0
-  view: false
diff --git a/env/rhel7/x86_64/admin/stable/spack.yaml b/env/rhel7/x86_64/admin/stable/spack.yaml
new file mode 100644
index 0000000..38ee16f
--- /dev/null
+++ b/env/rhel7/x86_64/admin/stable/spack.yaml
@@ -0,0 +1,16 @@
+spack:
+  concretizer:
+    unify: false
+  config:
+    allow_sgid: false
+    build_stage:
+      - $spack/user/$user/spack-stage
+    install_tree:
+      root: $spack/opt/spack/stable
+    include_concrete:
+    - $spack/spack-psi/env/$os/$target_family/admin/unstable
+    include:
+    - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
+    - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
+    specs:
+  view: false
diff --git a/env/rhel7/x86_64/admin/testing/spack.yaml b/env/rhel7/x86_64/admin/testing/spack.yaml
new file mode 100644
index 0000000..be294ed
--- /dev/null
+++ b/env/rhel7/x86_64/admin/testing/spack.yaml
@@ -0,0 +1,23 @@
+spack:
+  concretizer:
+    unify: false
+  config:
+    allow_sgid: false
+    build_stage:
+      - $spack/user/$user/spack-stage
+    install_tree:
+      root: $spack/opt/spack/testing
+    upstreams:
+      spack-instance-1:
+        install_tree: $spack/opt/spack/stable
+      spack-instance-2:
+        install_tree: $spack/opt/spack/unstable
+    include:
+    - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
+    - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
+    specs:
+      - cp2k@2024.1%gcc~cuda
+      - opal@master%gcc
+      - opal@master%gcc ^openmpi
+      - py-alphafold@2.3.2%gcc~cuda
+  view: false
diff --git a/env/rhel7/x86_64/admin/unstable/spack.yaml b/env/rhel7/x86_64/admin/unstable/spack.yaml
new file mode 100644
index 0000000..8f09ecf
--- /dev/null
+++ b/env/rhel7/x86_64/admin/unstable/spack.yaml
@@ -0,0 +1,19 @@
+spack:
+  concretizer:
+    unify: false
+  config:
+    allow_sgid: false
+    build_stage:
+      - $spack/user/$user/spack-stage
+    install_tree:
+      root: $spack/opt/spack/unstable
+    upstreams:
+      spack-instance-1:
+        install_tree: $spack/opt/spack/stable
+    include_concrete:
+    - $spack/spack-psi/env/$os/$target_family/admin/testing
+    include:
+    - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
+    - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
+    specs:
+  view: false
diff --git a/env/rhel7/x86_64/sysconfigs/compilers.yaml b/env/rhel7/x86_64/sysconfigs/compilers.yaml
new file mode 100644
index 0000000..70aff34
--- /dev/null
+++ b/env/rhel7/x86_64/sysconfigs/compilers.yaml
@@ -0,0 +1,14 @@
+compilers:
+  - compiler:
+      environment: {}
+      extra_rpaths: []
+      flags: {}
+      modules: []
+      operating_system: rhel7
+      paths:
+        cc: /usr/bin/gcc
+        cxx: /usr/bin/g++
+        f77: /usr/bin/gfortran
+        fc: /usr/bin/gfortran
+      spec: gcc@4.8.5
+      target: x86_64
diff --git a/env/rhel7/x86_64/sysconfigs/packages.yaml b/env/rhel7/x86_64/sysconfigs/packages.yaml
new file mode 100644
index 0000000..d1fd404
--- /dev/null
+++ b/env/rhel7/x86_64/sysconfigs/packages.yaml
@@ -0,0 +1,195 @@
+---
+packages:
+  all:
+    compiler: [gcc@4.8.5, nvhpc]
+    providers:
+      blas: [openblas, nvhpc]
+      lapack: [openblas, nvhpc]
+      mpi: [openmpi]
+      pkgconfig: [pkg-config]
+    target: [x86_64]
+    # Default GPU arch
+    variants:
+      - cuda_arch=60
+  autoconf:
+    require: '%gcc@4.8.5'
+  automake:
+    require: '%gcc@4.8.5'
+  berkeley-db:
+    require: '%gcc@4.8.5'
+  binutils:
+    require: '%gcc@4.8.5'
+  boost:
+    require: '%gcc'
+  bzip2:
+    require: '%gcc@4.8.5'
+  ca-certificates-mozilla:
+    require: '%gcc@4.8.5'
+  cairo:
+    require: '%gcc@4.8.5'
+  cmake:
+    require: '%gcc'
+  coreutils:
+    require: '%gcc@4.8.5'
+  cpio:
+    require: '%gcc'
+  ctffind:
+    require: '%gcc'
+  curl:
+    require: '%gcc@4.8.5'
+  cvs:
+    require: '%gcc@4.8.5'
+  diffutils:
+    require: '%gcc@4.8.5'
+  doxygen:
+    require: '%gcc@4.8.5'
+  expat:
+    require: '%gcc@4.8.5'
+  file:
+    require: '%gcc@4.8.5'
+  findutils:
+    require: '%gcc@4.8.5'
+  flex:
+    require: '%gcc@4.8.5'
+  fltk:
+    require: '%gcc@4.8.5'
+  fontconfig:
+    require: '%gcc@4.8.5'
+  gams:
+    require: '%gcc@4.8.5'
+  gawk:
+    require: '%gcc@4.8.5'
+  gdbm:
+    require: '%gcc@4.8.5'
+  gettext:
+    require: '%gcc@4.8.5'
+  ghostscript:
+    require: '%gcc@4.8.5'
+  git:
+    require: '%gcc@4.8.5'
+  glew:
+    require: '%gcc@4.8.5'
+  gmake:
+    require: '%gcc@4.8.5'
+  groff:
+    require: '%gcc@4.8.5'
+  harfbuzz:
+    require: '%gcc@4.8.5'
+  hcoll:
+    require: '%gcc@4.8.5'
+  libbsd:
+    require: '%gcc@4.8.5'
+  libcroco:
+    require: '%gcc@4.8.5'
+  libepoxy:
+    require: '%gcc@4.8.5'
+  libevent:
+    require: '%gcc@4.8.5'
+  libfuse:
+    require: '%gcc@4.8.5'
+  libice:
+    require: '%gcc@4.8.5'
+  libiconv:
+    require: '%gcc@4.8.5'
+  libidn2:
+    require: '%gcc@4.8.5'
+  libjpeg-turbo:
+    require: '%gcc@4.8.5'
+  libmd:
+    require: '%gcc@4.8.5'
+  libpciaccess:
+    require: '%gcc@4.8.5'
+  libpthread:
+    require: '%gcc@4.8.5'
+  libpthread-stubs:
+    require: '%gcc@4.8.5'
+  libreadline:
+    require: '%gcc@4.8.5'
+  librsvg:
+    require: '%gcc@4.8.5'
+  libsigsegv:
+    require: '%gcc@4.8.5'
+  libtiff:
+    require: '%gcc@4.8.5'
+  libtool:
+    require: '%gcc@4.8.5'
+  libx11:
+    require: '%gcc@4.8.5'
+  libxext:
+    require: '%gcc@4.8.5'
+  libxft:
+    require: '%gcc@4.8.5'
+  libxml2:
+    require: '%gcc@4.8.5'
+  libxpm:
+    require: '%gcc@4.8.5'
+  libxt:
+    require: '%gcc@4.8.5'
+  m4:
+    require: '%gcc@4.8.5'
+  ncurses:
+    require: '%gcc@4.8.5'
+  ninja:
+    require: '%gcc@4.8.5'
+  nlohmann-json:
+    require: '%gcc@4.8.5'
+  numactl:
+    require: '%gcc@4.8.5'
+  openblas:
+    require: '%gcc'
+  openmpi:
+    require:
+      - schedulers=slurm fabrics=auto +pmi +cxx +cxx_exceptions +cuda +legacylaunchers
+  openssh:
+    require: '%gcc@4.8.5'
+  openssl:
+    require: '%gcc@4.8.5'
+  pcre2:
+    require: '%gcc@4.8.5'
+  perl:
+    require: '%gcc@4.8.5'
+  pkg-config:
+    require: '%gcc@4.8.5'
+  py-fypp:
+    require: '%gcc@4.8.5'
+  python:
+    require: '%gcc@4.8.5'
+  readline:
+    require: '%gcc@4.8.5'
+  rsync:
+    require: '%gcc@4.8.5'
+  ruby:
+    require: '%gcc@4.8.5'
+  sed:
+    require: '%gcc@4.8.5'
+  slurm:
+    buildable: false
+    externals:
+      - prefix: /usr
+        spec: slurm@23-11-0-1 +pmix +hwloc +hdf5 +mariadb +pam
+  sqlite:
+    require: '%gcc@4.8.5'
+  subversion:
+    require: '%gcc@4.8.5'
+  tar:
+    require: '%gcc@4.8.5'
+  texinfo:
+    require: '%gcc@4.8.5'
+  unuran:
+    require: '%gcc@4.8.5'
+  util-linux-uuid:
+    require: '%gcc@4.8.5'
+  util-macros:
+    require: '%gcc@4.8.5'
+  valgrind:
+    require: '%gcc@4.8.5'
+  xerces-c:
+    require: '%gcc@4.8.5'
+  xxhash:
+    require: '%gcc@4.8.5'
+  xz:
+    require: '%gcc@4.8.5'
+  zlib:
+    require: '%gcc@4.8.5'
+  zstd:
+    require: '%gcc@4.8.5'
diff --git a/env/rhel7/x86_64/users/stable/spack.yaml b/env/rhel7/x86_64/users/stable/spack.yaml
new file mode 100644
index 0000000..d464192
--- /dev/null
+++ b/env/rhel7/x86_64/users/stable/spack.yaml
@@ -0,0 +1,17 @@
+spack:
+  concretizer:
+    unify: false
+  config:
+    allow_sgid: false
+    build_stage:
+      - $spack/user/$user/spack-stage
+    install_tree:
+      root: $spack/user/$user/spack-install
+    upstreams:
+      spack-instance-1:
+        install_tree: $spack/opt/spack/stable
+    include:
+    - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
+    - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
+    specs:
+  view: false
diff --git a/env/rhel7/x86_64/users/unstable/spack.yaml b/env/rhel7/x86_64/users/unstable/spack.yaml
new file mode 100644
index 0000000..62b3bd1
--- /dev/null
+++ b/env/rhel7/x86_64/users/unstable/spack.yaml
@@ -0,0 +1,19 @@
+spack:
+  concretizer:
+    unify: false
+  config:
+    allow_sgid: false
+    build_stage:
+      - $spack/user/$user/spack-stage
+    install_tree:
+      root: $spack/user/$user/spack-install
+    upstreams:
+      spack-instance-1:
+        install_tree: $spack/opt/spack/stable
+      spack-instance-2:
+        install_tree: $spack/opt/spack/unstable
+    include:
+    - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
+    - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
+    specs:
+  view: false