diff --git a/engineering-guide/accounts-and-groups.md b/engineering-guide/accounts-and-groups.md
index d7d614a9..d36239cb 100644
--- a/engineering-guide/accounts-and-groups.md
+++ b/engineering-guide/accounts-and-groups.md
@@ -23,15 +23,17 @@ Official documentation on PSI IT account naming convention can be found [here](h
 
 To be able to easily distinguish between the different account types, a user shall be assigned to
 
-  | Unix Group         | Accont Type |
-  |--------------------|-------------|
-  | `unx-lx_users`     | normal user | 
-  | `unx-lx_adm_users`     | normal user and administrator acccounts |
-  | `unx-lx_gac_users` | global accounts |
-  | `unx-lx_ext_users` | external accounts |
-  | `unx-lx_ext_adm`   | external adm accounts (group should actually be named `unx-lx_ext_adm_users` but because of character limitations we abbreviated)|
-  | `unx-lx_e_users`   | experiment accounts |
-  | `unx-lx_svc_users` | service accounts accounts |
+  | Unix Group         | Accont Type | Test User |
+  |--------------------|-------------|-----------|
+  | `unx-lx_users`     | normal user | `lx_test` |
+  | `unx-lx_adm_users` | administrator acccounts for normal users | `lx_test-adm` |
+  | `unx-lx_gac_users` | global accounts | `gac-lx_test` |
+  | `unx-lx_ext_users` | external accounts | `ext-lx_test` |
+  | `unx-lx_ext_adm`   | external adm accounts (group should actually be named `unx-lx_ext_adm_users` but because of character limitations we abbreviated)| `ext-lx_test-adm`|
+  | `unx-lx_e_users`   | experiment accounts | `e22284` |
+  | `unx-lx_svc_users` | service accounts accounts | `svcusr-lx_test`|
+
+The passwords for all these users are found in the [Shared Core Linux Secret Store](https://git.psi.ch/linux-infra/core-linux-secrets), except for `e22284` which is found in the [PSI e-account Password Manager](https://epwd.psi.ch/cred/detail/18556/).
 
 ```{note}
 unx-lx_ext_users - this group does not yet contain all ext accounts (only the ones that are currently in the scope of IAM - this should be fixed by end of January 2025