diff --git a/ci/OWNERS b/ci/OWNERS
index ce8ceadd5657..35edeaf6cf77 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -223,7 +223,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /pkgs/top-level/java-packages.nix @NixOS/java
 
 # Jetbrains
-/pkgs/applications/editors/jetbrains @edwtjo @leona-ya
+/pkgs/applications/editors/jetbrains @edwtjo @leona-ya @theCapypara
 
 # Licenses
 /lib/licenses.nix @alyssais
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index cddadd304e8d..4d7eca3e48cb 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -538,6 +538,16 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
+  jetbrains = {
+    members = [
+      edwtjo
+      leona
+      theCapypara
+    ];
+    shortName = "Jetbrains";
+    scope = "Maintainers of the Jetbrains IDEs in nixpkgs";
+  };
+
   jitsi = {
     members = [
       cleeyv
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 244ca0a88db8..4b0828a47371 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -53,7 +53,7 @@ let
       + lib.optionalString meta.isOpenSource (
         if fromSource then " (built from source)" else " (patched binaries from jetbrains)"
       );
-    maintainers = map (x: lib.maintainers."${x}") meta.maintainers;
+    maintainers = lib.teams.jetbrains.members ++ map (x: lib.maintainers."${x}") meta.maintainers;
     license = if meta.isOpenSource then lib.licenses.asl20 else lib.licenses.unfree;
     sourceProvenance =
       if fromSource then