Add sig labels and use aliases in OWNERS files

55 files changed, 360 insertions, 166 deletions

diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
new file mode 100644
index 00000000..113d5ee5
--- /dev/null
+++ b/OWNERS_ALIASES
@@ -0,0 +1,116 @@
+aliases:
+  sig-api-machinery-leads:
+  - lavalamp
+  - deads2k
+  sig-apps-leads:
+  - michelleN
+  - mattfarina
+  - prydonius
+  sig-architecture-leads:
+  - bgrant0607
+  - jdumars
+  sig-auth-leads:
+  - ericchiang
+  - liggitt
+  - deads2k
+  sig-autoscaling-leads:
+  - mwielgus
+  - directxman12
+  sig-aws-leads:
+  - justinsb
+  - kris-nova
+  - chrislovecnm
+  - mfburnett
+  sig-azure-leads:
+  - slack
+  - colemickens
+  - jdumars
+  sig-big-data-leads:
+  - foxish
+  - erikerlandson
+  sig-cli-leads:
+  - fabianofranz
+  - pwittrock
+  - AdoHe
+  sig-cluster-lifecycle-leads:
+  - lukemarsden
+  - jbeda
+  - roberthbailey
+  - luxas
+  sig-cluster-ops-leads:
+  - zehicle
+  - jdumars
+  sig-contributor-experience-leads:
+  - grodrigues3
+  - Phillels
+  sig-docs-leads:
+  - devin-donnelly
+  - jaredbhatti
+  sig-gcp-leads:
+  - abgworrall
+  sig-multicluster-leads:
+  - csbell
+  - quinton-hoole
+  sig-instrumentation-leads:
+  - piosz
+  - fabxc
+  sig-network-leads:
+  - thockin
+  - dcbw
+  - caseydavenport
+  sig-node-leads:
+  - dchen1107
+  - derekwaynecarr
+  sig-on-premise-leads:
+  - marcoceppi
+  - dghubble
+  sig-openstack-leads:
+  - idvoretskyi
+  - xsgordon
+  sig-product-management-leads:
+  - apsinha
+  - idvoretskyi
+  - calebamiles
+  sig-release-leads:
+  - pwittrock
+  - calebamiles
+  sig-scalability-leads:
+  - wojtek-t
+  - countspongebob
+  - jbeda
+  sig-scheduling-leads:
+  - davidopp
+  - timothysc
+  sig-service-catalog-leads:
+  - pmorie
+  - arschles
+  - vaikas-google
+  - duglin
+  sig-storage-leads:
+  - saad-ali
+  - childsb
+  sig-testing-leads:
+  - spiffxp
+  - fejta
+  - timothysc
+  sig-ui-leads:
+  - danielromlein
+  - floreks
+  sig-windows-leads:
+  - michmike
+  wg-resource-management-leads:
+  - vishh
+  - derekwaynecarr
+  wg-container-identity-leads:
+  - smarterclayton
+  - destijl
+  wg-kubeadm-adoption-leads:
+  - luxas
+  - justinsb
+  wg-cluster-api-leads:
+  - kris-nova
+  - pipejakob
+  - roberthbailey
+  wg-app-def-leads:
+  - ant31
+  - sebgoa
diff --git a/contributors/design-proposals/api-machinery/OWNERS b/contributors/design-proposals/api-machinery/OWNERS
new file mode 100644
index 00000000..0df76e64
--- /dev/null
+++ b/contributors/design-proposals/api-machinery/OWNERS
@@ -0,0 +1,6 @@
+reviewers:
+  - sig-api-machinery-leads
+approvers:
+  - sig-api-machinery-leads
+labels:
+  - sig/api-machinery
diff --git a/contributors/design-proposals/apps/OWNERS b/contributors/design-proposals/apps/OWNERS
new file mode 100644
index 00000000..12723930
--- /dev/null
+++ b/contributors/design-proposals/apps/OWNERS
@@ -0,0 +1,6 @@
+reviewers:
+  - sig-apps-leads
+approvers:
+  - sig-apps-leads
+labels:
+  - sig/apps
diff --git a/contributors/design-proposals/architecture/OWNERS b/contributors/design-proposals/architecture/OWNERS
new file mode 100644
index 00000000..2df39a59
--- /dev/null
+++ b/contributors/design-proposals/architecture/OWNERS
@@ -0,0 +1,6 @@
+reviewers:
+  - sig-architecture-leads
+approvers:
+  - sig-architecture-leads
+labels:
+  - sig/architecture
diff --git a/contributors/design-proposals/auth/OWNERS b/contributors/design-proposals/auth/OWNERS
new file mode 100644
index 00000000..3100c753
--- /dev/null
+++ b/contributors/design-proposals/auth/OWNERS
@@ -0,0 +1,6 @@
+reviewers:
+  - sig-auth-leads
+approvers:
+  - sig-auth-leads
+labels:
+  - sig/auth
diff --git a/contributors/design-proposals/autoscaling/OWNERS b/contributors/design-proposals/autoscaling/OWNERS
new file mode 100644
index 00000000..17089492
--- /dev/null
+++ b/contributors/design-proposals/autoscaling/OWNERS
@@ -0,0 +1,6 @@
+reviewers:
+  - sig-autoscaling-leads
+approvers:
+  - sig-autoscaling-leads
+labels:
+  - sig/autoscaling
diff --git a/contributors/design-proposals/aws/OWNERS b/contributors/design-proposals/aws/OWNERS
new file mode 100644
index 00000000..83317bbe
--- /dev/null
+++ b/contributors/design-proposals/aws/OWNERS
@@ -0,0 +1,6 @@
+reviewers:
+  - sig-aws-leads
+approvers:
+  - sig-aws-leads
+labels:
+  - sig/aws
diff --git a/contributors/design-proposals/cli/OWNERS b/contributors/design-proposals/cli/OWNERS
index 47f590b6..248d3e7c 100644
--- a/contributors/design-proposals/cli/OWNERS
+++ b/contributors/design-proposals/cli/OWNERS
@@ -1,4 +1,6 @@
 reviewers:
