diff --git a/.github/workflows/update.sh b/.github/workflows/update.sh
index 7910aa1..49ece0e 100755
--- a/.github/workflows/update.sh
+++ b/.github/workflows/update.sh
@@ -36,7 +36,7 @@ export PATH="$PWD:$PATH"
     curl -LfSs "https://api.github.com/repos/spack/spack/tarball/$SPACK_SHA" | tar --strip-components=1 -xz -C spack_src
     echo "$SPACK_SHA" > spack_sha
 
-    cp "$GITHUB_WORKSPACE/build/6_spack/config.yaml" spack_src/etc/spack/
+    cp "$GITHUB_WORKSPACE/build/6_spack/config.yaml" "$GITHUB_WORKSPACE/build/6_spack/modules.yaml" spack_src/etc/spack/
 
     find . '(' -iname '*.pyc' -o -iname '__pycache__' ')' -print0 | xargs --null rm -rf
     NO_ENTRYPOINT='' "spack-$ARCH-old.x" python -m compileall -q spack_src/ install/ view/ ._view/ || true
diff --git a/Makefile b/Makefile
index 0fa284e..b211627 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ bump_spack: 6_spack
 	$(UNSHARE) rm -rf /build/6_spack/spack_src
 	$(UNSHARE) mkdir /build/6_spack/spack_src
 	$(UNSHARE) bash -c 'curl -Ls "https://api.github.com/repos/spack/spack/tarball/develop" | tar --strip-components=1 -xz -C /build/6_spack/spack_src'
-	$(UNSHARE) cp /build/6_spack/config.yaml /build/6_spack/spack_src/etc/spack/
+	$(UNSHARE) cp /build/6_spack/config.yaml /build/6_spack/modules.yaml /build/6_spack/spack_src/etc/spack/
 	$(UNSHARE) bash -c 'cd /build/6_spack && find . -iname "__pycache__" | xargs rm -rf'
 	$(UNSHARE) bash -c 'cd /build/6_spack && ./spack python -m compileall spack_src/ install/ ._view/ 1> /dev/null || true'
 
diff --git a/build/6_spack/config.yaml b/build/6_spack/config.yaml
index af54377..bf4d751 100644
--- a/build/6_spack/config.yaml
+++ b/build/6_spack/config.yaml
@@ -3,8 +3,5 @@ config:
   test_stage: $tempdir/$user/test_stage
   source_cache: $tempdir/$user/source_cache
   misc_cache: $tempdir/$user/misc_cache
-  module_roots:
-    tcl: ~/spack/share/spack/modules
-    lmod: ~/spack/share/spack/lmod
   install_tree:
-    root: ~/spack/opt/spack
\ No newline at end of file
+    root: ~/spack/opt/spack
diff --git a/build/6_spack/modules.yaml b/build/6_spack/modules.yaml
new file mode 100644
index 0000000..1167f40
--- /dev/null
+++ b/build/6_spack/modules.yaml
@@ -0,0 +1,5 @@
+modules:
+  default:
+    roots:
+      tcl: ~/spack/share/spack/modules
+      lmod: ~/spack/share/spack/lmod