diff --git a/CODEOWNERS b/CODEOWNERS
index 0aad89b..2f24f6f 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -36,7 +36,9 @@
 /ladder/teams/proxy.yaml @cilium/proxy
 /ladder/teams/pwru.yaml @cilium/pwru
 /ladder/teams/release-managers.yaml @cilium/release-managers
-/ladder/teams/security.yaml @cilium/security
+/ladder/teams/security-cilium.yaml @cilium/security-cilium
+/ladder/teams/security-org.yaml @cilium/security-org
+/ladder/teams/security-tetragon.yaml @cilium/security-tetragon
 /ladder/teams/sig-agent.yaml @cilium/sig-agent
 /ladder/teams/sig-bgp.yaml @cilium/sig-bgp
 /ladder/teams/sig-cilium-cli.yaml @cilium/sig-cilium-cli
diff --git a/ladder/reviewers.yaml b/ladder/reviewers.yaml
index a786522..eb19109 100644
--- a/ladder/reviewers.yaml
+++ b/ladder/reviewers.yaml
@@ -68,6 +68,7 @@ reviewers:
 - paularah
 - paulcacheux
 - pchaigno
+- peoyekunle
 - pippolo84
 - qmonnet
 - rastislavs
diff --git a/ladder/teams/security-cilium.yaml b/ladder/teams/security-cilium.yaml
new file mode 100644
index 0000000..945d2ac
--- /dev/null
+++ b/ladder/teams/security-cilium.yaml
@@ -0,0 +1,13 @@
+members:
+- aanm
+- christarazi
+- gandro
+- joestringer
+- jrajahalme
+- julianwiedmann
+- nebril
+- nezdolik
+- pchaigno
+- rolinh
+- sayboras
+- youngnick
diff --git a/ladder/teams/security-org.yaml b/ladder/teams/security-org.yaml
new file mode 100644
index 0000000..2f209b6
--- /dev/null
+++ b/ladder/teams/security-org.yaml
@@ -0,0 +1,5 @@
+members:
+- aanm
+- ferozsalam
+- joestringer
+- peoyekunle
diff --git a/ladder/teams/security-tetragon.yaml b/ladder/teams/security-tetragon.yaml
new file mode 100644
index 0000000..f1946df
--- /dev/null
+++ b/ladder/teams/security-tetragon.yaml
@@ -0,0 +1,5 @@
+members:
+- kevsecurity
+- kkourt
+- mtardy
+- olsajiri
diff --git a/ladder/teams/security.yaml b/ladder/teams/security.yaml
deleted file mode 100644
index ff4a18f..0000000
--- a/ladder/teams/security.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-members:
-- aanm
-- borkmann
-- brb
-- ferozsalam
-- joestringer
-- jrajahalme
-- mtardy
-- nezdolik
-- rolinh
diff --git a/roles/Security-Team.md b/roles/Security-Team.md
index 58ed01a..bf637ad 100644
--- a/roles/Security-Team.md
+++ b/roles/Security-Team.md
@@ -1,19 +1,26 @@
 # Security Team
 
-The security team roles and responsibilities are listed in [CONTRIBUTOR-ROLES.md](/CONTRIBUTOR-ROLES.md#security-team). The following are the current security team members:
+The security team roles and responsibilities are listed in
+[CONTRIBUTOR-ROLES.md](/CONTRIBUTOR-ROLES.md#security-team).
 
-* [André Martins](https://github.com/aanm)
-* [Daniel Borkmann](https://github.com/borkmann)
-* [Feroz Salam](https://github.com/ferozsalam)
-* [Jarno Rajahalme](https://github.com/jrajahalme)
-* [Joe Stringer](https://github.com/joestringer)
-* [John Fastabend](https://github.com/jrfastab)
-* [Julian Wiedmann](https://github.com/julianwiedmann)
-* [Kateryna Nezdolii](https://github.com/nezdolik)
-* [Kyle Simmons](https://github.com/kyle-c-simmons)
-* [Liz Rice](https://github.com/lizrice)
-* [Martynas Pumputis](https://github.com/brb)
-* [Maciej Kwiek](https://github.com/nebril)
-* [Peter Oyekunle](https://github.com/peoyekunle)
-* [Sebastian Wicki](https://github.com/gandro)
-* [Tam Mach](https://github.com/sayboras)
+The following teams are the current security team members:
+
+* [security-org](/ladder/teams/security-org.yaml) handles communications,
+  security response, triage and provides oversight;
+* [security](/ladder/teams/security.yaml) provides technical assistance with
+  managing security vulnerabilities broadly across the Cilium organization,
+  with a particular focus on the `cilium/cilium` subproject.
+* [security-tetragon](/ladder/teams/security-tetragon.yaml) provides technical
+  assistance to manage security vulnerabilities for the `cilium/tetragon`
+  subproject.
+
+## Adding new members
+
+When adding new members to these teams, the proposed members must satisfy the
+criteria defined in the contributor roles. When a new member is added to the
+team through a PR to this repository, the following memberships may need to
+be updated:
+
+* Synchronize GitHub state with this repository
+* Update security mailinglist membership
+* Cilium security team Slack channel membership