diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 0dab1a4bda9..6219c36a29a 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,21 +1,9 @@
-# This is the official list of people who have contributed code to the Gitea/Gogs repository.
-# This document should be reviewed and approved by maintainers.
-#
-# The submission process automatically checks to make sure
-# that people submitting code are listed in this file (by email address).
-#
-# The agreement for individuals can be filled out on the web.
-#
-
-# Names should be added to this file like so:
-#     Individual's name <submission email address>
-#     Individual's name <submission email address> <email2> <emailN>
-#
-# An entry with multiple email addresses specifies that the
-# first address should be used in the submit logs and
-# that the other addresses should be recognized as the
-# same person when interacting with github.
-
-# Please keep the list sorted. 
-
-Lunny Xiao <xiaolunwen@gmail.com>
\ No newline at end of file
+Andrey Nering <> (@andreynering)
+Kim Carlbäcker <kim.carlbacker@gmail.com> (@bkcsoft)
+LefsFlare <> (@LefsFlarey)
+Lunny Xiao <xiaolunwen@gmail.com> (@lunny)
+Rachid Zarouali <> (@xinity)
+Rémy Boulanouar <admin@dblk.org> (@DblK)
+Sandro Santilli <strk@kbt.io> (@strk)
+Thibault Meyer <> (@0xbaadf00d)
+Thomas Boerger <thomas@webhippie.de> (@tboerger)
diff --git a/MAINTAINERS b/MAINTAINERS
index 746656c290f..6219c36a29a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,21 +1,9 @@
-# This is the official list of people who have spent time on code review Pull Requests on the Gitea repository.
-# This document should be reviewed and approved by owners.
-#
-# The submission process automatically checks to make sure
-# that people submitting code are listed in this file (by email address).
-#
-# The agreement for individuals can be filled out on the web.
-#
-
-# Names should be added to this file like so:
-#     Individual's name <submission email address>
-#     Individual's name <submission email address> <email2> <emailN>
-#
-# An entry with multiple email addresses specifies that the
-# first address should be used in the submit logs and
-# that the other addresses should be recognized as the
-# same person when interacting with github.
-
-# Please keep the list sorted. 
-
-Lunny Xiao <xiaolunwen@gmail.com>
\ No newline at end of file
+Andrey Nering <> (@andreynering)
+Kim Carlbäcker <kim.carlbacker@gmail.com> (@bkcsoft)
+LefsFlare <> (@LefsFlarey)
+Lunny Xiao <xiaolunwen@gmail.com> (@lunny)
+Rachid Zarouali <> (@xinity)
+Rémy Boulanouar <admin@dblk.org> (@DblK)
+Sandro Santilli <strk@kbt.io> (@strk)
+Thibault Meyer <> (@0xbaadf00d)
+Thomas Boerger <thomas@webhippie.de> (@tboerger)