diff --git a/content/en/docs/concepts/overview/kubernetes-api.md b/content/en/docs/concepts/overview/kubernetes-api.md
index 780aabc99d..7deef778cb 100644
--- a/content/en/docs/concepts/overview/kubernetes-api.md
+++ b/content/en/docs/concepts/overview/kubernetes-api.md
@@ -201,6 +201,8 @@ checks).
 
 ### OpenAPI V3
 
+{{< feature-state feature_gate_name="OpenAPIV3" >}}
+
 Kubernetes supports publishing a description of its APIs as OpenAPI v3.
 
 A discovery endpoint `/openapi/v3` is provided to see a list of all
diff --git a/content/en/docs/reference/command-line-tools-reference/feature-gates/Accelerators.md b/content/en/docs/reference/command-line-tools-reference/feature-gates/Accelerators.md
new file mode 100644
index 0000000000..bafe4a66c1
--- /dev/null
+++ b/content/en/docs/reference/command-line-tools-reference/feature-gates/Accelerators.md
@@ -0,0 +1,24 @@
+---
+title: Accelerators
+content_type: feature_gate
+
+_build:
+  list: never
+  render: false
+
+stages:
+  - stage: alpha 
+    defaultValue: false
+    fromVersion: "1.6"
+    toVersion: "1.10"
+  - stage: deprecated
+    fromVersion: "1.11"
+    toVersion: "1.11"
+
+removed: true
+---
+Provided an early form of plugin to enable Nvidia GPU support when using
+Docker Engine; no longer available. See
+[Device Plugins](/docs/concepts/extend-kubernetes/compute-storage-net/device-plugins/) for
+an alternative.
+
diff --git a/content/en/docs/reference/command-line-tools-reference/feature-gates/AppArmor.md b/content/en/docs/reference/command-line-tools-reference/feature-gates/AppArmor.md
new file mode 100644
index 0000000000..404ea8181c
--- /dev/null
+++ b/content/en/docs/reference/command-line-tools-reference/feature-gates/AppArmor.md
@@ -0,0 +1,18 @@
+---
+title: AppArmor
+content_type: feature_gate
+_build:
+  list: never
+  render: false
+
+stages:
+  - stage: beta
+    defaultValue: true
+    fromVersion: "1.4"
+    toVersion: "1.30"
+  - stage: stable
+    defaultValue: true
+    fromVersion: "1.31"
+---
+Enable use of AppArmor mandatory access control for Pods running on Linux nodes.
+See [AppArmor Tutorial](/docs/tutorials/security/apparmor/) for more details.
diff --git a/content/en/docs/reference/command-line-tools-reference/feature-gates/Initializers.md b/content/en/docs/reference/command-line-tools-reference/feature-gates/Initializers.md
new file mode 100644
index 0000000000..5b145493a1
--- /dev/null
+++ b/content/en/docs/reference/command-line-tools-reference/feature-gates/Initializers.md
@@ -0,0 +1,22 @@
+---
+title: Initializers
+content_type: feature_gate
+
+_build:
+  list: never
+  render: false
+
+stages:
+  - stage: alpha 
+    defaultValue: false
+    fromVersion: "1.7"
+    toVersion: "1.13"
+  - stage: deprecated
+    fromVersion: "1.14"
+    toVersion: "1.14"
+
+removed: true
+---
+Allow asynchronous coordination of object creation using the
+Initializers admission plugin.
+
diff --git a/content/en/docs/reference/command-line-tools-reference/feature-gates/KMSv1.md b/content/en/docs/reference/command-line-tools-reference/feature-gates/KMSv1.md
new file mode 100644
index 0000000000..bea65f6d4c
--- /dev/null
+++ b/content/en/docs/reference/command-line-tools-reference/feature-gates/KMSv1.md
@@ -0,0 +1,21 @@
+---
+title: KMSv1
+content_type: feature_gate
+_build:
+  list: never
+  render: false
+
+stages:
+  - stage: deprecated
+    defaultValue: true
+    fromVersion: "1.28"  
+    toVersion: "1.28"
+  - stage: deprecated
+    defaultValue: false
+    fromVersion: "1.29"  
+    
+---
+Enables KMS v1 API for encryption at rest. See
+[Using a KMS Provider for data encryption](/docs/tasks/administer-cluster/kms-provider)
+for more details.
+
diff --git a/content/en/docs/reference/command-line-tools-reference/feature-gates/KMSv2.md b/content/en/docs/reference/command-line-tools-reference/feature-gates/KMSv2.md
new file mode 100644
index 0000000000..f344fc9d02
--- /dev/null
+++ b/content/en/docs/reference/command-line-tools-reference/feature-gates/KMSv2.md
@@ -0,0 +1,27 @@
+---
+title: KMSv2
+content_type: feature_gate
+_build:
+  list: never
+  render: false
+
+stages:
+  - stage: alpha 
+    defaultValue: false
+    fromVersion: "1.25"
+    toVersion: "1.26"
+  - stage: beta
+    defaultValue: true
+    fromVersion: "1.27"  
+    toVersion: "1.28" 
+  - stage: stable
+    defaultValue: true
+    fromVersion: "1.29"
+    toVersion: "1.31"
+
+removed: true
+---
+Enables KMS v2 API for encryption at rest. See
+[Using a KMS Provider for data encryption](/docs/tasks/administer-cluster/kms-provider)
+for more details.
+
diff --git a/content/en/docs/reference/command-line-tools-reference/feature-gates/OpenAPIV3.md b/content/en/docs/reference/command-line-tools-reference/feature-gates/OpenAPIV3.md
new file mode 100644
index 0000000000..c9adc68cdc
--- /dev/null
+++ b/content/en/docs/reference/command-line-tools-reference/feature-gates/OpenAPIV3.md
@@ -0,0 +1,24 @@
+---
+title: OpenAPIV3
+content_type: feature_gate
+_build:
+  list: never
+  render: false
+
+stages:
+  - stage: alpha 
+    defaultValue: false
+    fromVersion: "1.23"
+    toVersion: "1.23"
+  - stage: beta
+    defaultValue: true
+    fromVersion: "1.24"  
+    toVersion: "1.26" 
+  - stage: stable
+    defaultValue: true
+    fromVersion: "1.27"  
+    toVersion: "1.28" 
+removed: true
+---
+Enables the API server to publish OpenAPI v3.
+
diff --git a/content/en/docs/reference/command-line-tools-reference/feature-gates/Sysctls.md b/content/en/docs/reference/command-line-tools-reference/feature-gates/Sysctls.md
new file mode 100644
index 0000000000..ebb240e3a1
--- /dev/null
+++ b/content/en/docs/reference/command-line-tools-reference/feature-gates/Sysctls.md
@@ -0,0 +1,23 @@
+---
+title: Sysctls
+content_type: feature_gate
+
+_build:
+  list: never
+  render: false
+
+stages:
+  - stage: beta 
+    defaultValue: true
+    fromVersion: "1.11"
+    toVersion: "1.20"
+  - stage: stable
+    defaultValue: true
+    fromVersion: "1.21"
+    toVersion: "1.22"    
+
+removed: true
+---
+Enable support for namespaced kernel parameters (sysctls) that can be set for each pod.
+See [sysctls](/docs/tasks/administer-cluster/sysctl-cluster/) for more details.
+
diff --git a/content/en/docs/tutorials/security/apparmor.md b/content/en/docs/tutorials/security/apparmor.md
index e528104230..d4e51d35b7 100644
--- a/content/en/docs/tutorials/security/apparmor.md
+++ b/content/en/docs/tutorials/security/apparmor.md
@@ -8,6 +8,8 @@ weight: 30
 
 <!-- overview -->
 
+{{< feature-state feature_gate_name="AppArmor" >}}
+
 This page shows you how to load AppArmor profiles on your nodes and enforce
 those profiles in Pods. To learn more about how Kubernetes can confine Pods using
 AppArmor, see
diff --git a/layouts/shortcodes/feature-state.html b/layouts/shortcodes/feature-state.html
index f6276a6781..30c39cd334 100644
--- a/layouts/shortcodes/feature-state.html
+++ b/layouts/shortcodes/feature-state.html
@@ -42,6 +42,10 @@
         {{- end -}}
       {{- end -}}
 
+      {{- if not $featureGateFound -}}
+        {{- errorf "Invalid feature gate: '%s' is not recognized or lacks a matching description file in '%s'" $feature_gate_name (print "en" $featureGateDescriptionFilesPath) -}}
+      {{- end -}}
+
     {{- end -}}
   {{- end -}}
 {{ end }}