diff --git a/rhel8-guides-beta/admin_guide.md b/rhel8-guides-beta/admin_guide.md
index 48a2bafc..159cfadf 100644
--- a/rhel8-guides-beta/admin_guide.md
+++ b/rhel8-guides-beta/admin_guide.md
@@ -78,9 +78,7 @@ psi_motd_ou: AIT
 psi_motd_contact_list: true
 psi_motd_contact:
   - Alvise Dorigo    <alvise.dorigo@psi.ch>    / +41 56 310 55 67
-  - Thomas Klar      <thomas.klar@psi.ch>      / +41 56 310 39 56
   - Leonardo Sala    <leonardo.sala@psi.ch>    / +41 56 310 33 69
-  - Sascha Spreitzer <sascha.spreitzer@psi.ch> / +41 56 310 37 55
 ```
 
 additional information can be provided as well
@@ -90,9 +88,7 @@ psi_motd_ou: AIT
 psi_motd_contact_list: true
 psi_motd_contact:
   - Alvise Dorigo    <alvise.dorigo@psi.ch>    / +41 56 310 55 67
-  - Thomas Klar      <thomas.klar@psi.ch>      / +41 56 310 39 56
   - Leonardo Sala    <leonardo.sala@psi.ch>    / +41 56 310 33 69
-  - Sascha Spreitzer <sascha.spreitzer@psi.ch> / +41 56 310 37 55
 psi_motd_additional: |
   Please be careful with this system.
   It is very sensitive.
diff --git a/rhel8/configuration.md b/rhel8/configuration.md
index 0d763f78..aae2a025 100644
--- a/rhel8/configuration.md
+++ b/rhel8/configuration.md
@@ -42,9 +42,7 @@ psi_motd_ou: AIT
 psi_motd_contact_list: true
 psi_motd_contact:
   - Alvise Dorigo    <alvise.dorigo@psi.ch>    / +41 56 310 55 67
-  - Thomas Klar      <thomas.klar@psi.ch>      / +41 56 310 39 56
   - Leonardo Sala    <leonardo.sala@psi.ch>    / +41 56 310 33 69
-  - Sascha Spreitzer <sascha.spreitzer@psi.ch> / +41 56 310 37 55
 ```
 
 additional information can be provided as well
@@ -54,9 +52,7 @@ psi_motd_ou: AIT
 psi_motd_contact_list: true
 psi_motd_contact:
   - Alvise Dorigo    <alvise.dorigo@psi.ch>    / +41 56 310 55 67
-  - Thomas Klar      <thomas.klar@psi.ch>      / +41 56 310 39 56
   - Leonardo Sala    <leonardo.sala@psi.ch>    / +41 56 310 33 69
-  - Sascha Spreitzer <sascha.spreitzer@psi.ch> / +41 56 310 37 55
 psi_motd_additional: |
   Please be careful with this system.
   It is very sensitive.
@@ -781,8 +777,7 @@ List of users that are allowed to login to a system. *Prefer using groups over u
 ```yaml
 psi_aaa_allow_users_extra:
   - kapeller
-  - klar_t
-  - spreitzer_s
+  - talamo_i
 ```
 
 ### Local User Management