diff --git a/keps/0001-kubernetes-enhancement-proposal-process.md b/keps/0001-kubernetes-enhancement-proposal-process.md
index b6a01845a4c..406fd2c403f 100644
--- a/keps/0001-kubernetes-enhancement-proposal-process.md
+++ b/keps/0001-kubernetes-enhancement-proposal-process.md
@@ -19,22 +19,24 @@ status: implemented
 ## Table of Contents
 
 <!-- toc -->
-- [Summary](#summary)
-- [Motivation](#motivation)
-- [Stewardship](#stewardship)
-- [Reference-Level Explanation](#reference-level-explanation)
-  - [What Type of Work Should Be Tracked by a KEP](#what-type-of-work-should-be-tracked-by-a-kep)
-  - [KEP Template](#kep-template)
-  - [KEP Metadata](#kep-metadata)
-  - [KEP Workflow](#kep-workflow)
-  - [Git and GitHub Implementation](#git-and-github-implementation)
-  - [KEP Editor Role](#kep-editor-role)
-  - [Important Metrics](#important-metrics)
-  - [Prior Art](#prior-art)
-- [Drawbacks](#drawbacks)
-- [Alternatives](#alternatives)
-  - [GitHub Issues vs. KEPs](#github-issues-vs-keps)
-- [Unresolved Questions](#unresolved-questions)
+- [Kubernetes Enhancement Proposal Process](#kubernetes-enhancement-proposal-process)
+  - [Table of Contents](#table-of-contents)
+  - [Summary](#summary)
+  - [Motivation](#motivation)
+  - [Stewardship](#stewardship)
+  - [Reference-Level Explanation](#reference-level-explanation)
+    - [What Type of Work Should Be Tracked by a KEP](#what-type-of-work-should-be-tracked-by-a-kep)
+    - [KEP Template](#kep-template)
+    - [KEP Metadata](#kep-metadata)
+    - [KEP Workflow](#kep-workflow)
+    - [Git and GitHub Implementation](#git-and-github-implementation)
+    - [KEP Editor Role](#kep-editor-role)
+    - [Important Metrics](#important-metrics)
+    - [Prior Art](#prior-art)
+  - [Drawbacks](#drawbacks)
+  - [Alternatives](#alternatives)
+    - [GitHub Issues vs. KEPs](#github-issues-vs-keps)
+  - [Unresolved Questions](#unresolved-questions)
 <!-- /toc -->
 
 ## Summary
@@ -175,8 +177,8 @@ Metadata items:
     this SIG will take responsibility for the bulk of those artifacts.
   * Sigs are listed as `sig-abc-def`, where the name matches the
     directory entry in the `kubernetes/community` repo.
-* **participating-sigs** Optional
-  * A list of SIGs that are involved or impacted by this KEP.
+* **participating-groups** Optional
+  * A list of SIGs, WGs, Committees and other groups that are involved or impacted by this KEP.
   * A special value of `kubernetes-wide` will indicate that this KEP has impact
     across the entire project.
 * **reviewers** Required
diff --git a/keps/NNNN-kep-template/README.md b/keps/NNNN-kep-template/README.md
index 205137f31c3..6e0828b28ce 100644
--- a/keps/NNNN-kep-template/README.md
+++ b/keps/NNNN-kep-template/README.md
@@ -254,13 +254,18 @@ proposal will be implemented, this is the place to discuss them.
 Consider the following in developing a test plan for this enhancement:
 - Will there be e2e and integration tests, in addition to unit tests?
 - How will it be tested in isolation vs with other components?
+- What will be the feature keyword for planned e2e/integration tests? 
 
 No need to outline all of the test cases, just the general strategy. Anything
 that would count as tricky in the implementation, and anything particularly
 challenging to test, should be called out.
 
 All code is expected to have adequate tests (eventually with coverage
-expectations). Please adhere to the [Kubernetes testing guidelines][testing-guidelines]
+expectations). There should also be an easy way to filter tests for a
+specific component in your KEP. Links to testgrid, filtered on your
+feature component, is particular useful for KEP reviewers.
+
+Please adhere to the [Kubernetes testing guidelines][testing-guidelines] 
 when drafting this test plan.
 
 [testing-guidelines]: https://git.k8s.io/community/contributors/devel/sig-testing/testing.md
diff --git a/keps/NNNN-kep-template/kep.yaml b/keps/NNNN-kep-template/kep.yaml
index 81b23e5d84f..479950189f3 100644
--- a/keps/NNNN-kep-template/kep.yaml
+++ b/keps/NNNN-kep-template/kep.yaml
@@ -49,3 +49,8 @@ disable-supported: true
 # The following PRR answers are required at beta release
 metrics:
   - my_feature_metric
+
+# The following open questions 
+open-questions:
+  - question: MyQuestion
+  - unresolved: true