diff --git a/.authors.yml b/.authors.yml
index 817e228f4..bde28c274 100644
--- a/.authors.yml
+++ b/.authors.yml
@@ -27,7 +27,7 @@
   aliases:
   - John Kirkham
   - jakirkham
-  num_commits: 31
+  num_commits: 33
   first_commit: 2016-03-17 21:05:53
   github: jakirkham
 - name: Daniel Bast
@@ -393,7 +393,7 @@
   github: shadowwalkersb
 - name: Matthew R. Becker
   email: becker.mr@gmail.com
-  num_commits: 399
+  num_commits: 414
   first_commit: 2020-01-07 17:44:33
   github: beckermr
   alternate_emails:
@@ -446,7 +446,7 @@
   email: hadrien.mary@gmail.com
   alternate_emails:
   - hadim@users.noreply.github.com
-  num_commits: 25
+  num_commits: 32
   first_commit: 2020-05-27 07:53:50
   github: hadim
 - name: Thomas Hopkins
@@ -476,7 +476,7 @@
   github: jwillemsen
 - name: Jaime Rodríguez-Guerra
   email: jaimergp@users.noreply.github.com
-  num_commits: 253
+  num_commits: 254
   first_commit: 2020-11-01 14:18:08
   github: jaimergp
 - name: Bastian Zimmermann
@@ -539,7 +539,7 @@
   github: nehaljwani
 - name: H. Vetinari
   email: h.vetinari@gmx.com
-  num_commits: 61
+  num_commits: 63
   first_commit: 2021-11-14 02:53:10
 - name: Benjamin Tovar
   email: btovar@nd.edu
diff --git a/.mailmap b/.mailmap
index 5915e0988..df900c90c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -27,16 +27,16 @@ Dougal J. Sutherland <dougal@gmail.com>
 Min RK <benjaminrk@gmail.com>
 Amit Kumar <dtu.amit@gmail.com>
 Marcel Bargull <marcel.bargull@udo.edu> Marcel Bargull <mbargull@users.noreply.github.com>
-shadow_walker <shadowwalkersb@gmail.com>
 John Kirkham <jakirkham@gmail.com> John Kirkham <kirkhamj@janelia.hhmi.org>
 John Kirkham <jakirkham@gmail.com> jakirkham <kirkhamj@janelia.hhmi.org>
+shadow_walker <shadowwalkersb@gmail.com>
+Hadrien Mary <hadrien.mary@gmail.com> Hadrien Mary <hadim@users.noreply.github.com>
 Michael Sarahan <msarahan@gmail.com> Mike Sarahan <msarahan@gmail.com>
 pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 Mark Harfouche <mark.harfouche@gmail.com>
 Bastian Zimmermann <10774221+BastianZim@users.noreply.github.com> BastianZim <10774221+BastianZim@users.noreply.github.com>
 Leo Fang <leofang@bnl.gov> Leo Fang <leo80042@gmail.com>
 Leo Fang <leofang@bnl.gov> Leo Fang <leof@nvidia.com>
-Hadrien Mary <hadrien.mary@gmail.com> Hadrien Mary <hadim@users.noreply.github.com>
 Ryan Volz <rvolz@mit.edu> Ryan Volz <ryan.volz@gmail.com>
 Johnny Willemsen <jwillemsen@remedy.nl>
 Chris Burr <christopher.burr@cern.ch> Chris Burr <chrisburr@users.noreply.github.com>
diff --git a/AUTHORS.rst b/AUTHORS.rst
index dfebf10f0..92ebeade5 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -16,14 +16,14 @@ Authors are sorted by number of commits.
 * Min RK
 * Amit Kumar
 * Marcel Bargull
-* shadow_walker
 * John Kirkham
+* shadow_walker
+* Hadrien Mary
 * Michael Sarahan
 * pre-commit-ci[bot]
 * Mark Harfouche
 * Bastian Zimmermann
 * Leo Fang
-* Hadrien Mary
 * Ryan Volz
 * Johnny Willemsen
 * Chris Burr