diff --git a/.github/workflows/tests_archdetect_nvidia_gpu.yml b/.github/workflows/tests_archdetect_nvidia_gpu.yml
index 1fe31f5a..faa926fa 100644
--- a/.github/workflows/tests_archdetect_nvidia_gpu.yml
+++ b/.github/workflows/tests_archdetect_nvidia_gpu.yml
@@ -97,8 +97,8 @@ jobs:
                   grep "Prepending /cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}/software/linux/x86_64/amd/zen2/accel/nvidia/cc80/modules/all to \$MODULEPATH" init.out || (echo "FAILED 3" && exit 1)
               fi
 
-              echo ">>> checking last line of init output..."
-              tail -1 init.out | grep "Environment set up to use EESSI (${{matrix.EESSI_VERSION}}), have fun!" || (echo "FAILED, full init utput:" && cat init.out && exit 1)
+              echo ">>> checking last lines of init output..."
+              tail -10 init.out | grep "Environment set up to use EESSI (${{matrix.EESSI_VERSION}}), have fun!" || (echo "FAILED, full init output:" && cat init.out && exit 1)
 
               echo "All checks on init output PASSED"
           else
diff --git a/init/bash b/init/bash
index 577a2914..2312cc45 100644
--- a/init/bash
+++ b/init/bash
@@ -48,5 +48,6 @@ if [ $? -eq 0 ]; then
     #show_msg ""
 
     echo "Environment set up to use EESSI (${EESSI_VERSION}), have fun!"
+    printf "*****\nPlease note that by configuring and using the EESSI software stack,\nyou agree to abide by the EESSI Terms of Use\n(see https://www.eessi.io/docs/governance/terms_of_use/).\n*****\n"
 
 fi
diff --git a/init/modules/EESSI/2023.06.lua b/init/modules/EESSI/2023.06.lua
index 755929b2..977cc220 100644
--- a/init/modules/EESSI/2023.06.lua
+++ b/init/modules/EESSI/2023.06.lua
@@ -189,4 +189,11 @@ end
 
 if mode() == "load" then
     LmodMessage(load_message)
+    -- notify about ToU
+    tou_message = [[*****
+Please note that by configuring and using the EESSI software stack,
+you agree to abide by the EESSI Terms of Use
+(see https://www.eessi.io/docs/governance/terms_of_use/).
+*****]]
+    LmodMessage(tou_message)
 end