diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json
index d6fadbefea60..32d107c1594a 100644
--- a/maintainers/github-teams.json
+++ b/maintainers/github-teams.json
@@ -486,7 +486,8 @@
       "frederictobiasc": 26125115,
       "heywoodlh": 18178614,
       "maevii": 41077433,
-      "rorosen": 76747196
+      "rorosen": 76747196,
+      "superherointj": 5861043
     },
     "name": "k3s"
   },
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 86f8e604f14d..ed0dd6819d6d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -25977,6 +25977,13 @@
     githubId = 36031171;
     name = "Supa";
   };
+  superherointj = {
+    email = "sergiomarcelo@yandex.com";
+    github = "superherointj";
+    githubId = 5861043;
+    matrix = "@superherointj:matrix.org";
+    name = "Sérgio Marcelo";
+  };
   SuperSandro2000 = {
     email = "sandro.jaeckel@gmail.com";
     matrix = "@sandro:supersandro.de";
diff --git a/nixos/modules/services/databases/etcd.nix b/nixos/modules/services/databases/etcd.nix
index b0b7ca5516fa..821edfc6ae59 100644
--- a/nixos/modules/services/databases/etcd.nix
+++ b/nixos/modules/services/databases/etcd.nix
@@ -243,4 +243,7 @@ in
     };
     users.groups.etcd = { };
   };
+
+  meta.maintainers = pkgs.etcd.meta.maintainers;
+
 }
diff --git a/pkgs/by-name/et/etcd_3_4/package.nix b/pkgs/by-name/et/etcd_3_4/package.nix
index 059bafd39d78..13e8c1d13370 100644
--- a/pkgs/by-name/et/etcd_3_4/package.nix
+++ b/pkgs/by-name/et/etcd_3_4/package.nix
@@ -44,6 +44,6 @@ buildGo124Module rec {
     downloadPage = "https://github.com/etcd-io/etcd/";
     license = lib.licenses.asl20;
     homepage = "https://etcd.io/";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ superherointj ];
   };
 }
diff --git a/pkgs/by-name/et/etcd_3_5/package.nix b/pkgs/by-name/et/etcd_3_5/package.nix
index 19da109b3ddf..01e2dae2c531 100644
--- a/pkgs/by-name/et/etcd_3_5/package.nix
+++ b/pkgs/by-name/et/etcd_3_5/package.nix
@@ -31,6 +31,7 @@ let
     homepage = "https://etcd.io/";
     maintainers = with lib.maintainers; [
       dtomvan
+      superherointj
     ];
     platforms = lib.platforms.darwin ++ lib.platforms.linux;
   };
diff --git a/pkgs/by-name/et/etcd_3_6/package.nix b/pkgs/by-name/et/etcd_3_6/package.nix
index a5202dbd7769..d1fceb9b0e57 100644
--- a/pkgs/by-name/et/etcd_3_6/package.nix
+++ b/pkgs/by-name/et/etcd_3_6/package.nix
@@ -35,7 +35,10 @@ let
     downloadPage = "https://github.com/etcd-io/etcd";
     license = lib.licenses.asl20;
     homepage = "https://etcd.io/";
-    maintainers = with lib.maintainers; [ dtomvan ];
+    maintainers = with lib.maintainers; [
+      dtomvan
+      superherointj
+    ];
     platforms = lib.platforms.darwin ++ lib.platforms.linux;
   };
 
diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix
index bd9af2a9fb6c..559519cf7f0f 100644
--- a/pkgs/by-name/fl/fluxcd/package.nix
+++ b/pkgs/by-name/fl/fluxcd/package.nix
@@ -83,6 +83,7 @@ buildGoModule.override { go = go_1_26; } rec {
       jlesquembre
       ryan4yin
       SchahinRohani
+      superherointj
     ];
     mainProgram = "flux";
   };
diff --git a/pkgs/development/tools/godot/common.nix b/pkgs/development/tools/godot/common.nix
index 44be2ac732af..063f79920e13 100644
--- a/pkgs/development/tools/godot/common.nix
+++ b/pkgs/development/tools/godot/common.nix
@@ -774,8 +774,9 @@ let
             "aarch64-darwin"
           ];
           maintainers = with lib.maintainers; [
-            shiryel
             corngood
+            shiryel
+            superherointj
           ];
           mainProgram = "godot${suffix}";
         };