diff --git a/install/CENTOS6LATEST b/install/CENTOS6LATEST
index c542a188576f7145bc9fcb9df1bf838dedac6a85..7b3aa4f7f0d7e587df787bc6d87f8acd89592683 100644
--- a/install/CENTOS6LATEST
+++ b/install/CENTOS6LATEST
@@ -53,8 +53,29 @@ mkdir /scratch
 
 %environment
 source /opt/apps/lmod/7.7.7/init/profile
-clearMT
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-export -f ml
-export -f module
-export -f clearMT
+export LMOD_PACKAGE_PATH=/opt/apps/lmod/
+
+if [ "$(id -u)" -ne 0 ]; then
+    MODULEPATH=""
+
+    for dir in /apps/modules/*
+    do
+        # Exclude following directories
+        if [[ (${dir##*/} == "all") ]]; then
+            continue
+        fi
+        # In case that it's directory
+        if [ -d "$dir" ]; then
+            if [ -z "$MODULEPATH" ]; then
+                MODULEPATH="$dir"
+            else
+                MODULEPATH="$MODULEPATH:$dir"
+            fi
+        fi
+    done
+
+    # export
+    export MODULEPATH
+fi
+
+ml purge
diff --git a/install/CENTOS7LATEST b/install/CENTOS7LATEST
index 47694268e1d4c9d41e5a13c1fe02e048890f8b3f..f828a278b499bef6befd2fdd6a7cccb854bb43a4 100644
--- a/install/CENTOS7LATEST
+++ b/install/CENTOS7LATEST
@@ -62,7 +62,29 @@ mkdir /scratch
 
 %environment
 source /opt/apps/lmod/7.7.7/init/profile
-clearMT
-export -f ml
-export -f module
-export -f clearMT
+export LMOD_PACKAGE_PATH=/opt/apps/lmod/
+
+if [ "$(id -u)" -ne 0 ]; then
+    MODULEPATH=""
+
+    for dir in /apps/modules/*
+    do
+        # Exclude following directories
+        if [[ (${dir##*/} == "all") ]]; then
+            continue
+        fi
+        # In case that it's directory
+        if [ -d "$dir" ]; then
+            if [ -z "$MODULEPATH" ]; then
+                MODULEPATH="$dir"
+            else
+                MODULEPATH="$MODULEPATH:$dir"
+            fi
+        fi
+    done
+
+    # export
+    export MODULEPATH
+fi
+
+ml purge
diff --git a/install/CENTOS7LATESTINTEL b/install/CENTOS7LATESTINTEL
index 28aa6dd2723c9c7ae43dad743a8978dcc5e22dd4..ba200516997a96b0b16a92f0d633afd991719be8 100644
--- a/install/CENTOS7LATESTINTEL
+++ b/install/CENTOS7LATESTINTEL
@@ -44,8 +44,29 @@ mkdir /scratch
 
 %environment
 source /opt/apps/lmod/7.7.7/init/profile
-clearMT
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-export -f ml
-export -f module
-export -f clearMT
+export LMOD_PACKAGE_PATH=/opt/apps/lmod/
+
+if [ "$(id -u)" -ne 0 ]; then
+    MODULEPATH=""
+
+    for dir in /apps/modules/*
+    do
+        # Exclude following directories
+        if [[ (${dir##*/} == "all") ]]; then
+            continue
+        fi
+        # In case that it's directory
+        if [ -d "$dir" ]; then
+            if [ -z "$MODULEPATH" ]; then
+                MODULEPATH="$dir"
+            else
+                MODULEPATH="$MODULEPATH:$dir"
+            fi
+        fi
+    done
+
+    # export
+    export MODULEPATH
+fi
+
+ml purge
diff --git a/install/CONFIG b/install/CONFIG
index 932fedc812b37fc137433740872fc3264934c919..d48e5564eda70aac8d3b2651f84557b8fbc1b1ec 100644
--- a/install/CONFIG
+++ b/install/CONFIG
@@ -1,6 +1,6 @@
-SINGULARITY_BIN_PATH=/apps/all/Singularity/3.5.2/bin
+SINGULARITY_BIN_PATH=/apps/all/Singularity/3.6.0/bin
 IMAGE_PATH=/apps/all/OS
 MODULEFILE_PATH=/apps/modules
 USER_IMAGE=easybuild
 EBROOTSQUASHFSMINTOOLS=/apps/all/squashfs-tools/4.3
