diff --git a/addon-tools/report-creator/report/testdata/CreationOfMissingCRsAndUnmatchedCRsAndDiffTestsSuitesWhenNoDiffs b/addon-tools/report-creator/report/testdata/CreationOfMissingCRsAndUnmatchedCRsAndDiffTestsSuitesWhenNoDiffs
index dcfe8370..11930799 100644
--- a/addon-tools/report-creator/report/testdata/CreationOfMissingCRsAndUnmatchedCRsAndDiffTestsSuitesWhenNoDiffs
+++ b/addon-tools/report-creator/report/testdata/CreationOfMissingCRsAndUnmatchedCRsAndDiffTestsSuitesWhenNoDiffs
@@ -1 +1 @@
-{"Summary":{"ValidationIssuses":{},"NumMissing":0,"UnmatchedCRS":[],"NumDiffCRs":0,"TotalCRs":27,"MetadataHash":"933892b7ae8a4f5232734acc34f6c93fc223844d836b37af390cfeaecf0b7a99","patchedCRs":0},"Diffs":[{"DiffOutput":"","CorrelatedTemplate":"cm.yaml","CRName":"v1_ConfigMap_kubernetes-dashboard_kubernetes-dashboard-settings"},{"DiffOutput":"","CorrelatedTemplate":"cr.yaml","CRName":"rbac.authorization.k8s.io/v1_ClusterRole_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"crb.yaml","CRName":"rbac.authorization.k8s.io/v1_ClusterRoleBinding_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"deploymentDashboard.yaml","CRName":"apps/v1_Deployment_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"deploymentMetrics.yaml","CRName":"apps/v1_Deployment_kubernetes-dashboard_dashboard-metrics-scraper"},{"DiffOutput":"","CorrelatedTemplate":"ns.yaml","CRName":"v1_Namespace_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"rb.yaml","CRName":"rbac.authorization.k8s.io/v1_RoleBinding_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"role.yaml","CRName":"rbac.authorization.k8s.io/v1_Role_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"sa.yaml","CRName":"v1_ServiceAccount_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"secret.yaml","CRName":"v1_Secret_kubernetes-dashboard_kubernetes-dashboard-certs"},{"DiffOutput":"","CorrelatedTemplate":"secret.yaml","CRName":"v1_Secret_kubernetes-dashboard_kubernetes-dashboard-csrf"},{"DiffOutput":"","CorrelatedTemplate":"secret.yaml","CRName":"v1_Secret_kubernetes-dashboard_kubernetes-dashboard-key-holder"},{"DiffOutput":"","CorrelatedTemplate":"service.yaml","CRName":"v1_Service_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"ns.yaml","CRName":"v1_Namespace_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"sa.yaml","CRName":"v1_ServiceAccount_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"service.yaml","CRName":"v1_Service_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"secret.yaml","CRName":"v1_Secret_kubernetes-dashboard_kubernetes-dashboard-certs"},{"DiffOutput":"","CorrelatedTemplate":"secret.yaml","CRName":"v1_Secret_kubernetes-dashboard_kubernetes-dashboard-csrf"},{"DiffOutput":"","CorrelatedTemplate":"secret.yaml","CRName":"v1_Secret_kubernetes-dashboard_kubernetes-dashboard-key-holder"},{"DiffOutput":"","CorrelatedTemplate":"cm.yaml","CRName":"v1_ConfigMap_kubernetes-dashboard_kubernetes-dashboard-settings"},{"DiffOutput":"","CorrelatedTemplate":"role.yaml","CRName":"rbac.authorization.k8s.io/v1_Role_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"cr.yaml","CRName":"rbac.authorization.k8s.io/v1_ClusterRole_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"rb.yaml","CRName":"rbac.authorization.k8s.io/v1_RoleBinding_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"crb.yaml","CRName":"rbac.authorization.k8s.io/v1_ClusterRoleBinding_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"deploymentDashboard.yaml","CRName":"apps/v1_Deployment_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"service.yaml","CRName":"v1_Service_kubernetes-dashboard_dashboard-metrics-scraper"},{"DiffOutput":"","CorrelatedTemplate":"deploymentMetrics.yaml","CRName":"apps/v1_Deployment_kubernetes-dashboard_dashboard-metrics-scraper"}]}
+{"Summary":{"ValidationIssuses":{},"NumMissing":0,"UnmatchedCRS":[],"NumDiffCRs":0,"TotalCRs":14,"MetadataHash":"933892b7ae8a4f5232734acc34f6c93fc223844d836b37af390cfeaecf0b7a99","patchedCRs":0},"Diffs":[{"DiffOutput":"","CorrelatedTemplate":"cm.yaml","CRName":"v1_ConfigMap_kubernetes-dashboard_kubernetes-dashboard-settings"},{"DiffOutput":"","CorrelatedTemplate":"cr.yaml","CRName":"rbac.authorization.k8s.io/v1_ClusterRole_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"crb.yaml","CRName":"rbac.authorization.k8s.io/v1_ClusterRoleBinding_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"deploymentDashboard.yaml","CRName":"apps/v1_Deployment_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"deploymentMetrics.yaml","CRName":"apps/v1_Deployment_kubernetes-dashboard_dashboard-metrics-scraper"},{"DiffOutput":"","CorrelatedTemplate":"ns.yaml","CRName":"v1_Namespace_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"rb.yaml","CRName":"rbac.authorization.k8s.io/v1_RoleBinding_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"role.yaml","CRName":"rbac.authorization.k8s.io/v1_Role_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"sa.yaml","CRName":"v1_ServiceAccount_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"secret.yaml","CRName":"v1_Secret_kubernetes-dashboard_kubernetes-dashboard-certs"},{"DiffOutput":"","CorrelatedTemplate":"secret.yaml","CRName":"v1_Secret_kubernetes-dashboard_kubernetes-dashboard-csrf"},{"DiffOutput":"","CorrelatedTemplate":"secret.yaml","CRName":"v1_Secret_kubernetes-dashboard_kubernetes-dashboard-key-holder"},{"DiffOutput":"","CorrelatedTemplate":"service.yaml","CRName":"v1_Service_kubernetes-dashboard_kubernetes-dashboard"},{"DiffOutput":"","CorrelatedTemplate":"service.yaml","CRName":"v1_Service_kubernetes-dashboard_dashboard-metrics-scraper"}]}
diff --git a/addon-tools/report-creator/report/testdata/CreationOfMissingCRsAndUnmatchedCRsAndDiffTestsSuitesWhenNoDiffs.golden b/addon-tools/report-creator/report/testdata/CreationOfMissingCRsAndUnmatchedCRsAndDiffTestsSuitesWhenNoDiffs.golden
index 2bcb0451..d8070983 100644
--- a/addon-tools/report-creator/report/testdata/CreationOfMissingCRsAndUnmatchedCRsAndDiffTestsSuitesWhenNoDiffs.golden
+++ b/addon-tools/report-creator/report/testdata/CreationOfMissingCRsAndUnmatchedCRsAndDiffTestsSuitesWhenNoDiffs.golden
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites name="Comparison results of known valid reference configuration and a set of specific cluster CRs" tests="29" failures="0" errors="0" skipped="0" TIME>
-	<testsuite tests="27" failures="0" skipped="0" TIME name="Detected Differences Between Cluster CRs and Expected CRs" TIME>
+<testsuites name="Comparison results of known valid reference configuration and a set of specific cluster CRs" tests="16" failures="0" errors="0" skipped="0" TIME>
+	<testsuite tests="14" failures="0" skipped="0" TIME name="Detected Differences Between Cluster CRs and Expected CRs" TIME>
 		<properties>
 			<property name="MetadataHash" value="933892b7ae8a4f5232734acc34f6c93fc223844d836b37af390cfeaecf0b7a99"></property>
-			<property name="TotalCRs" value="27"></property>
+			<property name="TotalCRs" value="14"></property>
 		</properties>
 		<testcase classname="Matching Reference CR: cm.yaml" name="CR: v1_ConfigMap_kubernetes-dashboard_kubernetes-dashboard-settings" TIME>
 			<properties></properties>
@@ -44,53 +44,14 @@
 		<testcase classname="Matching Reference CR: service.yaml" name="CR: v1_Service_kubernetes-dashboard_kubernetes-dashboard" TIME>
 			<properties></properties>
 		</testcase>
-		<testcase classname="Matching Reference CR: ns.yaml" name="CR: v1_Namespace_kubernetes-dashboard" TIME>
-			<properties></properties>
-		</testcase>
-		<testcase classname="Matching Reference CR: sa.yaml" name="CR: v1_ServiceAccount_kubernetes-dashboard_kubernetes-dashboard" TIME>
-			<properties></properties>
-		</testcase>
-		<testcase classname="Matching Reference CR: service.yaml" name="CR: v1_Service_kubernetes-dashboard_kubernetes-dashboard" TIME>
-			<properties></properties>
-		</testcase>
-		<testcase classname="Matching Reference CR: secret.yaml" name="CR: v1_Secret_kubernetes-dashboard_kubernetes-dashboard-certs" TIME>
-			<properties></properties>
-		</testcase>
-		<testcase classname="Matching Reference CR: secret.yaml" name="CR: v1_Secret_kubernetes-dashboard_kubernetes-dashboard-csrf" TIME>
-			<properties></properties>
-		</testcase>
-		<testcase classname="Matching Reference CR: secret.yaml" name="CR: v1_Secret_kubernetes-dashboard_kubernetes-dashboard-key-holder" TIME>
-			<properties></properties>
-		</testcase>
-		<testcase classname="Matching Reference CR: cm.yaml" name="CR: v1_ConfigMap_kubernetes-dashboard_kubernetes-dashboard-settings" TIME>
-			<properties></properties>
-		</testcase>
-		<testcase classname="Matching Reference CR: role.yaml" name="CR: rbac.authorization.k8s.io/v1_Role_kubernetes-dashboard_kubernetes-dashboard" TIME>
-			<properties></properties>
-		</testcase>
-		<testcase classname="Matching Reference CR: cr.yaml" name="CR: rbac.authorization.k8s.io/v1_ClusterRole_kubernetes-dashboard" TIME>
-			<properties></properties>
-		</testcase>
-		<testcase classname="Matching Reference CR: rb.yaml" name="CR: rbac.authorization.k8s.io/v1_RoleBinding_kubernetes-dashboard_kubernetes-dashboard" TIME>
-			<properties></properties>
-		</testcase>
-		<testcase classname="Matching Reference CR: crb.yaml" name="CR: rbac.authorization.k8s.io/v1_ClusterRoleBinding_kubernetes-dashboard" TIME>
-			<properties></properties>
-		</testcase>
-		<testcase classname="Matching Reference CR: deploymentDashboard.yaml" name="CR: apps/v1_Deployment_kubernetes-dashboard_kubernetes-dashboard" TIME>
-			<properties></properties>
-		</testcase>
 		<testcase classname="Matching Reference CR: service.yaml" name="CR: v1_Service_kubernetes-dashboard_dashboard-metrics-scraper" TIME>
 			<properties></properties>
 		</testcase>
-		<testcase classname="Matching Reference CR: deploymentMetrics.yaml" name="CR: apps/v1_Deployment_kubernetes-dashboard_dashboard-metrics-scraper" TIME>
-			<properties></properties>
-		</testcase>
 	</testsuite>
 	<testsuite tests="1" failures="0" skipped="0" TIME name="Reference validation" TIME>
 		<properties>
 			<property name="MetadataHash" value="933892b7ae8a4f5232734acc34f6c93fc223844d836b37af390cfeaecf0b7a99"></property>
-			<property name="TotalCRs" value="27"></property>
+			<property name="TotalCRs" value="14"></property>
 		</properties>
 		<testcase classname="" name="No reference validation issues: All expected CRs exist in the cluster" TIME>
 			<properties></properties>
@@ -99,7 +60,7 @@
 	<testsuite tests="1" failures="0" skipped="0" TIME name="Unmatched Cluster Resources" TIME>
 		<properties>
 			<property name="MetadataHash" value="933892b7ae8a4f5232734acc34f6c93fc223844d836b37af390cfeaecf0b7a99"></property>
-			<property name="TotalCRs" value="27"></property>
+			<property name="TotalCRs" value="14"></property>
 		</properties>
 		<testcase classname="" name="All Cluster CRs are matched to reference CRs " TIME>
 			<properties></properties>
diff --git a/pkg/compare/compare.go b/pkg/compare/compare.go
index d7b3d3c3..0c969937 100644
--- a/pkg/compare/compare.go
+++ b/pkg/compare/compare.go
@@ -490,8 +490,12 @@ func getSupportedResourceTypes(client discovery.CachedDiscoveryInterface) (map[s
 	}
 	for _, list := range lists {
 		if len(list.APIResources) != 0 {
+			gv, err := schema.ParseGroupVersion(list.GroupVersion)
+			if err != nil {
+				klog.Warningf("Failed to parse GroupVersion %s: %v", list.GroupVersion, err)
+				continue
+			}
 			for _, res := range list.APIResources {
-				gv := schema.GroupVersion{Group: res.Group, Version: res.Version}
 				if !slices.Contains(resources[res.Kind], gv) {
 					resources[res.Kind] = append(resources[res.Kind], gv)
 				}
diff --git a/pkg/compare/compare_test.go b/pkg/compare/compare_test.go
index fe4590a2..232e597c 100644
--- a/pkg/compare/compare_test.go
+++ b/pkg/compare/compare_test.go
@@ -848,8 +848,19 @@ func getResources(t *testing.T, test Test, resourcesDir string) ([]v1.APIResourc
 
 func updateTestDiscoveryClient(tf *cmdtesting.TestFactory, discoveryResources []v1.APIResource) {
 	discoveryClient := cmdtesting.NewFakeCachedDiscoveryClient()
-	ResourceList := v1.APIResourceList{APIResources: discoveryResources}
-	discoveryClient.Resources = append(discoveryClient.Resources, &ResourceList)
-	discoveryClient.PreferredResources = append(discoveryClient.PreferredResources, &ResourceList)
+	// Group resources by GroupVersion to match real Kubernetes API behavior
+	resourcesByGV := make(map[string][]v1.APIResource)
+	for _, res := range discoveryResources {
+		gv := res.Version
+		if res.Group != "" {
+			gv = res.Group + "/" + res.Version
+		}
+		resourcesByGV[gv] = append(resourcesByGV[gv], res)
+	}
+	for gv, resources := range resourcesByGV {
+		list := &v1.APIResourceList{GroupVersion: gv, APIResources: resources}
+		discoveryClient.Resources = append(discoveryClient.Resources, list)
+		discoveryClient.PreferredResources = append(discoveryClient.PreferredResources, list)
+	}
 	tf.WithDiscoveryClient(discoveryClient)
 }