diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5dfec171c9cd..073e93651bc3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -16743,6 +16743,12 @@
     github = "merrkry";
     githubId = 124278440;
   };
+  messemar = {
+    email = "martin.messer@cyberus-technology.de";
+    name = "messemar";
+    github = "messemar";
+    githubId = 22659757;
+  };
   metalmatze = {
     email = "matthias.loibl@polarsignals.com";
     name = "Matthias Loibl";
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 857e84b7d286..1bd5ed4e9949 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -226,6 +226,18 @@ with lib.maintainers;
     shortName = "Cosmopolitan";
   };
 
+  ctrl-os = {
+    # Existing members may approve additions.
+    members = [
+      blitz
+      messemar
+      flyfloh
+    ];
+
+    scope = "Team of Cyberus Technology employees that maintain packages relevant to CTRL-OS";
+    shortName = "CTRL-OS";
+  };
+
   cuda = {
     github = "cuda-maintainers";
   };
@@ -234,7 +246,6 @@ with lib.maintainers;
     # Verify additions by approval of an already existing member of the team.
     members = [
       xanderio
-      blitz
       snu
       e1mo
     ];
diff --git a/pkgs/by-name/cy/cyclonedx-cli/package.nix b/pkgs/by-name/cy/cyclonedx-cli/package.nix
index c7272287c111..857cfd9976ee 100644
--- a/pkgs/by-name/cy/cyclonedx-cli/package.nix
+++ b/pkgs/by-name/cy/cyclonedx-cli/package.nix
@@ -34,7 +34,7 @@ buildDotnetModule rec {
     homepage = "https://github.com/CycloneDX/cyclonedx-cli";
     changelog = "https://github.com/CycloneDX/cyclonedx-cli/releases/tag/v${version}";
     maintainers = with lib.maintainers; [ thillux ];
-    teams = [ lib.teams.cyberus ];
+    teams = [ lib.teams.ctrl-os ];
     license = lib.licenses.asl20;
     platforms = with lib.platforms; (linux ++ darwin);
     mainProgram = "cyclonedx";
diff --git a/pkgs/by-name/cy/cyclonedx-python/package.nix b/pkgs/by-name/cy/cyclonedx-python/package.nix
index 0c7041c6f0b0..7001e6e3ade6 100644
--- a/pkgs/by-name/cy/cyclonedx-python/package.nix
+++ b/pkgs/by-name/cy/cyclonedx-python/package.nix
@@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/CycloneDX/cyclonedx-python";
     changelog = "https://github.com/CycloneDX/cyclonedx-python/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
-    teams = [ lib.teams.cyberus ];
+    teams = [ lib.teams.ctrl-os ];
     mainProgram = "cyclonedx-py";
   };
 }