-  - pwittrock
+  - sig-cli-leads
 approvers:
-  - pwittrock
+  - sig-cli-leads
+labels:
+  - sig/cli
diff --git a/contributors/design-proposals/cluster-lifecycle/OWNERS b/contributors/design-proposals/cluster-lifecycle/OWNERS
new file mode 100644
index 00000000..d69f24ee
--- /dev/null
+++ b/contributors/design-proposals/cluster-lifecycle/OWNERS
@@ -0,0 +1,6 @@
+reviewers:
+  - sig-cluster-lifecycle-leads
+approvers:
+  - sig-cluster-lifecycle-leads
+labels:
+  - sig/cluster-lifecycle
diff --git a/contributors/design-proposals/gcp/OWNERS b/contributors/design-proposals/gcp/OWNERS
new file mode 100644
index 00000000..cd2232f4
--- /dev/null
+++ b/contributors/design-proposals/gcp/OWNERS
@@ -0,0 +1,6 @@
+reviewers:
+  - sig-gcp-leads
+approvers:
+  - sig-gcp-leads
+labels:
+  - sig/gcp
diff --git a/contributors/design-proposals/instrumentation/OWNERS b/contributors/design-proposals/instrumentation/OWNERS
new file mode 100644
index 00000000..8e29eafa
--- /dev/null
+++ b/contributors/design-proposals/instrumentation/OWNERS
@@ -0,0 +1,6 @@
+reviewers:
+  - sig-instrumentation-leads
+approvers:
+  - sig-instrumentation-leads
+labels:
+  - sig/instrumentation
diff --git a/contributors/design-proposals/multicluster/OWNERS b/contributors/design-proposals/multicluster/OWNERS
new file mode 100644
index 00000000..fca0e564
--- /dev/null
+++ b/contributors/design-proposals/multicluster/OWNERS
@@ -0,0 +1,6 @@
+reviewers:
+  - sig-multicluster-leads
+approvers:
+  - sig-multicluster-leads
+labels:
+  - sig/multicluster
diff --git a/contributors/design-proposals/network/OWNERS b/contributors/design-proposals/network/OWNERS
new file mode 100644
index 00000000..1939ca5c
--- /dev/null
+++ b/contributors/design-proposals/network/OWNERS
@@ -0,0 +1,6 @@
+reviewers:
+  - sig-network-leads
+approvers:
+  - sig-network-leads
+labels:
+  - sig/network
diff --git a/contributors/design-proposals/node/OWNERS b/contributors/design-proposals/node/OWNERS
new file mode 100644
index 00000000..ab6d8dd5
--- /dev/null
+++ b/contributors/design-proposals/node/OWNERS
@@ -0,0 +1,6 @@
+reviewers:
+  - sig-node-leads
+approvers:
+  - sig-node-leads
+labels:
+  - sig/node
diff --git a/contributors/design-proposals/release/OWNERS b/contributors/design-proposals/release/OWNERS
new file mode 100644
index 00000000..9d8e7403
--- /dev/null
+++ b/contributors/design-proposals/release/OWNERS
@@ -0,0 +1,6 @@
+reviewers:
+  - sig-release-leads
+approvers:
+  - sig-release-leads
+labels:
+  - sig/release
diff --git a/contributors/design-proposals/resource-management/OWNERS b/contributors/design-proposals/resource-management/OWNERS
new file mode 100644
index 00000000..60221854
--- /dev/null
+++ b/contributors/design-proposals/resource-management/OWNERS
@@ -0,0 +1,4 @@
+reviewers:
+  - wg-resource-management-leads
+approvers:
+  - wg-resource-management-leads
diff --git a/contributors/design-proposals/scalability/OWNERS b/contributors/design-proposals/scalability/OWNERS
new file mode 100644
index 00000000..2b68b875
--- /dev/null
+++ b/contributors/design-proposals/scalability/OWNERS
@@ -0,0 +1,6 @@
+reviewers:
+  - sig-scalability-leads
+approvers:
+  - sig-scalability-leads
+labels:
+  - sig/scalability
diff --git a/contributors/design-proposals/scheduling/OWNERS b/contributors/design-proposals/scheduling/OWNERS
new file mode 100644
index 00000000..b3248766
--- /dev/null
+++ b/contributors/design-proposals/scheduling/OWNERS
@@ -0,0 +1,6 @@
+reviewers:
+  - sig-scheduling-leads
+approvers:
+  - sig-scheduling-leads
+labels:
+  - sig/scheduling
diff --git a/contributors/design-proposals/service-catalog/OWNERS b/contributors/design-proposals/service-catalog/OWNERS
new file mode 100644
index 00000000..5c6b18ed
--- /dev/null
+++ b/contributors/design-proposals/service-catalog/OWNERS
@@ -0,0 +1,6 @@
+reviewers:
+  - sig-service-catalog-leads
+approvers:
+  - sig-service-catalog-leads
+labels:
+  - sig/service-catalog
diff --git a/contributors/design-proposals/storage/OWNERS b/contributors/design-proposals/storage/OWNERS
index 93f7a15f..fb58418f 100644
--- a/contributors/design-proposals/storage/OWNERS
+++ b/contributors/design-proposals/storage/OWNERS
@@ -1,12 +1,6 @@
 reviewers:
