diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index d489de708d130b..1b0b336f4b8273 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -18,11 +18,7 @@ env:
 jobs:
   build-windows:
     if: github.event.pull_request.draft == false
-    strategy:
-      matrix:
-        windows: [windows-2019, windows-2022]
-      fail-fast: false
-    runs-on: ${{ matrix.windows }}
+    runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ env.PYTHON_VERSION }}
diff --git a/.mailmap b/.mailmap
index 6f714cf4b3430c..efd81d38bc26f7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -301,6 +301,7 @@ Nebu Pookins <nebu@nebupookins.net>
 Netto Farah <nettofarah@gmail.com>
 Nicholas Kinsey <pyrotechnick@feistystudios.com>
 Nick Soggin <nicksoggin@gmail.com> <iSkore@users.noreply.github.com>
+Nigel Kibodeaux <nigelmail@gmail.com> <nigel@team.about.me>
 Nikola Glavina <glavina.nikola5@gmail.com> <nikola.glavina@student.um.si>
 Nikolai Vavilov <vvnicholas@gmail.com>
 Nils Kuhnhenn <lain@volafile.io>
diff --git a/AUTHORS b/AUTHORS
index 8a33e24cd989b4..b9ad7e86f12f5c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1242,7 +1242,7 @@ Dan Villa <danielavilla02@gmail.com>
 CodeTheInternet <edlerner+github@protonmail.com>
 Eric Gonzalez <ericxgonzalez@gmail.com>
 rgoodwin <rjngoodwin@gmial.com>
-Nigel Kibodeaux <nigel@team.about.me>
+Nigel Kibodeaux <nigelmail@gmail.com>
 fmizzell <fmizzell@1312210.no-reply.drupal.org>
 cdnadmin <cdnadmin@collaborare.net>
 Paul Lucas <pjl.paul@gmail.com>
@@ -1772,7 +1772,6 @@ Guilherme Akio Sakae <akio.xd@gmail.com>
 Martin Michaelis <code@mgjm.de>
 Christopher Sidebottom <chris@damouse.co.uk>
 Edward Andrew Robinson <earobinson@gmail.com>
-Nigel Kibodeaux <nigelmail@gmail.com>
 Shakeel Mohamed <contact@shakeel.xyz>
 Tobias Kieslich <tobias.kieslich@gmail.com>
 Ruy Adorno <ruyadorno@hotmail.com>