diff --git a/env/rhel7/x86_64/admin/stable/spack.yaml b/env/rhel7/x86_64/admin/stable/spack.yaml
index 62313c8..eb18fbe 100644
--- a/env/rhel7/x86_64/admin/stable/spack.yaml
+++ b/env/rhel7/x86_64/admin/stable/spack.yaml
@@ -9,6 +9,6 @@ spack:
     - $spack/spack-psi/env/rhel7/$target_family/sysconfigs/packages.yaml
     - $spack/spack-psi/env/rhel7/$target_family/sysconfigs/compilers.yaml
   mirrors:
-    local_stable: file:///afs/psi.ch/software/spack/stable
+    local_psi: file:///afs/psi.ch/software/spack/psi_mirror
   specs: []
   view: false
diff --git a/env/rhel7/x86_64/admin/testing/spack.yaml b/env/rhel7/x86_64/admin/testing/spack.yaml
index c844d5f..804f54f 100644
--- a/env/rhel7/x86_64/admin/testing/spack.yaml
+++ b/env/rhel7/x86_64/admin/testing/spack.yaml
@@ -5,11 +5,12 @@ spack:
   config:
     install_tree:
       root: $spack/opt/spack/testing
+      # 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
   mirrors:
-    local_testing: file:///afs/psi.ch/software/spack/testing
-    local_unstable: file:///afs/psi.ch/software/spack/unstable
+    local_psi: file:///afs/psi.ch/software/spack/psi_mirror
   specs: []
   view: false
diff --git a/env/rhel7/x86_64/admin/unstable/spack.yaml b/env/rhel7/x86_64/admin/unstable/spack.yaml
index 52802a8..eab286a 100644
--- a/env/rhel7/x86_64/admin/unstable/spack.yaml
+++ b/env/rhel7/x86_64/admin/unstable/spack.yaml
@@ -25,8 +25,7 @@ spack:
     - $spack/spack-psi/env/rhel7/$target_family/sysconfigs/packages.yaml
     - $spack/spack-psi/env/rhel7/$target_family/sysconfigs/compilers.yaml
   mirrors:
-    local_unstable: file:///afs/psi.ch/software/spack/unstable
-    local_stable: file:///afs/psi.ch/software/spack/stable
+    local_psi: file:///afs/psi.ch/software/spack/psi_mirror
   specs:
   - matrix:
     - [$gcc_12.3.0]
diff --git a/env/rhel7/x86_64/users/stable/spack.yaml b/env/rhel7/x86_64/users/stable/spack.yaml
index a73cc05..cafbc2a 100644
--- a/env/rhel7/x86_64/users/stable/spack.yaml
+++ b/env/rhel7/x86_64/users/stable/spack.yaml
@@ -7,10 +7,10 @@ spack:
   include_concrete:
     - /afs/psi.ch/sys/spack/system/spack-psi/env/rhel7/x86_64/admin/stable
   mirrors:
-    local_stable: file:///afs/psi.ch/software/spack/stable
+    local_psi: file:///afs/psi.ch/software/spack/psi_mirror
   specs: []
   upstreams:
     stable:
       install_tree: >-
-        $spack/opt/spack/stable/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__
+        $spack/opt/spack/stable
   view: false
diff --git a/env/rhel7/x86_64/users/unstable/spack.yaml b/env/rhel7/x86_64/users/unstable/spack.yaml
index 89cf816..66cfc70 100644
--- a/env/rhel7/x86_64/users/unstable/spack.yaml
+++ b/env/rhel7/x86_64/users/unstable/spack.yaml
@@ -8,13 +8,11 @@ spack:
     - /afs/psi.ch/sys/spack/system/spack-psi/env/rhel7/x86_64/admin/stable
     - /afs/psi.ch/sys/spack/system/spack-psi/env/rhel7/x86_64/admin/unstable
   mirrors:
-    local_unstable: file:///afs/psi.ch/software/spack/unstable
+    local_psi: file:///afs/psi.ch/software/spack/psi_mirror
   specs: []
   upstreams:
     stable:
-      install_tree: >-
-        $spack/opt/spack/stable/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__
+      install_tree: $spack/opt/spack/stable
     unstable:
-      install_tree: >-
-        $spack/opt/spack/unstable/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder__/__spack_path_placeholder_
+      install_tree: $spack/opt/spack/unstable
   view: false