-  - childsb
-  - gnufied
-  - jingxu97
-  - jsafrane
-  - msau42
-  - rootfs
-  - saad-ali
+  - sig-storage-leads
 approvers:
-  - childsb
-  - jsafrane
-  - saad-ali
+  - sig-storage-leads
+labels:
+  - sig/storage
diff --git a/contributors/design-proposals/testing/OWNERS b/contributors/design-proposals/testing/OWNERS
new file mode 100644
index 00000000..48c9f03c
--- /dev/null
+++ b/contributors/design-proposals/testing/OWNERS
@@ -0,0 +1,6 @@
+reviewers:
+  - sig-testing-leads
+approvers:
+  - sig-testing-leads
+labels:
+  - sig/testing
diff --git a/sig-api-machinery/OWNERS b/sig-api-machinery/OWNERS
index c43aa85f..0df76e64 100644
--- a/sig-api-machinery/OWNERS
+++ b/sig-api-machinery/OWNERS
@@ -1,10 +1,6 @@
 reviewers:
-  - lavalamp
-  - deads2k
-  - mbohlool
-  - bgrant0607
+  - sig-api-machinery-leads
 approvers:
-  - deads2k
-  - lavalamp
-  - mbohlool
-  - bgrant0607
+  - sig-api-machinery-leads
+labels:
+  - sig/api-machinery
diff --git a/sig-apps/OWNERS b/sig-apps/OWNERS
index 7fb4a1f0..12723930 100644
--- a/sig-apps/OWNERS
+++ b/sig-apps/OWNERS
@@ -1,8 +1,6 @@
 reviewers:
