diff --git a/.github/ISSUE_TEMPLATE/membership.yml b/.github/ISSUE_TEMPLATE/membership.yml
index 67dc2ecf4c..da95bacc61 100644
--- a/.github/ISSUE_TEMPLATE/membership.yml
+++ b/.github/ISSUE_TEMPLATE/membership.yml
@@ -24,6 +24,7 @@ body:
     - kubernetes-client
     - kubernetes-csi
     - kubernetes-sigs
+    - etcd-io
   validations:
     required: true
 - id: requirements
diff --git a/.github/ISSUE_TEMPLATE/repo-create.yml b/.github/ISSUE_TEMPLATE/repo-create.yml
index e758611eff..bebab473ed 100644
--- a/.github/ISSUE_TEMPLATE/repo-create.yml
+++ b/.github/ISSUE_TEMPLATE/repo-create.yml
@@ -38,6 +38,7 @@ body:
     - kubernetes-client
     - kubernetes-csi
     - kubernetes-sigs
+    - etcd-io
   validations:
     required: true
 - id: admin_access