diff --git a/cmd/kubeadm/app/phases/etcd/OWNERS b/cmd/kubeadm/app/phases/etcd/OWNERS
deleted file mode 100644
index 9a671f25e7e..00000000000
--- a/cmd/kubeadm/app/phases/etcd/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-labels:
-  - sig/etcd
diff --git a/cmd/kubeadm/app/util/etcd/OWNERS b/cmd/kubeadm/app/util/etcd/OWNERS
deleted file mode 100644
index 9a671f25e7e..00000000000
--- a/cmd/kubeadm/app/util/etcd/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-labels:
-  - sig/etcd
diff --git a/staging/src/k8s.io/apiserver/pkg/storage/OWNERS b/staging/src/k8s.io/apiserver/pkg/storage/OWNERS
index f3cecdd5d70..044ecb9f61f 100644
--- a/staging/src/k8s.io/apiserver/pkg/storage/OWNERS
+++ b/staging/src/k8s.io/apiserver/pkg/storage/OWNERS
@@ -19,5 +19,3 @@ emeritus_approvers:
   - xiang90
   - timothysc
   - lavalamp
-labels:
-  - sig/etcd
diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/OWNERS b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/OWNERS
index 6b7e2928ea1..33809ed8c8e 100644
--- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/OWNERS
+++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/OWNERS
@@ -2,3 +2,6 @@
 
 reviewers:
   - wojtek-t
+  - serathius
+labels:
+  - sig/etcd
diff --git a/staging/src/k8s.io/kube-aggregator/OWNERS b/staging/src/k8s.io/kube-aggregator/OWNERS
index e349d24c9f7..2ce76af92f2 100644
--- a/staging/src/k8s.io/kube-aggregator/OWNERS
+++ b/staging/src/k8s.io/kube-aggregator/OWNERS
@@ -18,6 +18,5 @@ reviewers:
   - jpbetz
 labels:
   - sig/api-machinery
-  - sig/etcd
 emeritus_approvers:
   - lavalamp
diff --git a/staging/src/k8s.io/kube-aggregator/pkg/registry/apiservice/etcd/OWNERS b/staging/src/k8s.io/kube-aggregator/pkg/registry/apiservice/etcd/OWNERS
new file mode 100644
index 00000000000..a976ef860b8
--- /dev/null
+++ b/staging/src/k8s.io/kube-aggregator/pkg/registry/apiservice/etcd/OWNERS
@@ -0,0 +1,4 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
+labels:
+  - sig/etcd