-  - michelleN
-  - mattfarina
-  - prydonius
+  - sig-apps-leads
 approvers:
-  - michelleN
-  - mattfarina
-  - prydonius
+  - sig-apps-leads
+labels:
+  - sig/apps
diff --git a/sig-architecture/OWNERS b/sig-architecture/OWNERS
index 1e02f05b..2df39a59 100644
--- a/sig-architecture/OWNERS
+++ b/sig-architecture/OWNERS
@@ -1,6 +1,6 @@
 reviewers:
-  - jdumars
-  - bgrant0607
+  - sig-architecture-leads
 approvers:
-  - jdumars
-  - bgrant0607
+  - sig-architecture-leads
+labels:
+  - sig/architecture
diff --git a/sig-auth/OWNERS b/sig-auth/OWNERS
index ef9c5847..3100c753 100644
--- a/sig-auth/OWNERS
+++ b/sig-auth/OWNERS
@@ -1,8 +1,6 @@
 reviewers:
-  - ericchiang
-  - liggitt
-  - deads2k
+  - sig-auth-leads
 approvers:
-  - ericchiang
-  - liggitt
-  - deads2k
+  - sig-auth-leads
+labels:
+  - sig/auth
diff --git a/sig-autoscaling/OWNERS b/sig-autoscaling/OWNERS
index 480f8936..17089492 100644
--- a/sig-autoscaling/OWNERS
+++ b/sig-autoscaling/OWNERS
@@ -1,6 +1,6 @@
 reviewers:
-  - mwielgus
-  - directxman12
+  - sig-autoscaling-leads
 approvers:
-  - mwielgus
-  - directxman12
+  - sig-autoscaling-leads
+labels:
+  - sig/autoscaling
diff --git a/sig-aws/OWNERS b/sig-aws/OWNERS
index c189d1bc..83317bbe 100644
--- a/sig-aws/OWNERS
+++ b/sig-aws/OWNERS
@@ -1,8 +1,6 @@
 reviewers:
-  - kris-nova
-  - justinsb
-  - chrislovecnm
+  - sig-aws-leads
 approvers:
-  - kris-nova
-  - justinsb
-  - chrislovecnm
+  - sig-aws-leads
+labels:
+  - sig/aws
diff --git a/sig-azure/OWNERS b/sig-azure/OWNERS
index 4bb1a8e8..bf52f70e 100644
--- a/sig-azure/OWNERS
+++ b/sig-azure/OWNERS
@@ -1,8 +1,6 @@
 reviewers:
-  - colemickens
-  - slack
-  - jdumars
+  - sig-azure-leads
 approvers:
-  - colemickens
-  - slack
-  - jdumars
+  - sig-azure-leads
+labels:
+  - sig/azure
diff --git a/sig-big-data/OWNERS b/sig-big-data/OWNERS
index be30a58b..7e8ab706 100644
--- a/sig-big-data/OWNERS
+++ b/sig-big-data/OWNERS
@@ -1,4 +1,6 @@
 reviewers:
-  - foxish
+  - sig-big-data-leads
 approvers:
-  - foxish
+  - sig-big-data-leads
+labels:
+  - sig/big-data
diff --git a/sig-cli/OWNERS b/sig-cli/OWNERS
index 9e3894d0..248d3e7c 100644
--- a/sig-cli/OWNERS
+++ b/sig-cli/OWNERS
@@ -1,8 +1,6 @@
 reviewers:
-  - pwittrock
-  - AdoHe
-  - fabianofranz
+  - sig-cli-leads
 approvers:
