diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3f7206db361e..2b4e17a03392 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6997,13 +6997,6 @@
     githubId = 974130;
     name = "David Pätzel";
   };
-  dpausp = {
-    email = "dpausp@posteo.de";
-    github = "dpausp";
-    githubId = 1965950;
-    name = "Tobias Stenzel";
-    keys = [ { fingerprint = "4749 0887 CF3B 85A1 6355  C671 78C7 DD40 DF23 FB16"; } ];
-  };
   dpc = {
     email = "dpc@dpc.pw";
     github = "dpc";
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 827160ad40f4..1366a1fc2de3 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -318,19 +318,6 @@ with lib.maintainers;
     github = "flutter";
   };
 
-  flyingcircus = {
-    # Verify additions by approval of an already existing member of the team.
-    members = [
-      theuni
-      dpausp
-      frlan
-      leona
-      osnyx
-    ];
-    scope = "Team for Flying Circus employees who collectively maintain packages.";
-    shortName = "Flying Circus employees";
-  };
-
   forgejo = {
     members = [
       adamcstephens
diff --git a/nixos/modules/services/mail/mailpit.nix b/nixos/modules/services/mail/mailpit.nix
index c3b888f15c9b..ff9adc0928b7 100644
--- a/nixos/modules/services/mail/mailpit.nix
+++ b/nixos/modules/services/mail/mailpit.nix
@@ -102,5 +102,8 @@ in
     ) instances;
   };
 
-  meta.maintainers = lib.teams.flyingcircus.members;
+  meta.maintainers = [
+    lib.maintainers.leona
+    lib.maintainers.osnyx
+  ];
 }
diff --git a/nixos/modules/services/networking/knot-resolver.nix b/nixos/modules/services/networking/knot-resolver.nix
index 9574859293d1..d943b29b5b73 100644
--- a/nixos/modules/services/networking/knot-resolver.nix
+++ b/nixos/modules/services/networking/knot-resolver.nix
@@ -33,8 +33,9 @@ in
 {
   meta.maintainers = [
     lib.maintainers.vcunat # upstream developer
-  ]
-  ++ lib.teams.flyingcircus.members;
+    lib.maintainers.leona
+    lib.maintainers.osnyx
+  ];
 
   ###### interface
   options.services.knot-resolver = {
diff --git a/nixos/tests/mailpit.nix b/nixos/tests/mailpit.nix
index 5f92b5030fda..fae05c7f3109 100644
--- a/nixos/tests/mailpit.nix
+++ b/nixos/tests/mailpit.nix
@@ -1,7 +1,10 @@
 { lib, ... }:
 {
   name = "mailpit";
-  meta.maintainers = lib.teams.flyingcircus.members;
+  meta.maintainers = [
+    lib.maintainers.leona
+    lib.maintainers.osnyx
+  ];
 
   nodes.machine =
     { pkgs, ... }:
diff --git a/nixos/tests/matomo.nix b/nixos/tests/matomo.nix
index 9562cb7e4e2b..8163502e9ef2 100644
--- a/nixos/tests/matomo.nix
+++ b/nixos/tests/matomo.nix
@@ -46,13 +46,12 @@
       machine.wait_for_unit("phpfpm-matomo.service")
   '';
 
-  meta.maintainers =
-    with lib.maintainers;
-    [
-      florianjacob
-      mmilata
-      twey
-      boozedog
-    ]
-    ++ lib.teams.flyingcircus.members;
+  meta.maintainers = with lib.maintainers; [
+    florianjacob
+    mmilata
+    twey
+    boozedog
+    leona
+    osnyx
+  ];
 }
diff --git a/nixos/tests/oci-containers.nix b/nixos/tests/oci-containers.nix
index 947af777bc73..34f0f9f3955b 100644
--- a/nixos/tests/oci-containers.nix
+++ b/nixos/tests/oci-containers.nix
@@ -73,7 +73,11 @@ let
     type:
     makeTest {
       name = "oci-containers-podman-rootless-${type}";
-      meta.maintainers = lib.teams.flyingcircus.members ++ [ lib.maintainers.ma27 ];
+      meta.maintainers = [
+        lib.maintainers.leona
+        lib.maintainers.ma27
+        lib.maintainers.osnyx
+      ];
       nodes = {
         podman =
           { pkgs, ... }:
diff --git a/nixos/tests/postgresql/anonymizer.nix b/nixos/tests/postgresql/anonymizer.nix
index 30775761f563..a5853e5ed533 100644
--- a/nixos/tests/postgresql/anonymizer.nix
+++ b/nixos/tests/postgresql/anonymizer.nix
@@ -11,7 +11,10 @@ let
     package:
     makeTest {
       name = "postgresql_anonymizer-${package.name}";
-      meta.maintainers = lib.teams.flyingcircus.members;
+      meta.maintainers = [
+        lib.maintainers.leona
+        lib.maintainers.osnyx
+      ];
 
       nodes.machine =
         { pkgs, ... }:
diff --git a/pkgs/by-name/el/eliot-tree/package.nix b/pkgs/by-name/el/eliot-tree/package.nix
index 637f4af95be0..5b7fa0a7a91f 100644
--- a/pkgs/by-name/el/eliot-tree/package.nix
+++ b/pkgs/by-name/el/eliot-tree/package.nix
@@ -46,6 +46,5 @@ python3Packages.buildPythonApplication rec {
     description = "Render Eliot logs as an ASCII tree";
     mainProgram = "eliot-tree";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.dpausp ];
   };
 }
diff --git a/pkgs/by-name/kn/knot-resolver_6/package.nix b/pkgs/by-name/kn/knot-resolver_6/package.nix
index 0054e53d6dc8..2948e78eb238 100644
--- a/pkgs/by-name/kn/knot-resolver_6/package.nix
+++ b/pkgs/by-name/kn/knot-resolver_6/package.nix
@@ -142,8 +142,9 @@ let
       platforms = lib.platforms.unix;
       maintainers = [
         lib.maintainers.vcunat # upstream developer
+        lib.maintainers.leona
+        lib.maintainers.osnyx
       ];
-      teams = [ lib.teams.flyingcircus ];
       mainProgram = "kresd";
     };
   });
