diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index e5f93ef4d17b..1119f5e94085 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -329,13 +329,9 @@ package-maintainers:
   pacien:
     - ldgallery-compiler
   peti:
-    - cabal-install
-    - cabal2nix
     - cabal2spec
-    - distribution-nixpkgs
     - funcmp
     - git-annex
-    - hackage-db
     - hledger
     - hledger-interest
     - hledger-ui
@@ -344,8 +340,6 @@ package-maintainers:
     - hsdns
     - hsemail
     - hsyslog
-    - jailbreak-cabal
-    - language-nix
     - logging-facade-syslog
     - nix-paths
     - pandoc
@@ -398,9 +392,15 @@ package-maintainers:
     - zre
   sternenseemann:
     # also maintain upstream package
+    - cabal2nix
+    - distribution-nixpkgs
+    - hackage-db
+    - language-nix
+    - jailbreak-cabal
     - spacecookie
     - gopher-proxy
     # other packages I can help out for
+    - cabal-install
     - systemd
     - fast-logger
     - flat
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 1ed024848de6..6abcdb9354da 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -51885,7 +51885,7 @@ self: {
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
        mainProgram = "cabal";
-       maintainers = [ lib.maintainers.peti ];
+       maintainers = [ lib.maintainers.sternenseemann ];
        broken = true;
      }) {Cabal-QuickCheck = null; Cabal-described = null; 
          Cabal-tree-diff = null;};
@@ -52577,7 +52577,7 @@ self: {
        '';
        description = "Convert Cabal files into Nix build instructions";
        license = lib.licenses.bsd3;
-       maintainers = [ lib.maintainers.peti ];
+       maintainers = [ lib.maintainers.sternenseemann ];
      }) {};
 
   "cabal2spec" = callPackage
@@ -82537,7 +82537,7 @@ self: {
        ];
        description = "Types and functions to manipulate the Nixpkgs distribution";
        license = lib.licenses.bsd3;
-       maintainers = [ lib.maintainers.peti ];
+       maintainers = [ lib.maintainers.sternenseemann ];
      }) {};
 
   "distribution-opensuse" = callPackage
@@ -122049,7 +122049,7 @@ self: {
        ];
        description = "Access cabal-install's Hackage database via Data.Map";
        license = lib.licenses.bsd3;
-       maintainers = [ lib.maintainers.peti ];
+       maintainers = [ lib.maintainers.sternenseemann ];
      }) {};
 
   "hackage-diff" = callPackage
@@ -162909,7 +162909,7 @@ self: {
        description = "Strip version restrictions from Cabal files";
        license = lib.licenses.bsd3;
        mainProgram = "jailbreak-cabal";
-       maintainers = [ lib.maintainers.peti ];
+       maintainers = [ lib.maintainers.sternenseemann ];
      }) {};
 
   "jalaali" = callPackage
@@ -171316,7 +171316,7 @@ self: {
        ];
        description = "Data types and functions to represent the Nix language";
        license = lib.licenses.bsd3;
-       maintainers = [ lib.maintainers.peti ];
+       maintainers = [ lib.maintainers.sternenseemann ];
      }) {};
 
   "language-oberon" = callPackage