diff --git a/ci/OWNERS b/ci/OWNERS
index 695c91aa1af0..052135bf6a68 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -519,3 +519,7 @@ pkgs/by-name/wa/warp-terminal/  @emilytrau @imadnyc @FlameFlag @johnrtitor
 /pkgs/build-support/build-nim-package.nix @NixOS/nim
 /pkgs/build-support/build-nim-sbom.nix    @NixOS/nim
 /pkgs/top-level/nim-overrides.nix         @NixOS/nim
+
+# Radicle
+/pkgs/build-support/fetchradicle/      @NixOS/radicle
+/pkgs/build-support/fetchradiclepatch/ @NixOS/radicle
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index a4dd4e619691..ef8d01cac28e 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -687,6 +687,10 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
+  radicle = {
+    github = "radicle";
+  };
+
   rocm = {
     github = "rocm";
   };
diff --git a/nixos/modules/services/continuous-integration/radicle/adapters/native.nix b/nixos/modules/services/continuous-integration/radicle/adapters/native.nix
index 8e2a19f447d6..3cbc191a96d6 100644
--- a/nixos/modules/services/continuous-integration/radicle/adapters/native.nix
+++ b/nixos/modules/services/continuous-integration/radicle/adapters/native.nix
@@ -15,7 +15,7 @@ let
 in
 
 {
-  meta.maintainers = with lib.maintainers; [ defelo ];
+  meta.teams = [ lib.teams.radicle ];
 
   options.services.radicle.ci.adapters.native = {
     instances = lib.mkOption {
diff --git a/nixos/modules/services/continuous-integration/radicle/ci-broker.nix b/nixos/modules/services/continuous-integration/radicle/ci-broker.nix
index aab0967e5b51..6c285ea656f7 100644
--- a/nixos/modules/services/continuous-integration/radicle/ci-broker.nix
+++ b/nixos/modules/services/continuous-integration/radicle/ci-broker.nix
@@ -37,7 +37,7 @@ let
 in
 
 {
-  meta.maintainers = with lib.maintainers; [ defelo ];
+  meta.teams = [ lib.teams.radicle ];
 
   options.services.radicle.ci.broker = {
     enable = lib.mkEnableOption "radicle-ci-broker";
diff --git a/nixos/modules/services/misc/radicle.nix b/nixos/modules/services/misc/radicle.nix
index ed404dbf4bf9..da174a6b5331 100644
--- a/nixos/modules/services/misc/radicle.nix
+++ b/nixos/modules/services/misc/radicle.nix
@@ -437,9 +437,5 @@ in
     ]
   );
 
-  meta.maintainers = with lib.maintainers; [
-    defelo
-    julm
-    lorenzleutgeb
-  ];
+  meta.teams = [ lib.teams.radicle ];
 }
diff --git a/nixos/tests/radicle-ci-broker.nix b/nixos/tests/radicle-ci-broker.nix
index 28330c7784af..c65ddf8af69f 100644
--- a/nixos/tests/radicle-ci-broker.nix
+++ b/nixos/tests/radicle-ci-broker.nix
@@ -16,7 +16,7 @@ in
 
 {
   name = "radicle-ci-broker";
-  meta.maintainers = with lib.maintainers; [ defelo ];
+  meta.maintainers = lib.teams.radicle.members;
 
   nodes.seed = {
     virtualisation.credentials = {
diff --git a/nixos/tests/radicle.nix b/nixos/tests/radicle.nix
index cfc1ddc0c2e6..17a26c85820b 100644
--- a/nixos/tests/radicle.nix
+++ b/nixos/tests/radicle.nix
@@ -2,7 +2,7 @@
 # and verifies that an alice peer can host a repository on the seed,
 # and that a bob peer can send alice a patch via the seed.
 
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   # The Node ID depends on nodes.seed.services.radicle.privateKeyFile
@@ -63,13 +63,7 @@ in
 {
   name = "radicle";
 
-  meta = with pkgs.lib.maintainers; {
-    maintainers = [
-      defelo
-      julm
-      lorenzleutgeb
-    ];
-  };
+  meta.maintainers = lib.teams.radicle.members;
 
   nodes = {
     seed =
diff --git a/pkgs/by-name/ra/radicle-ci-broker/package.nix b/pkgs/by-name/ra/radicle-ci-broker/package.nix
index eb58afa5334a..54a86ae40314 100644
--- a/pkgs/by-name/ra/radicle-ci-broker/package.nix
+++ b/pkgs/by-name/ra/radicle-ci-broker/package.nix
@@ -72,7 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       mit
       asl20
     ];
-    maintainers = with lib.maintainers; [ defelo ];
+    teams = [ lib.teams.radicle ];
     mainProgram = "cib";
   };
 })
diff --git a/pkgs/by-name/ra/radicle-desktop/package.nix b/pkgs/by-name/ra/radicle-desktop/package.nix
index ee7db4fadb68..74f145b4b6e8 100644
--- a/pkgs/by-name/ra/radicle-desktop/package.nix
+++ b/pkgs/by-name/ra/radicle-desktop/package.nix
@@ -129,11 +129,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://app.radicle.xyz/nodes/seed.radicle.xyz/rad:z4D5UCArafTzTQpDZNQRuqswh3ury/tree/CHANGELOG.md";
     license = lib.licenses.gpl3Only;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [
-      matthiasbeyer
-      defelo
-      faukah
-    ];
+    teams = [ lib.teams.radicle ];
+    maintainers = with lib.maintainers; [ faukah ];
     mainProgram = "radicle-desktop";
   };
 })
