diff --git a/.authors.yml b/.authors.yml
index ee8d02b02..e43aad908 100644
--- a/.authors.yml
+++ b/.authors.yml
@@ -182,7 +182,7 @@
   email: marcel.bargull@udo.edu
   alternate_emails:
   - mbargull@users.noreply.github.com
-  num_commits: 20
+  num_commits: 24
   first_commit: 2018-07-30 05:17:51
   github: mbargull
 - name: xoviat
@@ -247,7 +247,7 @@
   email: isuru.11@cse.mrt.ac.lk
   alternate_emails:
   - isuruf@gmail.com
-  num_commits: 491
+  num_commits: 493
   first_commit: 2017-01-08 22:03:03
   github: isuruf
 - name: Julian Rüth
@@ -329,7 +329,7 @@
   github: sodre
 - name: Mark Harfouche
   email: mark.harfouche@gmail.com
-  num_commits: 19
+  num_commits: 21
   first_commit: 2018-06-12 01:15:09
   github: hmaarrfk
 - name: Dougal J. Sutherland
@@ -393,7 +393,7 @@
   github: shadowwalkersb
 - name: Matthew R. Becker
   email: becker.mr@gmail.com
-  num_commits: 79
+  num_commits: 142
   first_commit: 2020-01-07 17:44:33
   github: beckermr
   alternate_emails:
@@ -416,7 +416,7 @@
   first_commit: 2020-03-11 10:12:57
 - name: Tim Snyder
   email: snyder.tim@gmail.com
-  num_commits: 10
+  num_commits: 14
   first_commit: 2020-03-12 12:51:58
   github: timsnyder
 - name: Nils Wentzell
@@ -426,11 +426,12 @@
   github: Wentzell
 - name: Leo Fang
   email: leofang@bnl.gov
-  num_commits: 16
+  num_commits: 25
   first_commit: 2020-04-26 22:07:18
   github: leofang
   alternate_emails:
   - leo80042@gmail.com
+  - leof@nvidia.com
 - name: Stuart Berg
   email: bergs@janelia.hhmi.org
   num_commits: 1
@@ -460,7 +461,7 @@
   email: rvolz@mit.edu
   alternate_emails:
   - ryan.volz@gmail.com
-  num_commits: 20
+  num_commits: 23
   first_commit: 2020-07-02 12:02:36
   github: ryanvolz
 - name: Joshua L. Adelman
@@ -536,7 +537,7 @@
   github: nehaljwani
 - name: H. Vetinari
   email: h.vetinari@gmx.com
-  num_commits: 7
+  num_commits: 8
   first_commit: 2021-11-14 02:53:10
 - name: Benjamin Tovar
   email: btovar@nd.edu
diff --git a/.mailmap b/.mailmap
index 42853bcf5..addd55453 100644
--- a/.mailmap
+++ b/.mailmap
@@ -10,12 +10,12 @@
 # gives no duplicates.
 
 Isuru Fernando <isuru.11@cse.mrt.ac.lk> Isuru Fernando <isuruf@gmail.com>
+Matthew R. Becker <becker.mr@gmail.com> Matthew R Becker <beckermr@users.noreply.github.com>
+Matthew R. Becker <becker.mr@gmail.com> beckermr <beckermr@users.noreply.github.com>
 Christopher J. Wright <cjwright4242gh@gmail.com> christopher <cjwright4242@gmail.com>
 Christopher J. Wright <cjwright4242gh@gmail.com> Christopher J. 'CJ' Wright <cjwright4242@gmail.com>
 Anthony Scopatz <scopatz@gmail.com>
 Phil Elson <pelson.pub@gmail.com> pelson <pelson.pub@gmail.com>
-Matthew R. Becker <becker.mr@gmail.com> Matthew R Becker <beckermr@users.noreply.github.com>
-Matthew R. Becker <becker.mr@gmail.com> beckermr <beckermr@users.noreply.github.com>
 Jaime Rodríguez-Guerra <jaimergp@users.noreply.github.com>
 Filipe Fernandes <ocefpaf@gmail.com> Filipe <ocefpaf@gmail.com>
 Filipe Fernandes <ocefpaf@gmail.com> ocefpaf <ocefpaf@gmail.com>
@@ -23,15 +23,17 @@ Dougal J. Sutherland <dougal@gmail.com>
 shadow_walker <shadowwalkersb@gmail.com>
 Michael Sarahan <msarahan@gmail.com> Mike Sarahan <msarahan@gmail.com>
 Min RK <benjaminrk@gmail.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>