-PATH=$PATH:/apps/all/Singularity/3.5.2/bin:/apps/all/squashfs-tools/4.3/bin
+PATH=$PATH:/apps/all/Singularity/3.6.0/bin:/apps/all/squashfs-tools/4.3/bin
diff --git a/install/DEBIANLATEST b/install/DEBIANLATEST
index ec39dd2798a74894117c3138eb995e0f3557aee9..420f16b1ced9ee5cf852f3c25b83eca8dcd200f3 100644
--- a/install/DEBIANLATEST
+++ b/install/DEBIANLATEST
@@ -50,8 +50,29 @@ mkdir /scratch
 
 %environment
 source /opt/apps/lmod/7.7.7/init/profile
-clearMT
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-export -f ml
-export -f module
-export -f clearMT
+export LMOD_PACKAGE_PATH=/opt/apps/lmod/
+
+if [ "$(id -u)" -ne 0 ]; then
+    MODULEPATH=""
+
+    for dir in /apps/modules/*
+    do
+        # Exclude following directories
+        if [[ (${dir##*/} == "all") ]]; then
+            continue
+        fi
+        # In case that it's directory
+        if [ -d "$dir" ]; then
+            if [ -z "$MODULEPATH" ]; then
+                MODULEPATH="$dir"
+            else
+                MODULEPATH="$MODULEPATH:$dir"
+            fi
+        fi
+    done
+
+    # export
+    export MODULEPATH
+fi
+
+ml purge
diff --git a/install/FEDORALATEST b/install/FEDORALATEST
index bc5028de87f724a197039b7febcc4ef00cde5122..0a403ca74ab7efdfa09b4e3b728712d0d4de6279 100644
--- a/install/FEDORALATEST
+++ b/install/FEDORALATEST
@@ -33,8 +33,30 @@ python get-pip.py
 pip install setuptools --upgrade
 
 %environment
-. /opt/apps/lmod/7.7.7/init/profile 
-ml purge --force
-export -f ml
-export -f module
-export -f clearMT
+source /opt/apps/lmod/7.7.7/init/profile
+export LMOD_PACKAGE_PATH=/opt/apps/lmod/
+
+if [ "$(id -u)" -ne 0 ]; then
+    MODULEPATH=""
+
+    for dir in /apps/modules/*
+    do
+        # Exclude following directories
+        if [[ (${dir##*/} == "all") ]]; then
+            continue
+        fi
+        # In case that it's directory
+        if [ -d "$dir" ]; then
+            if [ -z "$MODULEPATH" ]; then
+                MODULEPATH="$dir"
+            else
+                MODULEPATH="$MODULEPATH:$dir"
+            fi
+        fi
+    done
+
+    # export
+    export MODULEPATH
+fi
+
+ml purge
diff --git a/install/UBUNTU1804 b/install/UBUNTU1804
index 79e0b77936b2f5c3709aa0d2ae441a241f1899e4..31f9b1828c82473d080dd69f484fdfab672d2e53 100644
--- a/install/UBUNTU1804
+++ b/install/UBUNTU1804
@@ -58,12 +58,34 @@ cd /bin
 rm sh && ln -s /bin/bash sh
 
 %environment
-source /opt/apps/lmod/7.7.7/init/profile
-clearMT
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-export -f ml
-export -f module
-export -f clearMT
 export OMPI_MCA_btl_tcp_if_include=10.33.4.0/24
 export OMPI_MCA_orte_base_help_aggregate=0
 export OMPI_MCA_btl_openib_if_include=mlx5_0
+
+source /opt/apps/lmod/7.7.7/init/profile
+export LMOD_PACKAGE_PATH=/opt/apps/lmod/
+
+if [ "$(id -u)" -ne 0 ]; then
+    MODULEPATH=""
+
+    for dir in /apps/modules/*
+    do
+        # Exclude following directories
+        if [[ (${dir##*/} == "all") ]]; then
+            continue
+        fi
+        # In case that it's directory
+        if [ -d "$dir" ]; then
+            if [ -z "$MODULEPATH" ]; then
+                MODULEPATH="$dir"
+            else
+                MODULEPATH="$MODULEPATH:$dir"
+            fi
+        fi
+    done
+
+    # export
+    export MODULEPATH
+fi
+
+ml purge