diff --git a/pkgs/by-name/ma/matomo/package.nix b/pkgs/by-name/ma/matomo/package.nix
index e0747f575663..b58b4e8feb82 100644
--- a/pkgs/by-name/ma/matomo/package.nix
+++ b/pkgs/by-name/ma/matomo/package.nix
@@ -117,7 +117,8 @@ stdenv.mkDerivation (finalAttrs: {
       twey
       boozedog
       niklaskorz
+      leona
+      osnyx
     ];
-    teams = [ lib.teams.flyingcircus ];
   };
 })
diff --git a/pkgs/by-name/pg/pg-dump-anon/package.nix b/pkgs/by-name/pg/pg-dump-anon/package.nix
index 09124ee49285..87cdad5ad56f 100644
--- a/pkgs/by-name/pg/pg-dump-anon/package.nix
+++ b/pkgs/by-name/pg/pg-dump-anon/package.nix
@@ -33,7 +33,10 @@ buildGoModule rec {
   meta = {
     description = "Export databases with data being anonymized with the anonymizer extension";
     homepage = "https://postgresql-anonymizer.readthedocs.io/en/stable/";
-    teams = [ lib.teams.flyingcircus ];
+    maintainers = [
+      lib.maintainers.leona
+      lib.maintainers.osnyx
+    ];
     license = lib.licenses.postgresql;
     mainProgram = "pg_dump_anon";
   };
diff --git a/pkgs/by-name/pr/proftpd/package.nix b/pkgs/by-name/pr/proftpd/package.nix
index c9b901b41c41..6e3bd70b8704 100644
--- a/pkgs/by-name/pr/proftpd/package.nix
+++ b/pkgs/by-name/pr/proftpd/package.nix
@@ -80,7 +80,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     homepage = "http://www.proftpd.org/";
-    teams = [ lib.teams.flyingcircus ];
+    maintainers = [
+      lib.maintainers.leona
+      lib.maintainers.osnyx
+    ];
     license = lib.licenses.gpl2Plus;
     mainProgram = "proftpd";
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix b/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix
index 686830ac1118..0a66b8634a08 100644
--- a/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix
+++ b/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix
@@ -31,8 +31,11 @@ rustPlatform.buildRustPackage rec {
 
   meta = {
     description = "Command line tool for RabbitMQ that uses the HTTP API";
-    teams = [ lib.teams.flyingcircus ];
     homepage = "https://www.rabbitmq.com/docs/management-cli";
+    maintainers = [
+      lib.maintainers.leona
+      lib.maintainers.osnyx
+    ];
     license = with lib.licenses; [
       mit
       asl20
diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix
index 7ac0377af170..f4f16726142e 100644
--- a/pkgs/development/python-modules/eliot/default.nix
+++ b/pkgs/development/python-modules/eliot/default.nix
@@ -68,6 +68,5 @@ buildPythonPackage rec {
     changelog = "https://github.com/itamarst/eliot/blob/${version}/docs/source/news.rst";
     mainProgram = "eliot-prettyprint";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ dpausp ];
   };
 }
diff --git a/pkgs/development/python-modules/myst-docutils/default.nix b/pkgs/development/python-modules/myst-docutils/default.nix
index 4f298f681cec..dcff36a3ef4a 100644
--- a/pkgs/development/python-modules/myst-docutils/default.nix
+++ b/pkgs/development/python-modules/myst-docutils/default.nix
@@ -71,6 +71,5 @@ buildPythonPackage rec {
     homepage = "https://github.com/executablebooks/MyST-Parser";
     changelog = "https://github.com/executablebooks/MyST-Parser/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ dpausp ];
   };
 }
diff --git a/pkgs/servers/sql/percona-server/8_0.nix b/pkgs/servers/sql/percona-server/8_0.nix
index 125cc007e43b..27d6c1bbdd76 100644
--- a/pkgs/servers/sql/percona-server/8_0.nix
+++ b/pkgs/servers/sql/percona-server/8_0.nix
@@ -207,7 +207,10 @@ stdenv.mkDerivation (finalAttrs: {
       Long-term support release.
     '';
     license = lib.licenses.gpl2Only;
-    teams = [ lib.teams.flyingcircus ];
+    maintainers = [
+      lib.maintainers.leona
+      lib.maintainers.osnyx
+    ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/servers/sql/percona-server/8_4.nix b/pkgs/servers/sql/percona-server/8_4.nix
index f7ae2b9e6abf..00146c43365d 100644
--- a/pkgs/servers/sql/percona-server/8_4.nix
+++ b/pkgs/servers/sql/percona-server/8_4.nix
@@ -219,7 +219,10 @@ stdenv.mkDerivation (finalAttrs: {
       Long-term support release.
     '';
     license = lib.licenses.gpl2Only;
-    teams = [ lib.teams.flyingcircus ];
+    maintainers = [
+      lib.maintainers.leona
+      lib.maintainers.osnyx
+    ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/servers/sql/postgresql/ext/anonymizer.nix b/pkgs/servers/sql/postgresql/ext/anonymizer.nix
index 23958e28a7cc..84800cb5635a 100644
--- a/pkgs/servers/sql/postgresql/ext/anonymizer.nix
+++ b/pkgs/servers/sql/postgresql/ext/anonymizer.nix
@@ -24,7 +24,7 @@ buildPgrxExtension {
   passthru.tests = nixosTests.postgresql.anonymizer.passthru.override postgresql;
 
   meta = {
-    inherit (pg-dump-anon.meta) homepage teams license;
+    inherit (pg-dump-anon.meta) homepage maintainers license;
     description = "Extension to mask or replace personally identifiable information (PII) or commercially sensitive data from a PostgreSQL database";
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix b/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix
index a5411e49746e..fc98f7746178 100644
--- a/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix
@@ -68,7 +68,10 @@ buildPgrxExtension (finalAttrs: {
     # Upstream removed support for PostgreSQL 13 on 0.9.0: https://github.com/timescale/pgvectorscale/releases/tag/0.9.0
     broken = lib.versionOlder postgresql.version "14";
     homepage = "https://github.com/timescale/pgvectorscale";
-    teams = [ lib.teams.flyingcircus ];
+    maintainers = [
+      lib.maintainers.leona
+      lib.maintainers.osnyx
+    ];
     description = "Complement to pgvector for high performance, cost efficient vector search on large workloads";
     license = lib.licenses.postgresql;
     platforms = postgresql.meta.platforms;
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 368e2ddf9b56..d50f07e7001f 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -136,7 +136,10 @@ let
         description = "Web application accelerator also known as a caching HTTP reverse proxy";
         homepage = "https://www.varnish-cache.org";
         license = lib.licenses.bsd2;
-        teams = [ lib.teams.flyingcircus ];
+        maintainers = [
+          lib.maintainers.leona
+          lib.maintainers.osnyx
+        ];
         platforms = lib.platforms.unix;
       };
     };
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix
index 8c359af05370..8fa871f7c6c7 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix
@@ -14,7 +14,6 @@ mkDiscoursePlugin {
   };
   meta = {
     homepage = "https://github.com/discourse/discourse-docs";
-    maintainers = with lib.maintainers; [ dpausp ];
     license = lib.licenses.mit;
     description = "Find and filter knowledge base topics";
   };
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix
index b7e48f7c3342..af827a3d6d95 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix
@@ -23,7 +23,6 @@ mkDiscoursePlugin {
 
   meta = {
     homepage = "https://github.com/discourse/discourse-prometheus";
-    maintainers = with lib.maintainers; [ dpausp ];
     license = lib.licenses.mit;
     description = "Official Discourse Plugin for Prometheus Monitoring";
   };
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix
index 0d8c84649e49..db5b11411cf4 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix
@@ -14,7 +14,6 @@ mkDiscoursePlugin {
   };
   meta = {
     homepage = "https://github.com/discourse/discourse-saved-searches";
-    maintainers = with lib.maintainers; [ dpausp ];
     license = lib.licenses.mit;
     description = "Allow users to save searches and be notified of new results";
   };
diff --git a/pkgs/tools/backup/percona-xtrabackup/generic.nix b/pkgs/tools/backup/percona-xtrabackup/generic.nix
index 686178c57952..eb64e217a550 100644
--- a/pkgs/tools/backup/percona-xtrabackup/generic.nix
+++ b/pkgs/tools/backup/percona-xtrabackup/generic.nix
@@ -109,7 +109,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "http://www.percona.com/software/percona-xtrabackup";
     license = lib.licenses.gpl2Only;
     platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.izorkin ];
-    teams = [ lib.teams.flyingcircus ];
+    maintainers = [
+      lib.maintainers.izorkin
+      lib.maintainers.leona
+      lib.maintainers.osnyx
+    ];
   };
 })