diff --git a/v1.1/gadi/modules.yaml b/v1.1/gadi/modules.yaml
new file mode 100644
index 0000000..636a237
--- /dev/null
+++ b/v1.1/gadi/modules.yaml
@@ -0,0 +1,6 @@
+# Refer to https://spack.readthedocs.io/en/latest/module_file_support.html
+modules:
+  default:
+    tcl:
+      # https://spack.readthedocs.io/en/latest/module_file_support.html#exclude-or-include-specific-module-files
+      exclude: ["openmpi"]
diff --git a/v1.1/include/defaults.yaml b/v1.1/include/defaults.yaml
index ab85db5..7efa2ed 100644
--- a/v1.1/include/defaults.yaml
+++ b/v1.1/include/defaults.yaml
@@ -18,8 +18,8 @@ include:
     when: '"gadi.nci.org.au" not in hostname and "ACCESS_SPACK_ADMIN" not in env'
 
   # On Gadi, both user and admin need this:
-  - name: "gadi-packages"
-    path: "$spack/../spack-config/v1.1/gadi/packages.yaml"
+  - name: "gadi"
+    path: "$spack/../spack-config/v1.1/gadi"
     when: '"gadi.nci.org.au" in hostname'
 
   # system configuration scope