diff --git a/env/rhel7/x86_64/users/stable/spack.yaml b/env/rhel7/x86_64/users/stable/spack.yaml
index d919748..4996217 100644
--- a/env/rhel7/x86_64/users/stable/spack.yaml
+++ b/env/rhel7/x86_64/users/stable/spack.yaml
@@ -7,10 +7,13 @@ spack:
       - $spack/../user/$user/spack-stage
     install_tree:
       root: $spack/../user/$user/spack-install
+  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__
   mirrors:
     local_stable: file:///afs/psi.ch/software/spack/stable
   include:
-  - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
-  - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
+  - $spack/spack-psi/env/rhel7/x86_64/sysconfigs/packages.yaml
+  - $spack/spack-psi/env/rhel7/x86_64/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
index 30d958c..9f8b58c 100644
--- a/env/rhel7/x86_64/users/unstable/spack.yaml
+++ b/env/rhel7/x86_64/users/unstable/spack.yaml
@@ -4,13 +4,18 @@ spack:
   config:
     allow_sgid: false
     build_stage:
-      - $spack/../user/$user/spack-stage
+    - $spack/../user/$user/spack-stage
     install_tree:
       root: $spack/../user/$user/spack-install
+  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__
+    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_
   mirrors:
     local_unstable: file:///afs/psi.ch/software/spack/unstable
   include:
-  - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml
-  - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml
+  - $spack/spack-psi/env/rhel7/x86_64/sysconfigs/packages.yaml
+  - $spack/spack-psi/env/rhel7/x86_64/sysconfigs/compilers.yaml
   specs: []
   view: false