-  - pwittrock
-  - AdoHe
-  - fabianofranz
+  - sig-cli-leads
+labels:
+  - sig/cli
diff --git a/sig-cluster-lifecycle/OWNERS b/sig-cluster-lifecycle/OWNERS
index c16e109e..d69f24ee 100644
--- a/sig-cluster-lifecycle/OWNERS
+++ b/sig-cluster-lifecycle/OWNERS
@@ -1,10 +1,6 @@
 reviewers:
-  - roberthbailey
-  - lukemarsden
-  - jbeda
-  - luxas
+  - sig-cluster-lifecycle-leads
 approvers:
-  - roberthbailey
-  - lukemarsden
-  - jbeda
-  - luxas
+  - sig-cluster-lifecycle-leads
+labels:
+  - sig/cluster-lifecycle
diff --git a/sig-cluster-ops/OWNERS b/sig-cluster-ops/OWNERS
index 87ed6163..4e76d690 100644
--- a/sig-cluster-ops/OWNERS
+++ b/sig-cluster-ops/OWNERS
@@ -1,6 +1,6 @@
 reviewers:
-  - jdumars
-  - zehicle
+  - sig-cluster-ops-leads
 approvers:
-  - jdumars
-  - zehicle
+  - sig-cluster-ops-leads
+labels:
+  - sig/cluster-ops
diff --git a/sig-contributor-experience/OWNERS b/sig-contributor-experience/OWNERS
index 23b252bb..e9c41ef7 100644
--- a/sig-contributor-experience/OWNERS
+++ b/sig-contributor-experience/OWNERS
@@ -1,6 +1,6 @@
 reviewers:
-  - grodrigues3
-  - Phillels 
+  - sig-contributor-experience-leads
 approvers:
-  - grodrigues3
-  - Phillels 
+  - sig-contributor-experience-leads
+labels:
+  - sig/contributor-experience
diff --git a/sig-docs/OWNERS b/sig-docs/OWNERS
index 618a050c..5e9e6627 100644
--- a/sig-docs/OWNERS
+++ b/sig-docs/OWNERS
@@ -1,6 +1,6 @@
 reviewers:
-  - jaredbhatti
-  - devin-donnelly
+  - sig-docs-leads
 approvers:
-  - jaredbhatti
-  - devin-donnelly
+  - sig-docs-leads
+labels:
+  - sig/docs
diff --git a/sig-gcp/OWNERS b/sig-gcp/OWNERS
new file mode 100644
index 00000000..cd2232f4
--- /dev/null
+++ b/sig-gcp/OWNERS
@@ -0,0 +1,6 @@
+reviewers:
+  - sig-gcp-leads
+approvers:
+  - sig-gcp-leads
+labels:
+  - sig/gcp
diff --git a/sig-instrumentation/OWNERS b/sig-instrumentation/OWNERS
index d3eaa8b5..8e29eafa 100644
--- a/sig-instrumentation/OWNERS
+++ b/sig-instrumentation/OWNERS
@@ -1,6 +1,6 @@
 reviewers:
-  - fabxc
-  - piosz
+  - sig-instrumentation-leads
 approvers:
-  - fabxc
-  - piosz
+  - sig-instrumentation-leads
+labels:
+  - sig/instrumentation
diff --git a/sig-multicluster/OWNERS b/sig-multicluster/OWNERS
index da6b0996..fca0e564 100644
--- a/sig-multicluster/OWNERS
+++ b/sig-multicluster/OWNERS
@@ -1,6 +1,6 @@
 reviewers:
-  - csbell
-  - quinton-hoole
+  - sig-multicluster-leads
 approvers:
-  - csbell
-  - quinton-hoole
+  - sig-multicluster-leads
+labels:
+  - sig/multicluster
diff --git a/sig-network/OWNERS b/sig-network/OWNERS
index 67dac83a..1939ca5c 100644
--- a/sig-network/OWNERS
+++ b/sig-network/OWNERS
@@ -1,6 +1,6 @@
 reviewers:
-  - thockin
-  - dcbw
+  - sig-network-leads
 approvers:
