update subprojects based on review comments

25 files changed, 165 insertions, 165 deletions

diff --git a/generator/sig_readme.tmpl b/generator/sig_readme.tmpl
index ad500107..87ae31ca 100644
--- a/generator/sig_readme.tmpl
+++ b/generator/sig_readme.tmpl
@@ -29,7 +29,7 @@
 
 ## Subprojects
 
-The following subprojects are owned by this SIG:
+The following subprojects are owned by sig-{{.Label}}:
 
 {{- range .Subprojects }}
 - **{{.Name}}**
diff --git a/sig-api-machinery/README.md b/sig-api-machinery/README.md
index 15bff6ee..bfc39ff1 100644
--- a/sig-api-machinery/README.md
+++ b/sig-api-machinery/README.md
@@ -26,79 +26,47 @@ Covers all aspects of API server, API registration and discovery, generic API CR
 
 ## Subprojects
 
-The following subprojects are owned by this SIG:
+The following subprojects are owned by sig-api-machinery:
 - **api**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/api/master/OWNERS
-- **apiextensions-apiserver**
-  - Owners:
-    - https://raw.githubusercontent.com/kubernetes/apiextensions-apiserver/master/OWNERS
-- **apimachinery**
-  - Owners:
-    - https://raw.githubusercontent.com/kubernetes/apimachinery/master/OWNERS
 - **apiserver**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/apiserver/master/OWNERS
-- **apiserver-builder**
-  - Owners:
+    - https://raw.githubusercontent.com/kubernetes/apimachinery/master/OWNERS
     - https://raw.githubusercontent.com/kubernetes-incubator/apiserver-builder/master/OWNERS
-- **client-go**
-  - Owners:
-    - https://raw.githubusercontent.com/kubernetes/client-go/master/OWNERS
-- **client-python**
-  - Owners:
-    - https://raw.githubusercontent.com/kubernetes-incubator/client-python/master/OWNERS
+    - https://raw.githubusercontent.com/kubernetes/sample-apiserver/master/OWNERS
+    - https://raw.githubusercontent.com/kubernetes/sample-controller/master/OWNERS
 - **code-generator**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/code-generator/master/OWNERS
-- **community**
+- **crd**
   - Owners:
-    - https://raw.githubusercontent.com/kubernetes-client/community/master/OWNERS
-- **csharp**
-  - Owners:
-    - https://raw.githubusercontent.com/kubernetes-client/csharp/master/OWNERS
+    - https://raw.githubusercontent.com/kubernetes/apiextensions-apiserver/master/OWNERS
 - **gen**
   - Owners:
-    - https://raw.githubusercontent.com/kubernetes-client/gen/master/OWNERS
-- **gengo**
+- **IDL**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/gengo/master/OWNERS
-- **go**
+- **api-aggregation**
   - Owners:
-    - https://raw.githubusercontent.com/kubernetes-client/go/master/OWNERS
-- **go-base**
+    - https://raw.githubusercontent.com/kubernetes/kube-aggregator/master/OWNERS
+- **kubernetes-client-library**
   - Owners:
+    - https://raw.githubusercontent.com/kubernetes-client/community/master/OWNERS
+    - https://raw.githubusercontent.com/kubernetes-client/csharp/master/OWNERS
+    - https://raw.githubusercontent.com/kubernetes-client/gen/master/OWNERS
     - https://raw.githubusercontent.com/kubernetes-client/go-base/master/OWNERS
-- **haskell**
-  - Owners:
+    - https://raw.githubusercontent.com/kubernetes-client/go/master/OWNERS
     - https://raw.githubusercontent.com/kubernetes-client/haskell/master/OWNERS
-- **java**
-  - Owners:
     - https://raw.githubusercontent.com/kubernetes-client/java/master/OWNERS
-- **javascript**
-  - Owners:
     - https://raw.githubusercontent.com/kubernetes-client/javascript/master/OWNERS
-- **kube-aggregator**
-  - Owners:
-    - https://raw.githubusercontent.com/kubernetes/kube-aggregator/master/OWNERS
-- **kube-openapi**
-  - Owners:
-    - https://raw.githubusercontent.com/kubernetes/kube-openapi/master/OWNERS
-- **python-base**
-  - Owners:
     - https://raw.githubusercontent.com/kubernetes-client/python-base/master/OWNERS
-- **ruby**
-  - Owners:
     - https://raw.githubusercontent.com/kubernetes-client/ruby/master/OWNERS
-- **sample-apiserver**
-  - Owners:
-    - https://raw.githubusercontent.com/kubernetes/sample-apiserver/master/OWNERS
-- **sample-controller**
-  - Owners:
-    - https://raw.githubusercontent.com/kubernetes/sample-controller/master/OWNERS
-- **typescript**
-  - Owners:
     - https://raw.githubusercontent.com/kubernetes-client/typescript/master/OWNERS
+    - https://raw.githubusercontent.com/kubernetes-incubator/client-python/master/OWNERS
+    - https://raw.githubusercontent.com/kubernetes/client-go/master/OWNERS
+    - https://raw.githubusercontent.com/kubernetes/kube-openapi/master/OWNERS
 - **utils**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/utils/master/OWNERS
diff --git a/sig-apps/README.md b/sig-apps/README.md
index de266415..1956da72 100644
--- a/sig-apps/README.md
+++ b/sig-apps/README.md
@@ -27,7 +27,7 @@ Covers deploying and operating applications in Kubernetes. We focus on the devel
 
 ## Subprojects
 
-The following subprojects are owned by this SIG:
+The following subprojects are owned by sig-apps:
 - **chart-testing**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes-helm/chart-testing/master/OWNERS
@@ -37,21 +37,17 @@ The following subprojects are owned by this SIG:
 - **charts**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/charts/master/OWNERS
