diff --git a/CODEOWNERS b/CODEOWNERS
index 8a5bbb6..0aad89b 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -52,8 +52,11 @@
 /ladder/teams/sig-policy.yaml @cilium/sig-policy
 /ladder/teams/sig-scalability.yaml @cilium/sig-scalability
 /ladder/teams/sig-servicemesh.yaml @cilium/sig-servicemesh
+/ladder/teams/tetragon-bpf.yaml @cilium/tetragon-bpf
 /ladder/teams/tetragon-committers.yaml @cilium/tetragon-committers
+/ladder/teams/tetragon-docs.yaml @cilium/tetragon-docs
 /ladder/teams/tetragon-reviewers.yaml @cilium/tetragon-reviewers
+/ladder/teams/tetragon-windows.yaml @cilium/tetragon-windows
 /ladder/teams/vendor.yaml @cilium/vendor
 /ladder/teams/wireguard.yaml @cilium/wireguard
 /ladder/teams/ztunnel.yaml @cilium/ztunnel
diff --git a/ladder/teams/tetragon-bpf.yaml b/ladder/teams/tetragon-bpf.yaml
new file mode 100644
index 0000000..760326e
--- /dev/null
+++ b/ladder/teams/tetragon-bpf.yaml
@@ -0,0 +1,4 @@
+members:
+- kkourt
+- mtardy
+- olsajiri
diff --git a/ladder/teams/tetragon-docs.yaml b/ladder/teams/tetragon-docs.yaml
new file mode 100644
index 0000000..e7b90b4
--- /dev/null
+++ b/ladder/teams/tetragon-docs.yaml
@@ -0,0 +1,2 @@
+members:
+- mtardy
diff --git a/ladder/teams/tetragon-reviewers.yaml b/ladder/teams/tetragon-reviewers.yaml
index 638f026..f8434d6 100644
--- a/ladder/teams/tetragon-reviewers.yaml
+++ b/ladder/teams/tetragon-reviewers.yaml
@@ -2,7 +2,6 @@ members:
 - ExceptionalHandler
 - FedeDP
 - andrewstrohman
-- jrfastab
 - kevsecurity
 - kkourt
 - michi-covalent
diff --git a/ladder/teams/tetragon-windows.yaml b/ladder/teams/tetragon-windows.yaml
new file mode 100644
index 0000000..5d4f572
--- /dev/null
+++ b/ladder/teams/tetragon-windows.yaml
@@ -0,0 +1,2 @@
+members:
+- ExceptionalHandler