diff --git a/env/rhel8/x86_64/admin/stable/spack.yaml b/env/rhel8/x86_64/admin/stable/spack.yaml
index 5fa2efd..c1a9581 100644
--- a/env/rhel8/x86_64/admin/stable/spack.yaml
+++ b/env/rhel8/x86_64/admin/stable/spack.yaml
@@ -13,8 +13,8 @@ spack:
     - gcc_12.3.0_openmpi:
       - opal@master/l4dkgyf
   include:
-  - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/packages.yaml
-  - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/compilers.yaml
+  - $spack/../spack-psi/env/rhel8/$target_family/sysconfigs/packages.yaml
+  - $spack/../spack-psi/env/rhel8/$target_family/sysconfigs/compilers.yaml
   mirrors:
     local_psi: file:///afs/psi.ch/software/spack/testing
   modules:
diff --git a/env/rhel8/x86_64/admin/testing/spack.yaml b/env/rhel8/x86_64/admin/testing/spack.yaml
index fcc3df9..2665576 100644
--- a/env/rhel8/x86_64/admin/testing/spack.yaml
+++ b/env/rhel8/x86_64/admin/testing/spack.yaml
@@ -8,8 +8,8 @@ spack:
       # Strongly adviced to avoid problems with buildcaches
       padded_length: 256
   include:
-    - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/packages.yaml
-    - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/compilers.yaml
+    - $spack/../spack-psi/env/rhel8/$target_family/sysconfigs/packages.yaml
+    - $spack/../spack-psi/env/rhel8/$target_family/sysconfigs/compilers.yaml
   mirrors:
     local_psi: file:///afs/psi.ch/software/spack/testing
   modules: