diff --git a/.github/BOTMETA.yml b/.github/BOTMETA.yml
index c24167c8b1..963ef722b2 100644
--- a/.github/BOTMETA.yml
+++ b/.github/BOTMETA.yml
@@ -1391,7 +1391,7 @@ files:
   $modules/twilio.py:
     maintainers: makaimc
   $modules/udm_:
-    maintainers: keachi
+    ignore: keachi
   $modules/ufw.py:
     labels: ufw
     maintainers: ahtik ovcharenko pyykkis
diff --git a/plugins/module_utils/_univention_umc.py b/plugins/module_utils/_univention_umc.py
index 90975bbdf0..ab2734317f 100644
--- a/plugins/module_utils/_univention_umc.py
+++ b/plugins/module_utils/_univention_umc.py
@@ -5,8 +5,7 @@
 # to the complete work.
 #
 # Copyright (c) 2016, Adfinis SyGroup AG
-# Tobias Rueetschi <tobias.ruetschi@adfinis-sygroup.ch>
-#
+# @keachi
 # Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause)
 # SPDX-License-Identifier: BSD-2-Clause
 
diff --git a/plugins/modules/udm_dns_record.py b/plugins/modules/udm_dns_record.py
index e58d0090bb..a2629a939e 100644
--- a/plugins/modules/udm_dns_record.py
+++ b/plugins/modules/udm_dns_record.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 # Copyright (c) 2016, Adfinis SyGroup AG
-# Tobias Rueetschi <tobias.ruetschi@adfinis-sygroup.ch>
+# @keachi
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -10,7 +10,7 @@ from __future__ import annotations
 DOCUMENTATION = r"""
 module: udm_dns_record
 author:
-  - Tobias Rüetschi (@keachi)
+  - keachi (@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). It uses the Python API of the UCS to
diff --git a/plugins/modules/udm_dns_zone.py b/plugins/modules/udm_dns_zone.py
index e63704661f..af8e841b26 100644
--- a/plugins/modules/udm_dns_zone.py
+++ b/plugins/modules/udm_dns_zone.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 # Copyright (c) 2016, Adfinis SyGroup AG
-# Tobias Rueetschi <tobias.ruetschi@adfinis-sygroup.ch>
+# @keachi
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -10,7 +10,7 @@ from __future__ import annotations
 DOCUMENTATION = r"""
 module: udm_dns_zone
 author:
-  - Tobias Rüetschi (@keachi)
+  - keachi (@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). It uses the Python API of the UCS to create
diff --git a/plugins/modules/udm_group.py b/plugins/modules/udm_group.py
index ac9cc43540..f3705e1ccb 100644
--- a/plugins/modules/udm_group.py
+++ b/plugins/modules/udm_group.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 # Copyright (c) 2016, Adfinis SyGroup AG
-# Tobias Rueetschi <tobias.ruetschi@adfinis-sygroup.ch>
+# @keachi
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -10,7 +10,7 @@ from __future__ import annotations
 DOCUMENTATION = r"""
 module: udm_group
 author:
-  - Tobias Rüetschi (@keachi)
+  - keachi (@keachi)
 short_description: Manage of the posix group
 description:
   - This module allows to manage user groups on a univention corporate server (UCS). It uses the Python API of the UCS to
diff --git a/plugins/modules/udm_share.py b/plugins/modules/udm_share.py
index f10a735553..2720d54ab7 100644
--- a/plugins/modules/udm_share.py
+++ b/plugins/modules/udm_share.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 # Copyright (c) 2016, Adfinis SyGroup AG
-# Tobias Rueetschi <tobias.ruetschi@adfinis-sygroup.ch>
+# @keachi
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -10,7 +10,7 @@ from __future__ import annotations
 DOCUMENTATION = r"""
 module: udm_share
 author:
-  - Tobias Rüetschi (@keachi)
+  - keachi (@keachi)
 short_description: Manage samba shares on a univention corporate server
 description:
   - This module allows to manage samba shares on a univention corporate server (UCS). It uses the Python API of the UCS to
diff --git a/plugins/modules/udm_user.py b/plugins/modules/udm_user.py
index f090e730b4..dddb771d98 100644
--- a/plugins/modules/udm_user.py
+++ b/plugins/modules/udm_user.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 # Copyright (c) 2016, Adfinis SyGroup AG
-# Tobias Rueetschi <tobias.ruetschi@adfinis-sygroup.ch>
+# @keachi
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -10,7 +10,7 @@ from __future__ import annotations
 DOCUMENTATION = r"""
 module: udm_user
 author:
-  - Tobias Rüetschi (@keachi)
+  - keachi (@keachi)
 short_description: Manage posix users on a univention corporate server
 description:
   - This module allows to manage posix users on a univention corporate server (UCS). It uses the Python API of the UCS to