-  - thockin
-  - dcbw
+  - sig-network-leads
+labels:
+  - sig/network
diff --git a/sig-node/OWNERS b/sig-node/OWNERS
index 81023f2d..ab6d8dd5 100644
--- a/sig-node/OWNERS
+++ b/sig-node/OWNERS
@@ -1,6 +1,6 @@
 reviewers:
-  - dchen1107
-  - derekawaynecarr
+  - sig-node-leads
 approvers:
-  - dchen1107
-  - derekawaynecarr
+  - sig-node-leads
+labels:
+  - sig/node
diff --git a/sig-on-premise/OWNERS b/sig-on-premise/OWNERS
index 0078ef84..5df1d027 100644
--- a/sig-on-premise/OWNERS
+++ b/sig-on-premise/OWNERS
@@ -1,8 +1,6 @@
 reviewers:
-  - zen
-  - marcoceppi
-  - dghubble
+  - sig-on-premise-leads
 approvers:
-  - zen
-  - marcoceppi
-  - dghubble
+  - sig-on-premise-leads
+labels:
+  - sig/onprem
diff --git a/sig-openstack/OWNERS b/sig-openstack/OWNERS
index 1f7a6b84..32f44bdd 100644
--- a/sig-openstack/OWNERS
+++ b/sig-openstack/OWNERS
@@ -1,6 +1,6 @@
 reviewers:
-  - idvoretskyi
-  - xsgordon
+  - sig-openstack-leads
 approvers:
-  - idvoretskyi
-  - xsgordon
+  - sig-openstack-leads
+labels:
+  - sig/openstack
diff --git a/sig-product-management/OWNERS b/sig-product-management/OWNERS
index 9a160d43..5c66db0b 100644
--- a/sig-product-management/OWNERS
+++ b/sig-product-management/OWNERS
@@ -1,8 +1,6 @@
 reviewers:
-  - apsinha
-  - idvoretskyi
-  - calebamiles
+  - sig-product-management-leads
 approvers:
-  - apsinha
-  - idvoretskyi
-  - calebamiles
+  - sig-product-management-leads
+labels:
+  - sig/pm
diff --git a/sig-release/OWNERS b/sig-release/OWNERS
index 320c2abb..9d8e7403 100644
--- a/sig-release/OWNERS
+++ b/sig-release/OWNERS
@@ -1,4 +1,6 @@
 reviewers:
-  - calebamiles
+  - sig-release-leads
 approvers:
-  - calebamiles
+  - sig-release-leads
+labels:
+  - sig/release
diff --git a/sig-scalability/OWNERS b/sig-scalability/OWNERS
index 75570a98..2b68b875 100644
--- a/sig-scalability/OWNERS
+++ b/sig-scalability/OWNERS
@@ -1,8 +1,6 @@
 reviewers:
-  - wojtek-t
-  - countspongebob
-  - jbeda
+  - sig-scalability-leads
 approvers:
-  - wojtek-t
-  - countspongebob
-  - jbeda
+  - sig-scalability-leads
+labels:
+  - sig/scalability
diff --git a/sig-scheduling/OWNERS b/sig-scheduling/OWNERS
index dd1261ee..b3248766 100644
--- a/sig-scheduling/OWNERS
+++ b/sig-scheduling/OWNERS
@@ -1,6 +1,6 @@
 reviewers:
-  - davidopp
-  - timothysc
+  - sig-scheduling-leads
 approvers:
-  - davidopp
-  - timothysc
+  - sig-scheduling-leads
+labels:
+  - sig/scheduling
diff --git a/sig-service-catalog/OWNERS b/sig-service-catalog/OWNERS
index dd06eb38..5c6b18ed 100644
--- a/sig-service-catalog/OWNERS
+++ b/sig-service-catalog/OWNERS
@@ -1,10 +1,6 @@
 reviewers:
-  - pmorie
-  - arschles
-  - vaikas-google
-  - duglin
+  - sig-service-catalog-leads
 approvers:
