diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 7b95a1030df9..2b6bc2e37a3d 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -56,16 +56,6 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
-  apm = {
-    scope = "Team for packages maintained by employees of Akademie für Pflegeberufe und Management GmbH.";
-    shortName = "apm employees";
-    # Edits to this list should only be done by an already existing member.
-    members = [
-      DutchGerman
-      friedow
-    ];
-  };
-
   apparmor = {
     scope = "AppArmor-related modules, userspace tool packages and profiles";
     shortName = "apparmor";
diff --git a/pkgs/development/python-modules/jsonschema-rs/default.nix b/pkgs/development/python-modules/jsonschema-rs/default.nix
index ea905a0a5531..92de0729d082 100644
--- a/pkgs/development/python-modules/jsonschema-rs/default.nix
+++ b/pkgs/development/python-modules/jsonschema-rs/default.nix
@@ -48,6 +48,9 @@ buildPythonPackage rec {
     homepage = "https://github.com/Stranger6667/jsonschema/tree/master/crates/jsonschema-py";
     changelog = "https://github.com/Stranger6667/jsonschema/blob/python-v${version}/crates/jsonschema-py/CHANGELOG.md";
     license = lib.licenses.mit;
-    teams = [ lib.teams.apm ];
+    maintainers = with lib.maintainers; [
+      DutchGerman
+      friedow
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/minify-html/default.nix b/pkgs/development/python-modules/minify-html/default.nix
index 61f81813dc83..0cd4728defed 100644
--- a/pkgs/development/python-modules/minify-html/default.nix
+++ b/pkgs/development/python-modules/minify-html/default.nix
@@ -35,6 +35,9 @@ buildPythonPackage rec {
     homepage = "https://github.com/wilsonzlin/minify-html/tree/master/minify-html-python";
     changelog = "https://github.com/wilsonzlin/minify-html/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    teams = [ lib.teams.apm ];
+    maintainers = with lib.maintainers; [
+      DutchGerman
+      friedow
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/tiptapy/default.nix b/pkgs/development/python-modules/tiptapy/default.nix
index 52c625b32c23..fadb4b44b03a 100644
--- a/pkgs/development/python-modules/tiptapy/default.nix
+++ b/pkgs/development/python-modules/tiptapy/default.nix
@@ -37,6 +37,9 @@ buildPythonPackage {
     homepage = "https://github.com/stckme/tiptapy";
     changelog = "https://github.com/stckme/tiptapy/blob/master/CHANGELOG.rst";
     license = lib.licenses.mit;
-    teams = [ lib.teams.apm ];
+    maintainers = with lib.maintainers; [
+      DutchGerman
+      friedow
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix
index 5db33be5ab0b..68656efea693 100644
--- a/pkgs/development/python-modules/weasyprint/default.nix
+++ b/pkgs/development/python-modules/weasyprint/default.nix
@@ -114,6 +114,9 @@ buildPythonPackage (finalAttrs: {
     homepage = "https://weasyprint.org/";
     license = lib.licenses.bsd3;
     mainProgram = "weasyprint";
-    teams = [ lib.teams.apm ];
+    maintainers = with lib.maintainers; [
+      DutchGerman
+      friedow
+    ];
   };
 })
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 33622bd1bd99..9e12806bd7ce 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -1065,7 +1065,10 @@ let
         homepage = "https://github.com/evanmiller/mod_zip";
         license = with lib.licenses; [ bsd3 ];
         broken = stdenv.hostPlatform.isDarwin;
-        teams = [ lib.teams.apm ];
+        maintainers = with lib.maintainers; [
+          DutchGerman
+          friedow
+        ];
       };
     };
 
diff --git a/pkgs/servers/sql/postgresql/ext/pg_byteamagic.nix b/pkgs/servers/sql/postgresql/ext/pg_byteamagic.nix
index 94f35244ff55..4de8f09e06b1 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_byteamagic.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_byteamagic.nix
@@ -44,7 +44,10 @@ postgresqlBuildExtension (finalAttrs: {
     homepage = "https://github.com/nmandery/pg_byteamagic";
     changelog = "https://raw.githubusercontent.com/nmandery/pg_byteamagic/refs/tags/v${finalAttrs.version}/Changes";
     license = lib.licenses.bsd2WithViews;
-    teams = [ lib.teams.apm ];
+    maintainers = with lib.maintainers; [
+      DutchGerman
+      friedow
+    ];
     platforms = postgresql.meta.platforms;
   };
 })