diff --git a/defaults/main.yml b/defaults/main.yml
index eb226ed..2ac757b 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -6,7 +6,7 @@ bash_script_copy_these:
 bash_script_copy_all: True
 
 # This is added after MODULEPATH=$MODULEPATH
-bash_modules_path: "/cvmfs/fgi.csc.fi/modules/all/:/cvmfs/fgi.csc.fi/modules/:/cvmfs/fgi.csc.fi/modules/sl6/"
+bash_modules_path: "/cvmfs/fgi.csc.fi/modules/el7/all"
 
 lua_script_copy_all: True # disable by setting copy_all to false and copy_these to []
 lua_script_copy_these:
diff --git a/templates/modules-cvmfs.csh b/templates/modules-cvmfs.csh
index 68912f5..6fc8d2e 100644
--- a/templates/modules-cvmfs.csh
+++ b/templates/modules-cvmfs.csh
@@ -4,6 +4,6 @@ if ( -f "/etc/profile.d/modules.csh" ) then
  source /etc/profile.d/modules.csh
 endif
 
-#setenv MODULEPATH "${MODULEPATH}:/cvmfs/fgi.csc.fi/modules/:/cvmfs/fgi.csc.fi/modules/sl6/"
+#setenv MODULEPATH "${MODULEPATH}:/cvmfs/fgi.csc.fi/modules/el7/all"
 setenv MODULEPATH "${MODULEPATH}:{{ bash_modules_path }}"
 
diff --git a/templates/modules-cvmfs.sh b/templates/modules-cvmfs.sh
index 4a29560..9585dda 100644
--- a/templates/modules-cvmfs.sh
+++ b/templates/modules-cvmfs.sh
@@ -3,6 +3,6 @@
 if [ -f /etc/profile.d/modules.sh ] ; then
  . /etc/profile.d/modules.sh
 fi
-#export MODULEPATH=$MODULEPATH:/cvmfs/fgi.csc.fi/modules/:/cvmfs/fgi.csc.fi/modules/sl6/
+#export MODULEPATH=$MODULEPATH:/cvmfs/fgi.csc.fi/modules/el7/all
 export MODULEPATH=$MODULEPATH:{{ bash_modules_path }}