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 ccdf6ba0..cab01291 100644
--- a/data/openshift-gce-devel/ci_analysis_us/component_mapping.json
+++ b/data/openshift-gce-devel/ci_analysis_us/component_mapping.json
@@ -463969,7 +463969,7 @@
   {
     "APIVersion": "v1",
     "Kind": "TestOwnership",
-    "ID": "openshift-tests:a2203b6f5d913c9277c78e71c81e7514",
+    "ID": "openshift-tests:b24040670a061985784174d67baa77fe",
     "Name": "[sig-imagepolicy][Suite:openshift/disruptive-longrunning][Disruptive][OCPFeatureGate:SigstoreImageVerificationPKI][Serial][Skipped:Disconnected] clusterimagepolicy signature validation tests fail with PKI email does not match",
     "Suite": "openshift-tests",
     "Product": "OpenShift",
@@ -463985,7 +463985,7 @@
   {
     "APIVersion": "v1",
     "Kind": "TestOwnership",
-    "ID": "openshift-tests:68c2a3bbc21d62febe2a6746890ca82a",
+    "ID": "openshift-tests:99083fd2059849f488235ba615b5e96e",
     "Name": "[sig-imagepolicy][Suite:openshift/disruptive-longrunning][Disruptive][OCPFeatureGate:SigstoreImageVerificationPKI][Serial][Skipped:Disconnected] clusterimagepolicy signature validation tests fail with PKI root of trust does not match the identity in the signature",
     "Suite": "openshift-tests",
     "Product": "OpenShift",
@@ -464001,7 +464001,7 @@
   {
     "APIVersion": "v1",
     "Kind": "TestOwnership",
-    "ID": "openshift-tests:59edad23bf302de0b57f98064545a6a7",
+    "ID": "openshift-tests:9154b954587e349d24bdb0de5152f3b7",
     "Name": "[sig-imagepolicy][Suite:openshift/disruptive-longrunning][Disruptive][OCPFeatureGate:SigstoreImageVerificationPKI][Serial][Skipped:Disconnected] clusterimagepolicy signature validation tests pass with valid PKI",
     "Suite": "openshift-tests",
     "Product": "OpenShift",
@@ -464017,7 +464017,7 @@
   {
     "APIVersion": "v1",
     "Kind": "TestOwnership",
-    "ID": "openshift-tests:5f7dc6d6d87a5eccdc7ce5cee5137c3e",
+    "ID": "openshift-tests:4029e45bc48a83956379f035652ff9af",
     "Name": "[sig-imagepolicy][Suite:openshift/disruptive-longrunning][Disruptive][OCPFeatureGate:SigstoreImageVerificationPKI][Serial][Skipped:Disconnected] imagepolicy signature validation tests fail with PKI root of trust does not match the identity in the signature",
     "Suite": "openshift-tests",
     "Product": "OpenShift",
@@ -464033,7 +464033,7 @@
   {
     "APIVersion": "v1",
     "Kind": "TestOwnership",
-    "ID": "openshift-tests:5669e82b1d585a9ec2fb09e45acfbbff",
+    "ID": "openshift-tests:17cd79cdb3f3f93a02e35c39a2bb7d63",
     "Name": "[sig-imagepolicy][Suite:openshift/disruptive-longrunning][Disruptive][OCPFeatureGate:SigstoreImageVerificationPKI][Serial][Skipped:Disconnected] imagepolicy signature validation tests pass with valid PKI",
     "Suite": "openshift-tests",
     "Product": "OpenShift",
@@ -464049,7 +464049,7 @@
   {
     "APIVersion": "v1",
     "Kind": "TestOwnership",
-    "ID": "openshift-tests:f29f1a9f67baaea3ec90cb110cdcc25b",
+    "ID": "openshift-tests:565ec149ce30d7f2bc0ffe828d9039ec",
     "Name": "[sig-imagepolicy][Suite:openshift/disruptive-longrunning][Disruptive][OCPFeatureGate:SigstoreImageVerification][Serial] Should fail clusterimagepolicy signature validation root of trust does not match the identity in the signature",
     "Suite": "openshift-tests",
     "Product": "OpenShift",
@@ -464065,7 +464065,7 @@
   {
     "APIVersion": "v1",
     "Kind": "TestOwnership",
-    "ID": "openshift-tests:07fc6d35dc3985e53c316375b1ecf87a",
+    "ID": "openshift-tests:545fbc42858d99c7643b9435c06308a3",
     "Name": "[sig-imagepolicy][Suite:openshift/disruptive-longrunning][Disruptive][OCPFeatureGate:SigstoreImageVerification][Serial] Should fail clusterimagepolicy signature validation when scope in allowedRegistries list does not skip signature verification",
     "Suite": "openshift-tests",
     "Product": "OpenShift",
@@ -464081,7 +464081,7 @@
   {
     "APIVersion": "v1",
     "Kind": "TestOwnership",
-    "ID": "openshift-tests:077fa952a0ae24a47bbbdd1588192572",
+    "ID": "openshift-tests:c56c416165acb1951e4d5bc5c6925ac7",
     "Name": "[sig-imagepolicy][Suite:openshift/disruptive-longrunning][Disruptive][OCPFeatureGate:SigstoreImageVerification][Serial] Should fail imagepolicy signature validation in different namespaces root of trust does not match the identity in the signature",
     "Suite": "openshift-tests",
     "Product": "OpenShift",
@@ -464097,7 +464097,7 @@
   {
     "APIVersion": "v1",
     "Kind": "TestOwnership",
-    "ID": "openshift-tests:99acca641756c69db53f1de456c907c2",
+    "ID": "openshift-tests:8b6d2087d9be4570b4491ff7a7dd02f0",
     "Name": "[sig-imagepolicy][Suite:openshift/disruptive-longrunning][Disruptive][OCPFeatureGate:SigstoreImageVerification][Serial] Should pass clusterimagepolicy signature validation with signed image",
     "Suite": "openshift-tests",
     "Product": "OpenShift",
@@ -464113,7 +464113,7 @@
   {
     "APIVersion": "v1",
     "Kind": "TestOwnership",
-    "ID": "openshift-tests:8e84c6171e2d9d8bbc919868ef8c67e4",
+    "ID": "openshift-tests:b6e0a0dc982b6c6873d3d861bdd3b011",
     "Name": "[sig-imagepolicy][Suite:openshift/disruptive-longrunning][Disruptive][OCPFeatureGate:SigstoreImageVerification][Serial] Should pass imagepolicy signature validation with signed image in namespaces",
     "Suite": "openshift-tests",
     "Product": "OpenShift",
diff --git a/pkg/components/node/crio/component.go b/pkg/components/node/crio/component.go
index 81494832..4f46249c 100644
--- a/pkg/components/node/crio/component.go
+++ b/pkg/components/node/crio/component.go
@@ -14,6 +14,20 @@ var CRIOComponent = Component{
 		Name:                 "Node / CRI-O",
 		Operators:            []string{},
 		DefaultJiraComponent: "Node / CRI-O",
+		TestRenames: map[string]string{
+			// SigstoreImageVerification tests
+			"[sig-imagepolicy][Suite:openshift/disruptive-longrunning][Disruptive][OCPFeatureGate:SigstoreImageVerification][Serial] Should fail clusterimagepolicy signature validation root of trust does not match the identity in the signature":                  "[sig-imagepolicy][OCPFeatureGate:SigstoreImageVerification][Serial] Should fail clusterimagepolicy signature validation root of trust does not match the identity in the signature [Suite:openshift/conformance/serial]",
+			"[sig-imagepolicy][Suite:openshift/disruptive-longrunning][Disruptive][OCPFeatureGate:SigstoreImageVerification][Serial] Should fail clusterimagepolicy signature validation when scope in allowedRegistries list does not skip signature verification":   "[sig-imagepolicy][OCPFeatureGate:SigstoreImageVerification][Serial] Should fail clusterimagepolicy signature validation when scope in allowedRegistries list does not skip signature verification [Suite:openshift/conformance/serial]",
+			"[sig-imagepolicy][Suite:openshift/disruptive-longrunning][Disruptive][OCPFeatureGate:SigstoreImageVerification][Serial] Should fail imagepolicy signature validation in different namespaces root of trust does not match the identity in the signature": "[sig-imagepolicy][OCPFeatureGate:SigstoreImageVerification][Serial] Should fail imagepolicy signature validation in different namespaces root of trust does not match the identity in the signature [Suite:openshift/conformance/serial]",
+			"[sig-imagepolicy][Suite:openshift/disruptive-longrunning][Disruptive][OCPFeatureGate:SigstoreImageVerification][Serial] Should pass clusterimagepolicy signature validation with signed image":                                                           "[sig-imagepolicy][OCPFeatureGate:SigstoreImageVerification][Serial] Should pass clusterimagepolicy signature validation with signed image [Suite:openshift/conformance/serial]",
+			"[sig-imagepolicy][Suite:openshift/disruptive-longrunning][Disruptive][OCPFeatureGate:SigstoreImageVerification][Serial] Should pass imagepolicy signature validation with signed image in namespaces":                                                    "[sig-imagepolicy][OCPFeatureGate:SigstoreImageVerification][Serial] Should pass imagepolicy signature validation with signed image in namespaces [Suite:openshift/conformance/serial]",
+			// SigstoreImageVerificationPKI tests
+			"[sig-imagepolicy][Suite:openshift/disruptive-longrunning][Disruptive][OCPFeatureGate:SigstoreImageVerificationPKI][Serial][Skipped:Disconnected] clusterimagepolicy signature validation tests fail with PKI email does not match":                                       "[sig-imagepolicy][OCPFeatureGate:SigstoreImageVerificationPKI][Serial][Skipped:Disconnected] clusterimagepolicy signature validation tests fail with PKI email does not match [Suite:openshift/conformance/serial]",
+			"[sig-imagepolicy][Suite:openshift/disruptive-longrunning][Disruptive][OCPFeatureGate:SigstoreImageVerificationPKI][Serial][Skipped:Disconnected] clusterimagepolicy signature validation tests fail with PKI root of trust does not match the identity in the signature": "[sig-imagepolicy][OCPFeatureGate:SigstoreImageVerificationPKI][Serial][Skipped:Disconnected] clusterimagepolicy signature validation tests fail with PKI root of trust does not match the identity in the signature [Suite:openshift/conformance/serial]",
+			"[sig-imagepolicy][Suite:openshift/disruptive-longrunning][Disruptive][OCPFeatureGate:SigstoreImageVerificationPKI][Serial][Skipped:Disconnected] clusterimagepolicy signature validation tests pass with valid PKI":                                                      "[sig-imagepolicy][OCPFeatureGate:SigstoreImageVerificationPKI][Serial][Skipped:Disconnected] clusterimagepolicy signature validation tests pass with valid PKI [Suite:openshift/conformance/serial]",
+			"[sig-imagepolicy][Suite:openshift/disruptive-longrunning][Disruptive][OCPFeatureGate:SigstoreImageVerificationPKI][Serial][Skipped:Disconnected] imagepolicy signature validation tests fail with PKI root of trust does not match the identity in the signature":        "[sig-imagepolicy][OCPFeatureGate:SigstoreImageVerificationPKI][Serial][Skipped:Disconnected] imagepolicy signature validation tests fail with PKI root of trust does not match the identity in the signature [Suite:openshift/conformance/serial]",
+			"[sig-imagepolicy][Suite:openshift/disruptive-longrunning][Disruptive][OCPFeatureGate:SigstoreImageVerificationPKI][Serial][Skipped:Disconnected] imagepolicy signature validation tests pass with valid PKI":                                                             "[sig-imagepolicy][OCPFeatureGate:SigstoreImageVerificationPKI][Serial][Skipped:Disconnected] imagepolicy signature validation tests pass with valid PKI [Suite:openshift/conformance/serial]",
+		},
 		Matchers: []config.ComponentMatcher{
 			{
 				IncludeAny: []string{