diff --git a/all-maintainers.nix b/all-maintainers.nix
index c277bfb80..443ea723c 100644
--- a/all-maintainers.nix
+++ b/all-maintainers.nix
@@ -201,6 +201,13 @@
     name = "Joaquín Triñanes";
     source = "nixpkgs";
   };
+  Joker9944 = {
+    email = "github@shroud.mozmail.com";
+    github = "Joker9944";
+    githubId = 9194199;
+    name = "Felix von Arx";
+    source = "nixpkgs";
+  };
   JustinLovinger = {
     email = "git@justinlovinger.com";
     github = "JustinLovinger";
@@ -403,6 +410,19 @@
     name = "Mel Bourgeois";
     source = "nixpkgs";
   };
+  Swarsel = {
+    email = "leon@swarsel.win";
+    github = "Swarsel";
+    githubId = 32304731;
+    keys = [
+      {
+        fingerprint = "4BE7 9252 6228 9B47 6DBB  C17B 76FD 3810 215A E097";
+        longkeyid = "rsa4096/0x76FD3810215AE097";
+      }
+    ];
+    name = "Leon Schwarzäugl";
+    source = "nixpkgs";
+  };
   ThibautMarty = {
     email = "github@thibautmarty.fr";
     github = "ThibautMarty";
@@ -746,13 +766,6 @@
     name = "Callum Leslie";
     source = "nixpkgs";
   };
-  carpinchomug = {
-    email = "aki.suda@protonmail.com";
-    github = "carpinchomug";
-    githubId = 101536256;
-    name = "Akiyoshi Suda";
-    source = "nixpkgs";
-  };
   chayleaf = {
     email = "chayleaf-nix@pavluk.org";
     github = "chayleaf";
@@ -990,6 +1003,13 @@
     name = "Fedi Jamoussi";
     source = "nixpkgs";
   };
+  epixtm = {
+    email = "kami@epix.icu";
+    github = "epixtm";
+    githubId = 168025607;
+    name = "Epix";
+    source = "home-manager";
+  };
   ethancedwards8 = {
     email = "ethan@ethancedwards.com";
     github = "ethancedwards8";
@@ -1006,6 +1026,13 @@
     name = "Ethan Carter Edwards";
     source = "nixpkgs";
   };
+  ethorsoe = {
+    email = "jekarlson@gmail.com";
+    github = "ethorsoe";
+    githubId = 1204734;
+    name = "Emil Karlson";
+    source = "nixpkgs";
+  };
   evanjs = {
     email = "evanjsx@gmail.com";
     github = "evanjs";
@@ -1225,13 +1252,6 @@
     name = "Jiří Štefka";
     source = "nixpkgs";
   };
-  jkarlson = {
-    email = "jekarlson@gmail.com";
-    github = "jkarlson";
-    githubId = 1204734;
-    name = "Emil Karlson";
-    source = "home-manager";
-  };
   jlesquembre = {
     email = "jl@lafuente.me";
     github = "jlesquembre";
@@ -1935,6 +1955,13 @@
     name = "Adam Washington";
     source = "nixpkgs";
   };
+  rrvsh = {
+    email = "rafiq@rrv.sh";
+    github = "rrvsh";
+    githubId = 20300874;
+    name = "Mohammad Rafiq";
+    source = "home-manager";
+  };
   rszamszur = {
     email = "radoslawszamszur@gmail.com";
     github = "rszamszur";
@@ -1973,9 +2000,9 @@
     name = "Robert Helgesson";
     source = "nixpkgs";
   };
-  seylerius = {
+  sableseyler = {
     email = "sable@seyleri.us";
-    github = "seylerius";
+    github = "sableseyler";
     githubId = 1145981;
     keys = [
       {