+    - https://raw.githubusercontent.com/kubernetes-helm/charts-tooling/master/OWNERS
   - Meetings:
     - Charts Chat: [Tuesdays at 9:00 PT (Pacific Time)](https://zoom.us/j/166909412) (biweekly). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=9:00&tz=PT%20%28Pacific%20Time%29).
       - [Meeting notes and Agenda](https://docs.google.com/document/d/1h6UTTuNRbFI81higrN3JUV2XxyzqqVjZET4Xz4WTR-8/edit#heading=h.57pbxthvt6k3).
-- **charts-tooling**
-  - Owners:
-    - https://raw.githubusercontent.com/kubernetes-helm/charts-tooling/master/OWNERS
-- **community**
-  - Owners:
-    - https://raw.githubusercontent.com/kubernetes-helm/community/master/OWNERS
 - **examples**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/examples/master/OWNERS
 - **helm**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/helm/master/OWNERS
+    - https://raw.githubusercontent.com/kubernetes-helm/community/master/OWNERS
   - Meetings:
     - Helm Developer call: [Thursdays at 9:30 PT (Pacific Time)](https://zoom.us/j/4526666954) (weekly). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=9:30&tz=PT%20%28Pacific%20Time%29).
       - [Meeting notes and Agenda](https://docs.google.com/document/d/1elWRfvH3AkHdr8pOaqyPbqSZ6ONR-l1Sb9_gapqh8ZA/edit).
@@ -65,14 +61,17 @@ The following subprojects are owned by this SIG:
   - Owners:
     - https://raw.githubusercontent.com/kubernetes-helm/rudder-federation/master/OWNERS
 - **workloads-api**
-  - Description: The core workloads API, which is composed of the DaemonSet, Deployment, ReplicaSet, and StatefulSet kinds
+  - Description: The core workloads API, which is composed of the CronJob, DaemonSet, Deployment, Job, ReplicaSet, and StatefulSet kinds
   - Owners:
+    - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/controller/cronjob/OWNERS
     - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/controller/daemon/OWNERS
     - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/controller/deployment/OWNERS
     - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/controller/history/OWNERS
+    - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/controller/job/OWNERS
     - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/controller/replicaset/OWNERS
     - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/controller/statefulset/OWNERS
     - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/apis/apps/OWNERS
+    - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/apis/batch/OWNERS
     - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/registry/apps/OWNERS
 
 ## GitHub Teams
diff --git a/sig-architecture/README.md b/sig-architecture/README.md
index 48a43539..3bc11caa 100644
--- a/sig-architecture/README.md
+++ b/sig-architecture/README.md
@@ -26,10 +26,7 @@ The Architecture SIG maintains and evolves the design principles of Kubernetes,
 
 ## Subprojects
 
-The following subprojects are owned by this SIG:
-- **k8s.io**
-  - Owners:
-    - https://raw.githubusercontent.com/kubernetes/k8s.io/master/OWNERS
+The following subprojects are owned by sig-architecture:
 - **kubernetes-template-project**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/kubernetes-template-project/master/OWNERS
diff --git a/sig-autoscaling/README.md b/sig-autoscaling/README.md
index ef95bd28..516df480 100644
--- a/sig-autoscaling/README.md
+++ b/sig-autoscaling/README.md
@@ -25,7 +25,7 @@ Covers autoscaling of clusters, horizontal and vertical autoscaling of pods, set
 
 ## Subprojects
 
-The following subprojects are owned by this SIG:
+The following subprojects are owned by sig-autoscaling:
 - **autoscaler**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/autoscaler/master/OWNERS
diff --git a/sig-big-data/README.md b/sig-big-data/README.md
index 96e6cb11..f3bbc796 100644
--- a/sig-big-data/README.md
+++ b/sig-big-data/README.md
@@ -24,13 +24,6 @@ Covers deploying and operating big data applications (Spark, Kafka, Hadoop, Flin
 * [Mailing list](https://groups.google.com/forum/#!forum/kubernetes-sig-big-data)
 * [Open Community Issues/PRs](https://github.com/kubernetes/community/labels/sig%2Fbig-data)
 
-## Subprojects
-
-The following subprojects are owned by this SIG:
-- **application-images**
-  - Owners:
-    - https://raw.githubusercontent.com/kubernetes-incubator/application-images/master/OWNERS
-
 ## GitHub Teams
 
 The below teams can be mentioned on issues and PRs in order to get attention from the right people.
diff --git a/sig-cli/README.md b/sig-cli/README.md
index 4b10b62a..b1f1f77b 100644
--- a/sig-cli/README.md
+++ b/sig-cli/README.md
@@ -27,13 +27,14 @@ Covers kubectl and related tools. We focus on the development and standardizatio
 
 ## Subprojects
 
-The following subprojects are owned by this SIG:
+The following subprojects are owned by sig-cli:
 - **common**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/common/master/OWNERS
 - **kubectl**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/kubectl/master/OWNERS
+    - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/kubectl/OWNERS
 
 ## GitHub Teams
 
diff --git a/sig-cluster-lifecycle/README.md b/sig-cluster-lifecycle/README.md
index 96378059..7b59876f 100644
--- a/sig-cluster-lifecycle/README.md
+++ b/sig-cluster-lifecycle/README.md
@@ -36,7 +36,7 @@ The Cluster Lifecycle SIG examines how we should change Kubernetes to make it ea
 
 ## Subprojects
 
-The following subprojects are owned by this SIG:
+The following subprojects are owned by sig-cluster-lifecycle:
 - **bootkube**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes-incubator/bootkube/master/OWNERS
@@ -55,9 +55,13 @@ The following subprojects are owned by this SIG:
 - **kube-deploy**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/kube-deploy/master/OWNERS
+- **kube-up**
+  - Owners:
+    - https://raw.githubusercontent.com/kubernetes/kubernetes/master/cluster/OWNERS
 - **kubeadm**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/kubeadm/master/OWNERS
+    - https://raw.githubusercontent.com/kubernetes/kubernetes/master/cmd/kubeadm/OWNERS
 - **kubernetes-anywhere**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/kubernetes-anywhere/master/OWNERS
diff --git a/sig-contributor-experience/README.md b/sig-contributor-experience/README.md
index a7c85baa..5068dc4f 100644
--- a/sig-contributor-experience/README.md
+++ b/sig-contributor-experience/README.md
@@ -30,10 +30,19 @@ Developing and sustaining a healthy community of contributors is critical to sca
 
 ## Subprojects
 
-The following subprojects are owned by this SIG:
+The following subprojects are owned by sig-contributor-experience:
 - **community**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/community/master/OWNERS
+- **community-management**
+  - Owners:
+    - https://raw.githubusercontent.com/kubernetes/community/master/communication/OWNERS https://raw.githubusercontent.com/kubernetes/community/master/events/OWNERS
+- **contributors-guide**
+  - Owners:
+    - https://raw.githubusercontent.comkubernetes/community/blob/master/contributors/guide/OWNERS
+- **k8s.io**
+  - Owners:
+    - https://raw.githubusercontent.com/kubernetes/k8s.io/master/OWNERS
 - **repo-infra**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/repo-infra/master/OWNERS
diff --git a/sig-docs/README.md b/sig-docs/README.md
index a2faaf2a..90b625e0 100644
--- a/sig-docs/README.md
+++ b/sig-docs/README.md
@@ -26,7 +26,7 @@ Covers documentation, doc processes, and doc publishing for Kubernetes.
 
 ## Subprojects
 
-The following subprojects are owned by this SIG:
+The following subprojects are owned by sig-docs:
 - **kubernetes-bootcamp**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/kubernetes-bootcamp/master/OWNERS
diff --git a/sig-instrumentation/README.md b/sig-instrumentation/README.md
index 6c4c98f1..b6e90fb4 100644
--- a/sig-instrumentation/README.md
+++ b/sig-instrumentation/README.md
@@ -25,7 +25,7 @@ Covers best practices for cluster observability through metrics, logging, and ev
 
 ## Subprojects
 
-The following subprojects are owned by this SIG:
+The following subprojects are owned by sig-instrumentation:
 - **custom-metrics-apiserver**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes-incubator/custom-metrics-apiserver/master/OWNERS
diff --git a/sig-list.md b/sig-list.md
index 38cf1149..b31d0780 100644
--- a/sig-list.md
+++ b/sig-list.md
@@ -22,7 +22,7 @@ When the need arises, a [new SIG can be created](sig-creation-procedure.md)
 
 | Name | Label | Leads | Contact | Meetings |
 |------|--------|-------|---------|----------|
-|[API Machinery](sig-api-machinery/README.md)|api-machinery|* [Daniel Smith](https://github.com/lavalamp), Google<br>* [David Eads](https://github.com/deads2k), Red Hat<br>|* [Slack](https://kubernetes.slack.com/messages/sig-api-machinery)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-api-machinery)|* Regular SIG Meeting: [Wednesdays at 11:00 PT (Pacific Time) (biweekly)](https://staging.talkgadget.google.com/hangouts/_/google.com/kubernetes-sig)<br>
+|[API Machinery](sig-api-machinery/README.md)|api-machinery|* [Daniel Smith](https://github.com/lavalamp), Google<br>* [David Eads](https://github.com/deads2k), Red Hat<br>|* [Slack](https://kubernetes.slack.com/messages/sig-api-machinery)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-api-machinery)|* Regular SIG Meeting: [Wednesdays at 11:00 PT (Pacific Time) (biweekly)](https://zoom.us/my/apimachinery)<br>
 |[Apps](sig-apps/README.md)|apps|* [Matt Farina](https://github.com/mattfarina), Samsung SDS<br>* [Adnan Abdulhussein](https://github.com/prydonius), Bitnami<br>* [Kenneth Owens](https://github.com/kow3ns), Google<br>|* [Slack](https://kubernetes.slack.com/messages/sig-apps)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-apps)|* Regular SIG Meeting: [Mondays at 9:00 PT (Pacific Time) (weekly)](https://zoom.us/my/sig.apps)<br>
 |[Architecture](sig-architecture/README.md)|architecture|* [Brian Grant](https://github.com/bgrant0607), Google<br>* [Jaice Singer DuMars](https://github.com/jdumars), Microsoft<br>|* [Slack](https://kubernetes.slack.com/messages/sig-architecture)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-architecture)|* Regular SIG Meeting: [Thursdays at 15:30 UTC (weekly)](https://zoom.us/j/2018742972)<br>
 |[Auth](sig-auth/README.md)|auth|* [Eric Chiang](https://github.com/ericchiang), CoreOS<br>* [Jordan Liggitt](https://github.com/liggitt), Red Hat<br>* [David Eads](https://github.com/deads2k), Red Hat<br>|* [Slack](https://kubernetes.slack.com/messages/sig-auth)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-auth)|* Regular SIG Meeting: [Wednesdays at 11:00 PT (Pacific Time) (biweekly)](https://zoom.us/my/k8s.sig.auth)<br>
@@ -31,7 +31,7 @@ When the need arises, a [new SIG can be created](sig-creation-procedure.md)
 |[Azure](sig-azure/README.md)|azure|* [Jason Hansen](https://github.com/slack), Microsoft<br>* [Cole Mickens](https://github.com/colemickens), Microsoft<br>* [Jaice Singer DuMars](https://github.com/jdumars), Microsoft<br>|* [Slack](https://kubernetes.slack.com/messages/sig-azure)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-azure)|* Regular SIG Meeting: [Wednesdays at 16:00 UTC (biweekly)](https://deis.zoom.us/j/2018742972)<br>
 |[Big Data](sig-big-data/README.md)|big-data|* [Anirudh Ramanathan](https://github.com/foxish), Google<br>* [Erik Erlandson](https://github.com/erikerlandson), Red Hat<br>|* [Slack](https://kubernetes.slack.com/messages/sig-big-data)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-big-data)|* Regular SIG Meeting: [Wednesdays at 17:00 UTC (weekly)](https://zoom.us/my/sig.big.data)<br>
 |[CLI](sig-cli/README.md)|cli|* [Fabiano Franz](https://github.com/fabianofranz), Red Hat<br>* [Phillip Wittrock](https://github.com/pwittrock), Google<br>* [Tony Ado](https://github.com/AdoHe), Alibaba<br>|* [Slack](https://kubernetes.slack.com/messages/sig-cli)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-cli)|* Regular SIG Meeting: [Wednesdays at 09:00 PT (Pacific Time) (biweekly)](https://zoom.us/my/sigcli)<br>
-|[Cluster Lifecycle](sig-cluster-lifecycle/README.md)|cluster-lifecycle|* [Luke Marsden](https://github.com/lukemarsden), Weave<br>* [Joe Beda](https://github.com/jbeda), Heptio<br>* [Robert Bailey](https://github.com/roberthbailey), Google<br>* [Lucas Käldström](https://github.com/luxas), Luxas Labs (occasionally contracting for Weaveworks)<br>|* [Slack](https://kubernetes.slack.com/messages/sig-cluster-lifecycle)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-cluster-lifecycle)|* Regular SIG Meeting: [Tuesdays at 09:00 PT (Pacific Time) (weekly)](https://zoom.us/j/166836%E2%80%8B624)<br>
+|[Cluster Lifecycle](sig-cluster-lifecycle/README.md)|cluster-lifecycle|* [Luke Marsden](https://github.com/lukemarsden), Weave<br>* [Joe Beda](https://github.com/jbeda), Heptio<br>* [Robert Bailey](https://github.com/roberthbailey), Google<br>* [Lucas Käldström](https://github.com/luxas), Luxas Labs (occasionally contracting for Weaveworks)<br>|* [Slack](https://kubernetes.slack.com/messages/sig-cluster-lifecycle)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-cluster-lifecycle)|* Regular SIG Meeting: [Tuesdays at 09:00 PT (Pacific Time) (weekly)](https://zoom.us/j/166836%E2%80%8B624)<br>* kubeadm Office Hours: [Wednesdays at 09:00 PT (Pacific Time) (weekly)](https://zoom.us/j/166836%E2%80%8B624)<br>* Cluster API working group: [Wednesdays at 10:00 PT (Pacific Time) (weekly)](https://zoom.us/j/166836%E2%80%8B624)<br>* kops Office Hours: [Fridays at 09:00 PT (Pacific Time) (biweekly)](https://zoom.us/my/k8ssigaws)<br>
 |[Cluster Ops](sig-cluster-ops/README.md)|cluster-ops|* [Rob Hirschfeld](https://github.com/zehicle), RackN<br>* [Jaice Singer DuMars](https://github.com/jdumars), Microsoft<br>|* [Slack](https://kubernetes.slack.com/messages/sig-cluster-ops)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-cluster-ops)|* Regular SIG Meeting: [Thursdays at 20:00 UTC (biweekly)](https://zoom.us/j/297937771)<br>
 |[Contributor Experience](sig-contributor-experience/README.md)|contributor-experience|* [Garrett Rodrigues](https://github.com/grodrigues3), Google<br>* [Elsie Phillips](https://github.com/Phillels), CoreOS<br>* [Paris Pittman](https://github.com/parispittman), Google<br>|* [Slack](https://kubernetes.slack.com/messages/sig-contribex)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-wg-contribex)|* Regular SIG Meeting: [Wednesdays at 9:30 PT (Pacific Time) (biweekly)](https://zoom.us/j/7658488911)<br>* Off Week Sync (Contributor Guide, Mentorship): [Wednesdays at 9:30 PT (Pacific Time) (biweekly)](https://zoom.us/j/7658488911)<br>
 |[Docs](sig-docs/README.md)|docs|* [Devin Donnelly](https://github.com/devin-donnelly), Google<br>* [Jared Bhatti](https://github.com/jaredbhatti), Google<br>|* [Slack](https://kubernetes.slack.com/messages/sig-docs)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-docs)|* Regular SIG Meeting: [Tuesdays at 17:30 UTC (weekly)](https://zoom.us/j/678394311)<br>
@@ -62,6 +62,7 @@ When the need arises, a [new SIG can be created](sig-creation-procedure.md)
 |[Container Identity](wg-container-identity/README.md)|* [Clayton Coleman](https://github.com/smarterclayton), Red Hat<br>* [Greg Gastle](https://github.com/destijl), Google<br>|* [Slack](https://kubernetes.slack.com/messages/wg-container-identity)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-wg-container-identity)|* Regular WG Meeting: [Tuesdays at 15:00 UTC (bi-weekly (On demand))](TBD)<br>
 |[Kubeadm Adoption](wg-kubeadm-adoption/README.md)|* [Lucas Käldström](https://github.com/luxas), Luxas Labs (occasionally contracting for Weaveworks)<br>* [Justin Santa Barbara](https://github.com/justinsb)<br>|* [Slack](https://kubernetes.slack.com/messages/sig-cluster-lifecycle)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-cluster-lifecycle)|* Regular WG Meeting: [Tuesdays at 18:00 UTC (bi-weekly)](https://zoom.us/j/166836%E2%80%8B624)<br>
 |[Multitenancy](wg-multitenancy/README.md)|* [David Oppenheimer](https://github.com/davidopp), Google<br>* [Jessie Frazelle](https://github.com/jessfraz), Microsoft<br>|* [Slack](https://kubernetes.slack.com/messages/wg-multitenancy)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-wg-multitenancy)|
+|[Policy](wg-policy/README.md)|* [Howard Huang](https://github.com/hannibalhuang), Huawei<br>* [Torin Sandall](https://github.com/tsandall), Google<br>* [David Oppenheimer](https://github.com/davidopp), Google<br>* [Clayton Coleman](https://github.com/smarterclayton), Red Hat<br>* [Xuan Jia](https://github.com/xuanjia), China Mobile<br>|* [Slack](https://kubernetes.slack.com/messages/wg-policy)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-wg-policy)|* Regular WG Meeting: [Thursdays at 17:00 PT (Pacific Time) (weekly)](https://zoom.us/j/421702434)<br>
 |[Resource Management](wg-resource-management/README.md)|* [Vishnu Kannan](https://github.com/vishh), Google<br>* [Derek Carr](https://github.com/derekwaynecarr), Red Hat<br>|* [Slack](https://kubernetes.slack.com/messages/wg-resource-mgmt)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-wg-resource-management)|* Regular WG Meeting: [Wednesdays at 11:00 PT (Pacific Time) (biweekly (On demand))](https://zoom.us/j/4799874685)<br>
 <!-- BEGIN CUSTOM CONTENT -->
 
diff --git a/sig-multicluster/README.md b/sig-multicluster/README.md
index 310aa450..fd648b9a 100644
--- a/sig-multicluster/README.md
+++ b/sig-multicluster/README.md
@@ -26,7 +26,7 @@ A Special Interest Group focussed on solving common challenges related to the  m
 
 ## Subprojects
 
-The following subprojects are owned by this SIG:
+The following subprojects are owned by sig-multicluster:
 - **cluster-registry**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/cluster-registry/master/OWNERS
diff --git a/sig-network/README.md b/sig-network/README.md
index 2e951e40..03030db2 100644
--- a/sig-network/README.md
+++ b/sig-network/README.md
@@ -27,22 +27,30 @@ Covers networking in Kubernetes.
 
 ## Subprojects
 
-The following subprojects are owned by this SIG:
-- **dns**
+The following subprojects are owned by sig-network:
+- **services**
+  - Owners:
+    - https://raw.githubusercontent.com/kubernetes/cmd/kube-proxy/OWNERS
+    - https://raw.githubusercontent.com/kubernetes/pkg/proxy/OWNERS
+    - https://raw.githubusercontent.com/kubernetes/pkg/controller/endpoint/OWNERS
+    - https://raw.githubusercontent.com/kubernetes/pkg/controller/service/OWNERS
+- **kube-dns**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/dns/master/OWNERS
 - **external-dns**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes-incubator/external-dns/master/OWNERS
-- **ingress-gce**
+- **ingress**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/ingress-gce/master/OWNERS
-- **ingress-nginx**
-  - Owners:
     - https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/OWNERS
-- **ip-masq-agent**
+- **pod-networking**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes-incubator/ip-masq-agent/master/OWNERS
+    - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/kubelet/network/OWNERS
+- **network-policy**
+  - Owners:
+    - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/api/networking/OWNERS
 
 ## GitHub Teams
 
diff --git a/sig-node/README.md b/sig-node/README.md
index a7d50398..bf4d8547 100644
--- a/sig-node/README.md
+++ b/sig-node/README.md
@@ -25,7 +25,7 @@ To understand how this file is generated, see https://git.k8s.io/community/gener
 
 ## Subprojects
 
-The following subprojects are owned by this SIG:
+The following subprojects are owned by sig-node:
 - **cri-containerd**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes-incubator/cri-containerd/master/OWNERS
@@ -38,6 +38,10 @@ The following subprojects are owned by this SIG:
 - **frakti**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/frakti/master/OWNERS
+- **kubelet**
+  - Owners:
+    - https://raw.githubusercontent.com/kubernetes/kubernetes/master/cmd/kubelet/OWNERS
+    - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/kubelet/OWNERS
 - **node-feature-discovery**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes-incubator/node-feature-discovery/master/OWNERS
diff --git a/sig-product-management/README.md b/sig-product-management/README.md
index 618b2485..0ab945a2 100644
--- a/sig-product-management/README.md
+++ b/sig-product-management/README.md
@@ -30,7 +30,7 @@ It is also important to remember that the role of managing an open source projec
 
 ## Subprojects
 
-The following subprojects are owned by this SIG:
+The following subprojects are owned by sig-none:
 - **features**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/features/master/OWNERS
diff --git a/sig-release/README.md b/sig-release/README.md
index 9d8f15af..c19b7d55 100644
--- a/sig-release/README.md
+++ b/sig-release/README.md
@@ -25,7 +25,12 @@ To understand how this file is generated, see https://git.k8s.io/community/gener
 
 ## Subprojects
 
-The following subprojects are owned by this SIG:
+The following subprojects are owned by sig-release:
+- **hyperkube**
+  - Owners:
+    - https://raw.githubusercontent.com/kubernetes/kubernetes/master/build/debian-hyperkube-base/OWNERS
+    - https://raw.githubusercontent.com/kubernetes/kubernetes/master/cmd/hyperkube/OWNERS
+    - https://raw.githubusercontent.com/kubernetes/kubernetes/master/cluster/images/hyperkube/OWNERS
 - **release**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/release/master/OWNERS
diff --git a/sig-scalability/README.md b/sig-scalability/README.md
index d114b05e..2dce8b5f 100644
--- a/sig-scalability/README.md
+++ b/sig-scalability/README.md
@@ -28,7 +28,11 @@ For more details about our objectives please review our [Scaling And Performance
 
 ## Subprojects
 
-The following subprojects are owned by this SIG:
+The following subprojects are owned by sig-scalability:
+- **kubemark**
+  - Owners:
+    - https://raw.githubusercontent.com/kubernetes/kubemark/master/cmd/kubemark/OWNERS
+    - https://raw.githubusercontent.com/kubernetes/kubemark/master/pkg/kubemark/OWNERS
 - **perf-tests**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/perf-tests/master/OWNERS
diff --git a/sig-scheduling/README.md b/sig-scheduling/README.md
index 0cdf3b6d..6903948b 100644
--- a/sig-scheduling/README.md
+++ b/sig-scheduling/README.md
@@ -25,7 +25,7 @@ To understand how this file is generated, see https://git.k8s.io/community/gener
 
 ## Subprojects
 
-The following subprojects are owned by this SIG:
+The following subprojects are owned by sig-scheduling:
 - **cluster-capacity**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes-incubator/cluster-capacity/master/OWNERS
@@ -35,6 +35,10 @@ The following subprojects are owned by this SIG:
 - **kube-arbitrator**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes-incubator/kube-arbitrator/master/OWNERS
+- **scheduler**
+  - Owners:
+    - https://raw.githubusercontent.com/kubernetes/kubernetes/master/cmd/kube-scheduler/OWNERS
+    - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/kube-scheduler/OWNERS
 
 ## GitHub Teams
 
diff --git a/sig-service-catalog/README.md b/sig-service-catalog/README.md
index 0be6438b..2150efce 100644
--- a/sig-service-catalog/README.md
+++ b/sig-service-catalog/README.md
@@ -28,7 +28,7 @@ To develop a Kubernetes API for the CNCF service broker and Kubernetes broker im
 
 ## Subprojects
 
-The following subprojects are owned by this SIG:
+The following subprojects are owned by sig-service-catalog:
 - **service-catalog**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes-incubator/service-catalog/master/OWNERS
diff --git a/sig-storage/README.md b/sig-storage/README.md
index 61cb860d..e0111723 100644
--- a/sig-storage/README.md
+++ b/sig-storage/README.md
@@ -26,7 +26,7 @@ Covers storage and volume plugins.
 
 ## Subprojects
 
-The following subprojects are owned by this SIG:
+The following subprojects are owned by sig-storage:
 - **external-storage**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes-incubator/external-storage/master/OWNERS
@@ -36,6 +36,9 @@ The following subprojects are owned by this SIG:
 - **nfs-provisioner**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes-incubator/nfs-provisioner/master/OWNERS
+- **volumes**
+  - Owners:
+    - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/volumes/OWNERS
 
 ## GitHub Teams
 
diff --git a/sig-testing/README.md b/sig-testing/README.md
index c88ca67a..ea37e38f 100644
--- a/sig-testing/README.md
+++ b/sig-testing/README.md
@@ -28,7 +28,7 @@ Interested in how we can most effectively test Kubernetes. We're interested spec
 
 ## Subprojects
 
-The following subprojects are owned by this SIG:
+The following subprojects are owned by sig-testing:
 - **test-infra**
   - Owners:
     - https://raw.githubusercontent.com/kubernetes/test-infra/master/OWNERS
diff --git a/sig-ui/README.md b/sig-ui/README.md
index 05c4f417..c3845281 100644
--- a/sig-ui/README.md
+++ b/sig-ui/README.md
@@ -23,6 +23,13 @@ Covers all things UI related. Efforts are centered around Kubernetes Dashboard:
 * [Mailing list](https://groups.google.com/forum/#!forum/kubernetes-sig-ui)
 * [Open Community Issues/PRs](https://github.com/kubernetes/community/labels/sig%2Fui)
 
+## Subprojects
+
+The following subprojects are owned by sig-ui:
+- **dashboard**
+  - Owners:
+    - https://raw.githubusercontent.com/kubernetes/dashboard/master/OWNERS
+
 <!-- BEGIN CUSTOM CONTENT -->
 
 <!-- END CUSTOM CONTENT -->
diff --git a/sig-windows/README.md b/sig-windows/README.md
index 898a05cc..fc1dee2d 100644
--- a/sig-windows/README.md
+++ b/sig-windows/README.md
@@ -23,13 +23,6 @@ Focuses on supporting Windows Server Containers for Kubernetes.
 * [Mailing list](https://groups.google.com/forum/#!forum/kubernetes-sig-windows)
 * [Open Community Issues/PRs](https://github.com/kubernetes/community/labels/sig%2Fwindows)
 
-## Subprojects
-
-The following subprojects are owned by this SIG:
-- **dashboard**
-  - Owners:
-    - https://raw.githubusercontent.com/kubernetes/dashboard/master/OWNERS
-
 ## GitHub Teams
 
 The below teams can be mentioned on issues and PRs in order to get attention from the right people.
diff --git a/sigs.yaml b/sigs.yaml
index 0880a3ac..4e41fca0 100644
--- a/sigs.yaml
+++ b/sigs.yaml
@@ -45,75 +45,43 @@ sigs:
     - name: api
       owners:
       - https://raw.githubusercontent.com/kubernetes/api/master/OWNERS
-    - name: apiextensions-apiserver
-      owners:
-      - https://raw.githubusercontent.com/kubernetes/apiextensions-apiserver/master/OWNERS
-    - name: apimachinery
-      owners:
-      - https://raw.githubusercontent.com/kubernetes/apimachinery/master/OWNERS
     - name: apiserver
       owners:
       - https://raw.githubusercontent.com/kubernetes/apiserver/master/OWNERS
-    - name: apiserver-builder
-      owners:
+      - https://raw.githubusercontent.com/kubernetes/apimachinery/master/OWNERS
       - https://raw.githubusercontent.com/kubernetes-incubator/apiserver-builder/master/OWNERS
-    - name: client-go
-      owners:
-      - https://raw.githubusercontent.com/kubernetes/client-go/master/OWNERS
-    - name: client-python
-      owners:
-      - https://raw.githubusercontent.com/kubernetes-incubator/client-python/master/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/sample-apiserver/master/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/sample-controller/master/OWNERS
     - name: code-generator
       owners:
       - https://raw.githubusercontent.com/kubernetes/code-generator/master/OWNERS
-    - name: community
+    - name: crd
       owners:
-      - https://raw.githubusercontent.com/kubernetes-client/community/master/OWNERS
-    - name: csharp
-      owners:
-      - https://raw.githubusercontent.com/kubernetes-client/csharp/master/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/apiextensions-apiserver/master/OWNERS
     - name: gen
       owners:
-      - https://raw.githubusercontent.com/kubernetes-client/gen/master/OWNERS
-    - name: gengo
+    - name: IDL
       owners:
       - https://raw.githubusercontent.com/kubernetes/gengo/master/OWNERS
-    - name: go
+    - name: api-aggregation
       owners:
-      - https://raw.githubusercontent.com/kubernetes-client/go/master/OWNERS
-    - name: go-base
+      - https://raw.githubusercontent.com/kubernetes/kube-aggregator/master/OWNERS
+    - name: kubernetes-client-library
       owners:
+      - https://raw.githubusercontent.com/kubernetes-client/community/master/OWNERS
+      - https://raw.githubusercontent.com/kubernetes-client/csharp/master/OWNERS
+      - https://raw.githubusercontent.com/kubernetes-client/gen/master/OWNERS
       - https://raw.githubusercontent.com/kubernetes-client/go-base/master/OWNERS
-    - name: haskell
-      owners:
+      - https://raw.githubusercontent.com/kubernetes-client/go/master/OWNERS
       - https://raw.githubusercontent.com/kubernetes-client/haskell/master/OWNERS
-    - name: java
-      owners:
       - https://raw.githubusercontent.com/kubernetes-client/java/master/OWNERS
-    - name: javascript
-      owners:
       - https://raw.githubusercontent.com/kubernetes-client/javascript/master/OWNERS
-    - name: kube-aggregator
-      owners:
-      - https://raw.githubusercontent.com/kubernetes/kube-aggregator/master/OWNERS
-    - name: kube-openapi
-      owners:
-      - https://raw.githubusercontent.com/kubernetes/kube-openapi/master/OWNERS
-    - name: python-base
-      owners:
       - https://raw.githubusercontent.com/kubernetes-client/python-base/master/OWNERS
-    - name: ruby
-      owners:
       - https://raw.githubusercontent.com/kubernetes-client/ruby/master/OWNERS
-    - name: sample-apiserver
-      owners:
-      - https://raw.githubusercontent.com/kubernetes/sample-apiserver/master/OWNERS
-    - name: sample-controller
-      owners:
-      - https://raw.githubusercontent.com/kubernetes/sample-controller/master/OWNERS
-    - name: typescript
-      owners:
       - https://raw.githubusercontent.com/kubernetes-client/typescript/master/OWNERS
+      - https://raw.githubusercontent.com/kubernetes-incubator/client-python/master/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/client-go/master/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/kube-openapi/master/OWNERS
     - name: utils
       owners:
       - https://raw.githubusercontent.com/kubernetes/utils/master/OWNERS
@@ -181,12 +149,7 @@ sigs:
         archive_url: https://docs.google.com/document/d/1h6UTTuNRbFI81higrN3JUV2XxyzqqVjZET4Xz4WTR-8/edit#heading=h.57pbxthvt6k3
       owners:
       - https://raw.githubusercontent.com/kubernetes/charts/master/OWNERS
-    - name: charts-tooling
-      owners:
       - https://raw.githubusercontent.com/kubernetes-helm/charts-tooling/master/OWNERS
-    - name: community
-      owners:
-      - https://raw.githubusercontent.com/kubernetes-helm/community/master/OWNERS
     - name: examples
       owners:
       - https://raw.githubusercontent.com/kubernetes/examples/master/OWNERS
@@ -201,6 +164,7 @@ sigs:
         archive_url: https://docs.google.com/document/d/1elWRfvH3AkHdr8pOaqyPbqSZ6ONR-l1Sb9_gapqh8ZA/edit
       owners:
       - https://raw.githubusercontent.com/kubernetes/helm/master/OWNERS
+      - https://raw.githubusercontent.com/kubernetes-helm/community/master/OWNERS
     - name: kompose
       owners:
       - https://raw.githubusercontent.com/kubernetes/kompose/master/OWNERS
@@ -211,14 +175,17 @@ sigs:
       owners:
       - https://raw.githubusercontent.com/kubernetes-helm/rudder-federation/master/OWNERS
     - name: workloads-api
-      description: The core workloads API, which is composed of the DaemonSet, Deployment, ReplicaSet, and StatefulSet kinds
+      description: The core workloads API, which is composed of the CronJob, DaemonSet, Deployment, Job, ReplicaSet, and StatefulSet kinds
       owners:
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/controller/cronjob/OWNERS
       - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/controller/daemon/OWNERS
       - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/controller/deployment/OWNERS
       - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/controller/history/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/controller/job/OWNERS
       - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/controller/replicaset/OWNERS
       - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/controller/statefulset/OWNERS 
       - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/apis/apps/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/apis/batch/OWNERS
       - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/registry/apps/OWNERS
   - name: Architecture
     dir: sig-architecture
@@ -261,9 +228,6 @@ sigs:
       - name: sig-architecture-test-failures
         description: Test Failures and Triage
     subprojects:
-    - name: k8s.io
-      owners:
-      - https://raw.githubusercontent.com/kubernetes/k8s.io/master/OWNERS
     - name: kubernetes-template-project
       owners:
       - https://raw.githubusercontent.com/kubernetes/kubernetes-template-project/master/OWNERS
@@ -520,6 +484,7 @@ sigs:
     - name: kubectl
       owners:
       - https://raw.githubusercontent.com/kubernetes/kubectl/master/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/kubectl/OWNERS
   - name: Cluster Lifecycle
     dir: sig-cluster-lifecycle
     mission_statement: >
@@ -608,9 +573,13 @@ sigs:
     - name: kube-deploy
       owners:
       - https://raw.githubusercontent.com/kubernetes/kube-deploy/master/OWNERS
+    - name: kube-up
+      owners:
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/master/cluster/OWNERS
     - name: kubeadm
       owners:
       - https://raw.githubusercontent.com/kubernetes/kubeadm/master/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/master/cmd/kubeadm/OWNERS
     - name: kubernetes-anywhere
       owners:
       - https://raw.githubusercontent.com/kubernetes/kubernetes-anywhere/master/OWNERS
@@ -710,6 +679,9 @@ sigs:
     - name: contributors-guide
       owners:
       - https://raw.githubusercontent.comkubernetes/community/blob/master/contributors/guide/OWNERS
+    - name: k8s.io
+      owners:
+      - https://raw.githubusercontent.com/kubernetes/k8s.io/master/OWNERS
     - name: repo-infra
       owners:
       - https://raw.githubusercontent.com/kubernetes/repo-infra/master/OWNERS
@@ -941,21 +913,29 @@ sigs:
       - name: sig-network-test-failures
         description: Test Failures and Triage
     subprojects:
-    - name: dns
+    - name: services
+      owners:
+      - https://raw.githubusercontent.com/kubernetes/cmd/kube-proxy/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/pkg/proxy/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/pkg/controller/endpoint/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/pkg/controller/service/OWNERS
+    - name: kube-dns
       owners:
       - https://raw.githubusercontent.com/kubernetes/dns/master/OWNERS
     - name: external-dns
       owners:
       - https://raw.githubusercontent.com/kubernetes-incubator/external-dns/master/OWNERS
-    - name: ingress-gce
+    - name: ingress
       owners:
       - https://raw.githubusercontent.com/kubernetes/ingress-gce/master/OWNERS
-    - name: ingress-nginx
-      owners:
       - https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/OWNERS
-    - name: ip-masq-agent
+    - name: pod-networking
       owners:
       - https://raw.githubusercontent.com/kubernetes-incubator/ip-masq-agent/master/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/kubelet/network/OWNERS
+    - name: network-policy
+      owners:
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/api/networking/OWNERS
   - name: Node
     dir: sig-node
     mission_statement: >
@@ -1005,6 +985,10 @@ sigs:
     - name: frakti
       owners:
       - https://raw.githubusercontent.com/kubernetes/frakti/master/OWNERS
+    - name: kubelet
+      owners:
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/master/cmd/kubelet/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/kubelet/OWNERS
     - name: node-feature-discovery
       owners:
       - https://raw.githubusercontent.com/kubernetes-incubator/node-feature-discovery/master/OWNERS
@@ -1191,6 +1175,11 @@ sigs:
       - name: sig-release-test-failures
         description: Test Failures and Triage
     subprojects:
+    - name: hyperkube
+      owners:
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/master/build/debian-hyperkube-base/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/master/cmd/hyperkube/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/master/cluster/images/hyperkube/OWNERS
     - name: release
       owners:
       - https://raw.githubusercontent.com/kubernetes/release/master/OWNERS
@@ -1245,6 +1234,10 @@ sigs:
       - name: sig-scalability-test-failures
         description: Test Failures and Triage
     subprojects:
+    - name: kubemark
+      owners:
+      - https://raw.githubusercontent.com/kubernetes/kubemark/master/cmd/kubemark/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/kubemark/master/pkg/kubemark/OWNERS
     - name: perf-tests
       owners:
       - https://raw.githubusercontent.com/kubernetes/perf-tests/master/OWNERS
@@ -1296,6 +1289,10 @@ sigs:
     - name: kube-arbitrator
       owners:
       - https://raw.githubusercontent.com/kubernetes-incubator/kube-arbitrator/master/OWNERS
+    - name: scheduler
+      owners:
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/master/cmd/kube-scheduler/OWNERS
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/kube-scheduler/OWNERS
   - name: Service Catalog
     dir: sig-service-catalog
     mission_statement: >
@@ -1395,6 +1392,9 @@ sigs:
     - name: nfs-provisioner
       owners:
       - https://raw.githubusercontent.com/kubernetes-incubator/nfs-provisioner/master/OWNERS
+    - name: volumes
+      owners:
+      - https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/volumes/OWNERS
   - name: Testing
     dir: sig-testing
     mission_statement: >
@@ -1487,6 +1487,10 @@ sigs:
     contact:
       slack: sig-ui
       mailing_list: https://groups.google.com/forum/#!forum/kubernetes-sig-ui
+    subprojects:
+    - name: dashboard
+      owners:
+      - https://raw.githubusercontent.com/kubernetes/dashboard/master/OWNERS
   - name: Windows
     dir: sig-windows
     mission_statement: >
@@ -1515,10 +1519,6 @@ sigs:
         description: Feature Requests
       - name: sig-windows-misc
         description: General Discussion
-    subprojects:
-    - name: dashboard
-      owners:
-      - https://raw.githubusercontent.com/kubernetes/dashboard/master/OWNERS
 workinggroups:
   - name: Resource Management
     dir: wg-resource-management