-Johnny Willemsen <jwillemsen@remedy.nl>
-Uwe L. Korn <uwe.korn@quantco.com> Uwe L. Korn <xhochy@users.noreply.github.com>
 Marcel Bargull <marcel.bargull@udo.edu> Marcel Bargull <mbargull@users.noreply.github.com>
 Ryan Volz <rvolz@mit.edu> Ryan Volz <ryan.volz@gmail.com>
+Johnny Willemsen <jwillemsen@remedy.nl>
+Uwe L. Korn <uwe.korn@quantco.com> Uwe L. Korn <xhochy@users.noreply.github.com>
 Mark Harfouche <mark.harfouche@gmail.com>
 Julian Rüth <julian.rueth@fsfe.org>
 Chris Burr <christopher.burr@cern.ch> Chris Burr <chrisburr@users.noreply.github.com>
-Leo Fang <leofang@bnl.gov> Leo Fang <leo80042@gmail.com>
+Tim Snyder <snyder.tim@gmail.com>
 Eric Dill <edill@anaconda.com> Eric Dill <edill@bnl.gov>
 Eric Dill <edill@anaconda.com> Eric Dill <thedizzle@gmail.com>
 Natasha Pavlovikj <npavlovikj2@unl.edu>
@@ -41,7 +43,6 @@ Josh Reichardt <josh.reichardt@gmail.com>
 Justin Calamari <justin.calamari@gmail.com>
 Jason Furmanek <furmanek@us.ibm.com>
 Patrick Sodré <psodre@gmail.com>
-Tim Snyder <snyder.tim@gmail.com>
 John Kirkham <jakirkham@gmail.com> John Kirkham <kirkhamj@janelia.hhmi.org>
 John Kirkham <jakirkham@gmail.com> jakirkham <kirkhamj@janelia.hhmi.org>
 C.A.M. Gerlach <widenetservices@gmail.com>
@@ -51,9 +52,9 @@ Daniel Ching <carterbox@users.noreply.github.com>
 Nicholas Bollweg <nick.bollweg@gmail.com>
 Leopold Talirz <leopold.talirz@gmail.com>
 Tom Pollard <tom.pollard@codethink.co.uk>
+H. Vetinari <h.vetinari@gmx.com>
 Gonzalo Pena-Castellanos <goanpeca@gmail.com>
 Daniel Bast <2790401+dbast@users.noreply.github.com>
-H. Vetinari <h.vetinari@gmx.com>
 Carlo <carlo.dri@gmail.com> Carlo <carlodri@users.noreply.github.com>
 Matthew Craig <mattwcraig@gmail.com> Matt Craig <mattwcraig@gmail.com>
 Joshua L. Adelman <joshua.adelman@gmail.com>
diff --git a/AUTHORS.rst b/AUTHORS.rst
index bb86f93c3..52fefc4be 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -2,25 +2,26 @@ All of the people who have made at least one contribution to conda-smithy.
 Authors are sorted by number of commits.
 
 * Isuru Fernando
+* Matthew R. Becker
 * Christopher J. Wright
 * Anthony Scopatz
 * Phil Elson
-* Matthew R. Becker
 * Jaime Rodríguez-Guerra
 * Filipe Fernandes
 * Dougal J. Sutherland
 * shadow_walker
 * Michael Sarahan
 * Min RK
+* Leo Fang
 * Hadrien Mary
-* Johnny Willemsen
-* Uwe L. Korn
 * Marcel Bargull
 * Ryan Volz
+* Johnny Willemsen
+* Uwe L. Korn
 * Mark Harfouche
 * Julian Rüth
 * Chris Burr
-* Leo Fang
+* Tim Snyder
 * Eric Dill
 * Natasha Pavlovikj
 * Maksim Rakitin
@@ -29,7 +30,6 @@ Authors are sorted by number of commits.
 * Justin Calamari
 * Jason Furmanek
 * Patrick Sodré
-* Tim Snyder
 * John Kirkham
 * C.A.M. Gerlach
 * refraction-ray
@@ -38,9 +38,9 @@ Authors are sorted by number of commits.
 * Nicholas Bollweg
 * Leopold Talirz
 * Tom Pollard
+* H. Vetinari
 * Gonzalo Pena-Castellanos
 * Daniel Bast
-* H. Vetinari
 * Carlo
 * Matthew Craig
 * Joshua L. Adelman