diff --git a/.github/BOTMETA.yml b/.github/BOTMETA.yml
index 5bb76e492bd..c770d07437e 100644
--- a/.github/BOTMETA.yml
+++ b/.github/BOTMETA.yml
@@ -129,7 +129,7 @@ files:
     ignored: sivel angstwad
   $modules/cloud/scaleway/scaleway_volume.py:
     ignored: hekonsek
-  $modules/cloud/univention/: 2-b
+  $modules/cloud/univention/: keachi
   $modules/cloud/vmware/:
     maintainers: $team_vmware
     ignored: cigamit jcpowermac mtnbikenc
diff --git a/lib/ansible/modules/cloud/univention/udm_dns_record.py b/lib/ansible/modules/cloud/univention/udm_dns_record.py
index ee5cf65384a..4b73f406f6d 100644
--- a/lib/ansible/modules/cloud/univention/udm_dns_record.py
+++ b/lib/ansible/modules/cloud/univention/udm_dns_record.py
@@ -18,7 +18,8 @@ DOCUMENTATION = '''
 ---
 module: udm_dns_record
 version_added: "2.2"
-author: "Tobias Rueetschi (@2-B)"
+author:
+- Tobias Rüetschi (@keachi)
 short_description: Manage dns entries on a univention corporate server
 description:
     - "This module allows to manage dns records on a univention corporate server (UCS).
diff --git a/lib/ansible/modules/cloud/univention/udm_dns_zone.py b/lib/ansible/modules/cloud/univention/udm_dns_zone.py
index 5b3069f4bdc..6dab63581ac 100644
--- a/lib/ansible/modules/cloud/univention/udm_dns_zone.py
+++ b/lib/ansible/modules/cloud/univention/udm_dns_zone.py
@@ -18,7 +18,8 @@ DOCUMENTATION = '''
 ---
 module: udm_dns_zone
 version_added: "2.2"
-author: "Tobias Rueetschi (@2-B)"
+author:
+- Tobias Rüetschi (@keachi)
 short_description: Manage dns zones on a univention corporate server
 description:
     - "This module allows to manage dns zones on a univention corporate server (UCS).
diff --git a/lib/ansible/modules/cloud/univention/udm_group.py b/lib/ansible/modules/cloud/univention/udm_group.py
index f2d691f09b6..485acdc0d79 100644
--- a/lib/ansible/modules/cloud/univention/udm_group.py
+++ b/lib/ansible/modules/cloud/univention/udm_group.py
@@ -18,7 +18,8 @@ DOCUMENTATION = '''
 ---
 module: udm_group
 version_added: "2.2"
-author: "Tobias Rueetschi (@2-B)"
+author:
+- Tobias Rüetschi (@keachi)
 short_description: Manage of the posix group
 description:
     - "This module allows to manage user groups on a univention corporate server (UCS).
diff --git a/lib/ansible/modules/cloud/univention/udm_share.py b/lib/ansible/modules/cloud/univention/udm_share.py
index 0d5928f5f39..bcf0909e7ac 100644
--- a/lib/ansible/modules/cloud/univention/udm_share.py
+++ b/lib/ansible/modules/cloud/univention/udm_share.py
@@ -18,7 +18,8 @@ DOCUMENTATION = '''
 ---
 module: udm_share
 version_added: "2.2"
-author: "Tobias Rueetschi (@2-B)"
+author:
+- Tobias Rüetschi (@keachi)
 short_description: Manage samba shares on a univention corporate server
 description:
     - "This module allows to manage samba shares on a univention corporate
diff --git a/lib/ansible/modules/cloud/univention/udm_user.py b/lib/ansible/modules/cloud/univention/udm_user.py
index a546f818d9a..e6a74224fa7 100644
--- a/lib/ansible/modules/cloud/univention/udm_user.py
+++ b/lib/ansible/modules/cloud/univention/udm_user.py
@@ -18,7 +18,8 @@ DOCUMENTATION = '''
 ---
 module: udm_user
 version_added: "2.2"
-author: "Tobias Rueetschi (@2-B)"
+author:
+- Tobias Rüetschi (@keachi)
 short_description: Manage posix users on a univention corporate server
 description:
     - "This module allows to manage posix users on a univention corporate