diff --git a/admin-guide/architecture/accounts-and-groups.md b/admin-guide/architecture/accounts-and-groups.md
index 93eb5e0..bb537fe 100644
--- a/admin-guide/architecture/accounts-and-groups.md
+++ b/admin-guide/architecture/accounts-and-groups.md
@@ -27,12 +27,18 @@ Official documentation on PSI IT account naming convention can be found [here](h
 
 ## UID Allocation
 
-  |                |               |
-  |----------------|---------------|
-  | Old accounts   |  1000-6000    |
-  | GFA accounts   |  10000-30000  |
-  | External users |  30000-35000  |
-  | New accounts   |  35000+       |
+| UID.                    | GID.                    |
+|-------------------------|-------------------------|-------------------------------|
+| 0 - 1000                | 100 - 1000              | local users / groups manually |
+| 1000 - 9999             | 110 - 9999              | old AD accounts manually |
+| 10000 - 29999           | 10000 - 29999           | e-accounts / p-groups Experiment prov. tool |
+| 30000 - 65534           | 30000 - 65534           | new AD users / groups /external AD accounts OM msSFU30UidNumber |
+| 70000 - 120000          | 70000 - 120000          | e-accounts / p-groups Experiment prov. tool |
+| 123458 - 150000         | -10000 - -4294967296    | local AFS users / groups AFS |
+| 200000 - 400000         | 200000 - 400000         | new AD users / groups /external AD accounts IAM msSFU30UidNumber |
+| 2000000000 - 4294967296 | 2000000000 - 4294967296 | sub UID / GID for containers local Linux systems / local Windows subsystems for Linux |
+
+
 
 ## LDAP Attribute Mapping