diff --git a/data/openshift-gce-devel/ci_analysis_us/component_mapping.json b/data/openshift-gce-devel/ci_analysis_us/component_mapping.json
index c33d3065..2020e959 100644
--- a/data/openshift-gce-devel/ci_analysis_us/component_mapping.json
+++ b/data/openshift-gce-devel/ci_analysis_us/component_mapping.json
@@ -349407,14 +349407,14 @@
     "Name": "[sig-arch] [Conformance] FIPS TestFIPS [Suite:openshift/conformance/parallel/minimal]",
     "Suite": "openshift-tests",
     "Product": "OpenShift",
-    "Priority": 0,
+    "Priority": 1,
     "StaffApprovedObsolete": false,
-    "Component": "Node / CRI-O",
+    "Component": "Security",
     "Capabilities": [
       "Other"
     ],
-    "JIRAComponent": "Node / CRI-O",
-    "JIRAComponentID": "12367872"
+    "JIRAComponent": "Security",
+    "JIRAComponentID": "12367903"
   },
   {
     "APIVersion": "v1",
@@ -349423,14 +349423,14 @@
     "Name": "[sig-arch] [Conformance] FIPS TestFIPS [apigroup:config.openshift.io] [Suite:openshift/conformance/parallel/minimal]",
     "Suite": "openshift-tests",
     "Product": "OpenShift",
-    "Priority": 0,
+    "Priority": 1,
     "StaffApprovedObsolete": false,
-    "Component": "Node / CRI-O",
+    "Component": "Security",
     "Capabilities": [
       "Other"
     ],
-    "JIRAComponent": "Node / CRI-O",
-    "JIRAComponentID": "12367872"
+    "JIRAComponent": "Security",
+    "JIRAComponentID": "12367903"
   },
   {
     "APIVersion": "v1",
diff --git a/pkg/components/node/crio/component.go b/pkg/components/node/crio/component.go
index 81494832..7e558342 100644
--- a/pkg/components/node/crio/component.go
+++ b/pkg/components/node/crio/component.go
@@ -15,11 +15,6 @@ var CRIOComponent = Component{
 		Operators:            []string{},
 		DefaultJiraComponent: "Node / CRI-O",
 		Matchers: []config.ComponentMatcher{
-			{
-				IncludeAny: []string{
-					"[sig-arch] [Conformance] FIPS TestFIPS",
-				},
-			},
 			{Suite: "Container_Engine_Tools"},
 			{
 				SIG: "sig-imagepolicy",
diff --git a/pkg/components/security/component.go b/pkg/components/security/component.go
index 412d3915..16afb774 100644
--- a/pkg/components/security/component.go
+++ b/pkg/components/security/component.go
@@ -18,6 +18,7 @@ var SecurityComponent = Component{
 			{
 				IncludeAny: []string{
 					":SecurityandCompliance ",
+					"[sig-arch] [Conformance] FIPS TestFIPS",
 				},
 				Priority: 1,
 			},