diff --git a/Jenkinsfile b/Jenkinsfile
index d585c2c6a5fce409af1937cb482323d1edc67ac9..bc708bb7bfb31e9d896be34725d98edfb84eb684 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -393,6 +393,7 @@ pipeline {
           agent { label "envinf1"}
           steps {
             script {
+              sh 'rm -rf /global/apps/ogs/head/standard'
               configure {
                 cmakeOptions =
                   '-DOGS_BUILD_UTILS=ON ' +
@@ -419,6 +420,7 @@ pipeline {
           agent { label "envinf1"}
           steps {
             script {
+              sh 'rm -rf /global/apps/ogs/head/petsc'
               configure {
                 cmakeOptions =
                   '-DOGS_USE_PETSC=ON ' +
diff --git a/scripts/cmake/packaging/PackagingLinux.cmake b/scripts/cmake/packaging/PackagingLinux.cmake
index 00ad219f2a83a4b421f608d6f2161b09786acd5d..124610ce591d8cfee2d6d0130727e54ae7ed29d2 100644
--- a/scripts/cmake/packaging/PackagingLinux.cmake
+++ b/scripts/cmake/packaging/PackagingLinux.cmake
@@ -10,17 +10,17 @@ if(MODULE_CMD)
     string(REPLACE "\n" ";" MODULE_LIST_OUTPUT ${MODULE_LIST_OUTPUT})
     foreach(line ${MODULE_LIST_OUTPUT})
         if(NOT line STREQUAL "Currently Loaded Modulefiles:")
-            set(MODULE_LOAD_STRING "${MODULE_LOAD_STRING}module load ${line}\n")
+            set(MODULE_LOAD_STRING "${MODULE_LOAD_STRING}load(\"${line}\")\n")
         endif()
     endforeach()
     configure_file(${PROJECT_SOURCE_DIR}/scripts/cmake/packaging/module.in
-        ${PROJECT_BINARY_DIR}/module
+        ${PROJECT_BINARY_DIR}/module.lua
     )
     if(OGS_MODULEFILE)
         get_filename_component(MODULE_DIR ${OGS_MODULEFILE} DIRECTORY)
         get_filename_component(MODULE_NAME ${OGS_MODULEFILE} NAME)
-        install(FILES ${PROJECT_BINARY_DIR}/module DESTINATION ${MODULE_DIR}
-            RENAME ${MODULE_NAME})
+        install(FILES ${PROJECT_BINARY_DIR}/module.lua DESTINATION ${MODULE_DIR}
+            RENAME ${MODULE_NAME}.lua)
     endif()
 endif()
 
diff --git a/scripts/cmake/packaging/module.in b/scripts/cmake/packaging/module.in
index 3d0aec8bd8ec34e86e8dc5434f05c11bfe046036..b595d85d5d26bd8b6db82827585d89338bcbb9b3 100644
--- a/scripts/cmake/packaging/module.in
+++ b/scripts/cmake/packaging/module.in
@@ -1,8 +1,23 @@
-#%Module1.0
+help([==[
 
-module-whatis OpenGeoSys @OGS_VERSION@
-conflict ogs
+Description
+===========
+OpenGeoSys (OGS) is a scientific open source project for the development of
+ numerical methods for the simulation of thermo-hydro-mechanical-chemical
+ (THMC) processes in porous and fractured media.
+
+
+More information
+================
+ - Homepage: https://opengeosys.org
+]==])
+whatis([==[Name: OpenGeoSys]==])
+whatis([==[Version: @OGS_VERSION@]==])
+
+conflict("ogs")
 
 @MODULE_LOAD_STRING@
 
-prepend-path PATH @CMAKE_INSTALL_PREFIX@/bin
+local root = "@CMAKE_INSTALL_PREFIX@"
+
+prepend_path("PATH", pathJoin(root, "bin"))
diff --git a/web/content/docs/quickstart/basics/envinf1.pandoc b/web/content/docs/quickstart/basics/envinf1.pandoc
index bfe0008ea88c1df209cc576b91f7160c8919eae4..b1755ac468993947d63d4969447bc0203f318fc1 100644
--- a/web/content/docs/quickstart/basics/envinf1.pandoc
+++ b/web/content/docs/quickstart/basics/envinf1.pandoc
@@ -18,7 +18,7 @@ Members of the Department Environmental Informatics of the Helmholtz Centre for
 You select an OGS version by loading a module:
 
 ```bash
-export MODULEPATH=$MODULEPATH:/global/apps/modulefiles
+module use /global/apps/modulefiles
 
 # Examples:
 module load ogs            # Loads latest (maybe unstable) ogs in standard config