diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 68e0760df..ad0ae2ad4 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -136,8 +136,8 @@ Makefile                                              @thiagokokada
 /modules/programs/hexchat.nix                         @thiagokokada
 /tests/modules/programs/hexchat                       @thiagokokada
 
-/modules/programs/himalaya.nix                        @ambroisie
-/tests/modules/programs/himalaya                      @ambroisie
+/modules/programs/himalaya.nix                        @toastal
+/tests/modules/programs/himalaya                      @toastal
 
 /modules/programs/home-manager.nix                    @rycee
 
diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix
index 896e47f68..5b557644a 100644
--- a/modules/lib/maintainers.nix
+++ b/modules/lib/maintainers.nix
@@ -345,4 +345,13 @@
     github = "lukasngl";
     githubId = 69244516;
   };
+  toastal = {
+    email = "toastal+nix@posteo.net";
+    matrix = "@toastal:matrix.org";
+    github = "toastal";
+    githubId = 561087;
+    name = "toastal";
+    keys =
+      [{ fingerprint = "7944 74B7 D236 DAB9 C9EF  E7F9 5CCE 6F14 66D4 7C9E"; }];
+  };
 }