diff --git a/mapping.json b/mapping.json
index 059289af..e9acc127 100644
--- a/mapping.json
+++ b/mapping.json
@@ -120094,7 +120094,7 @@
     "StaffApprovedObsolete": false,
     "Component": "kube-apiserver",
     "Capabilities": [
-      "Other"
+      "FeatureGate:ValidatingAdmissionPolicy"
     ],
     "JIRAComponent": "kube-apiserver",
     "JIRAComponentID": 12367637
@@ -120110,7 +120110,7 @@
     "StaffApprovedObsolete": false,
     "Component": "kube-apiserver",
     "Capabilities": [
-      "Other"
+      "FeatureGate:ValidatingAdmissionPolicy"
     ],
     "JIRAComponent": "kube-apiserver",
     "JIRAComponentID": 12367637
@@ -120126,7 +120126,7 @@
     "StaffApprovedObsolete": false,
     "Component": "kube-apiserver",
     "Capabilities": [
-      "Other"
+      "FeatureGate:ValidatingAdmissionPolicy"
     ],
     "JIRAComponent": "kube-apiserver",
     "JIRAComponentID": 12367637
@@ -120142,7 +120142,7 @@
     "StaffApprovedObsolete": false,
     "Component": "kube-apiserver",
     "Capabilities": [
-      "Other"
+      "FeatureGate:ValidatingAdmissionPolicy"
     ],
     "JIRAComponent": "kube-apiserver",
     "JIRAComponentID": 12367637
diff --git a/pkg/util/test_identification.go b/pkg/util/test_identification.go
index 994fe6e3..1dbc2e43 100644
--- a/pkg/util/test_identification.go
+++ b/pkg/util/test_identification.go
@@ -22,6 +22,14 @@ func DefaultCapabilities(test *v1.TestInfo) []string {
 	// Get the Feature name from the test name as a capability
 	capabilities = append(capabilities, ExtractTestField(test.Name, "Feature")...)
 
+	for _, featureGate := range ExtractTestField(test.Name, "FeatureGate") {
+		capabilities = append(capabilities, fmt.Sprintf("FeatureGate:%s", featureGate))
+	}
+
+	for _, featureGate := range ExtractTestField(test.Name, "OCPFeatureGate") {
+		capabilities = append(capabilities, fmt.Sprintf("OCPFeatureGate:%s", featureGate))
+	}
+
 	if strings.Contains(test.Name, "clusteroperator/") {
 		capabilities = append(capabilities, "Operator")
 	}