-  - pmorie
-  - arschles
-  - vaikas-google
-  - duglin
+  - sig-service-catalog-leads
+labels:
+  - sig/service-catalog
diff --git a/sig-storage/OWNERS b/sig-storage/OWNERS
index d236db0e..fb58418f 100644
--- a/sig-storage/OWNERS
+++ b/sig-storage/OWNERS
@@ -1,6 +1,6 @@
 reviewers:
-  - saad-ali
-  - childsb
+  - sig-storage-leads
 approvers:
-  - saad-ali
-  - childsb
+  - sig-storage-leads
+labels:
+  - sig/storage
diff --git a/sig-testing/OWNERS b/sig-testing/OWNERS
index b32e7cec..48c9f03c 100644
--- a/sig-testing/OWNERS
+++ b/sig-testing/OWNERS
@@ -1,8 +1,6 @@
 reviewers:
-  - spiffxp
-  - fejta
-  - timothysc
+  - sig-testing-leads
 approvers:
-  - spiffxp
-  - fejta
-  - timothysc
+  - sig-testing-leads
+labels:
+  - sig/testing
diff --git a/sig-ui/OWNERS b/sig-ui/OWNERS
index bbcbafa8..cecaeb3d 100644
--- a/sig-ui/OWNERS
+++ b/sig-ui/OWNERS
@@ -1,6 +1,6 @@
 reviewers:
-  - danielromlein
-  - bryk
+  - sig-ui-leads
 approvers:
-  - danielromlein
-  - bryk
+  - sig-ui-leads
+labels:
+  - sig/ui
diff --git a/sig-windows/OWNERS b/sig-windows/OWNERS
index 9f67d29e..78470a91 100644
--- a/sig-windows/OWNERS
+++ b/sig-windows/OWNERS
@@ -1,4 +1,6 @@
 reviewers:
-  - michmike
+  - sig-windows-leads
 approvers:
-  - michmike
+  - sig-windows-leads
+labels:
+  - sig/windows
diff --git a/wg-app-def/OWNERS b/wg-app-def/OWNERS
new file mode 100644
index 00000000..cfe36752
--- /dev/null
+++ b/wg-app-def/OWNERS
@@ -0,0 +1,4 @@
+reviewers:
+  - wg-app-def-leads
+approvers:
+  - wg-app-def-leads
diff --git a/wg-cluster-api/OWNERS b/wg-cluster-api/OWNERS
index b28607fc..9f4deffe 100644
--- a/wg-cluster-api/OWNERS
+++ b/wg-cluster-api/OWNERS
@@ -1,8 +1,4 @@
 reviewers:
-  - kris-nova
-  - pipejakob
-  - roberthbailey
+  - wg-cluster-api-leads
 approvers:
-  - kris-nova
-  - pipejakob
-  - roberthbailey
+  - wg-cluster-api-leads
diff --git a/wg-container-identity/OWNERS b/wg-container-identity/OWNERS
index 60681e16..e51715f4 100644
--- a/wg-container-identity/OWNERS
+++ b/wg-container-identity/OWNERS
@@ -1,6 +1,4 @@
 reviewers:
-  - destijl
-  - smarterclayton
+  - wg-container-identity-leads
 approvers:
-  - destijl
-  - smarterclayton
+  - wg-container-identity-leads
diff --git a/wg-kubeadm-adoption/OWNERS b/wg-kubeadm-adoption/OWNERS
index 1edfa5b0..23b6aa6c 100644
--- a/wg-kubeadm-adoption/OWNERS
+++ b/wg-kubeadm-adoption/OWNERS
@@ -1,6 +1,4 @@
 reviewers:
-  - luxas
-  - justinsb
+  - wg-kubeadm-adoption-leads
 approvers:
-  - luxas
-  - justinsb
+  - wg-kubeadm-adoption-leads
diff --git a/wg-resource-management/OWNERS b/wg-resource-management/OWNERS
index dd22d5fc..60221854 100644
--- a/wg-resource-management/OWNERS
+++ b/wg-resource-management/OWNERS
@@ -1,6 +1,4 @@
 reviewers:
-  - vishh
-  - derekwaynecarr
+  - wg-resource-management-leads
 approvers:
-  - vishh
-  - derekwaynecarr
+  - wg-resource-management-leads