diff --git a/pkgs/by-name/ra/radicle-explorer/package.nix b/pkgs/by-name/ra/radicle-explorer/package.nix
index 3a268662b20a..f11e26d9af52 100644
--- a/pkgs/by-name/ra/radicle-explorer/package.nix
+++ b/pkgs/by-name/ra/radicle-explorer/package.nix
@@ -111,11 +111,8 @@ lib.fix (
         homepage = "https://radicle.xyz";
         license = lib.licenses.gpl3;
 
-        maintainers = with lib.maintainers; [
-          tazjin
-          lorenzleutgeb
-          defelo
-        ];
+        teams = [ lib.teams.radicle ];
+        maintainers = with lib.maintainers; [ tazjin ];
       };
     }
   )
diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix
index 2546734433e8..852e76731b55 100644
--- a/pkgs/by-name/ra/radicle-httpd/package.nix
+++ b/pkgs/by-name/ra/radicle-httpd/package.nix
@@ -86,11 +86,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
       asl20
     ];
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [
-      gador
-      lorenzleutgeb
-      defelo
-    ];
+    teams = [ lib.teams.radicle ];
+    maintainers = with lib.maintainers; [ gador ];
     mainProgram = "radicle-httpd";
   };
 })
diff --git a/pkgs/by-name/ra/radicle-job/package.nix b/pkgs/by-name/ra/radicle-job/package.nix
index b688e421b6af..b84a56428ee5 100644
--- a/pkgs/by-name/ra/radicle-job/package.nix
+++ b/pkgs/by-name/ra/radicle-job/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       mit
       asl20
     ];
-    maintainers = with lib.maintainers; [ defelo ];
+    teams = [ lib.teams.radicle ];
     mainProgram = "rad-job";
   };
 })
diff --git a/pkgs/by-name/ra/radicle-native-ci/package.nix b/pkgs/by-name/ra/radicle-native-ci/package.nix
index b554528d10ca..21d2f3b76f4f 100644
--- a/pkgs/by-name/ra/radicle-native-ci/package.nix
+++ b/pkgs/by-name/ra/radicle-native-ci/package.nix
@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       mit
       asl20
     ];
-    maintainers = with lib.maintainers; [ defelo ];
+    teams = [ lib.teams.radicle ];
     mainProgram = "radicle-native-ci";
   };
 })
diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix
index 57fe9f6b471b..023e7fbea83e 100644
--- a/pkgs/by-name/ra/radicle-node/package.nix
+++ b/pkgs/by-name/ra/radicle-node/package.nix
@@ -171,11 +171,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       mit
     ];
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [
-      amesgen
-      lorenzleutgeb
-      defelo
-    ];
+    teams = [ lib.teams.radicle ];
     mainProgram = "rad";
   };
 })
diff --git a/pkgs/by-name/ra/radicle-tui/package.nix b/pkgs/by-name/ra/radicle-tui/package.nix
index ac536ae1bc59..1e2d3564d3e1 100644
--- a/pkgs/by-name/ra/radicle-tui/package.nix
+++ b/pkgs/by-name/ra/radicle-tui/package.nix
@@ -72,10 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       asl20 # or
       mit
     ];
-    maintainers = with lib.maintainers; [
-      matthiasbeyer
-      defelo
-    ];
+    teams = [ lib.teams.radicle ];
     mainProgram = "rad-tui";
   };
 })