diff --git a/internal/factsengine/gatherers/cibadmin.go b/internal/factsengine/gatherers/cibadmin.go
index d3871c8d..68a62b32 100644
--- a/internal/factsengine/gatherers/cibadmin.go
+++ b/internal/factsengine/gatherers/cibadmin.go
@@ -46,7 +46,8 @@ func (g *CibAdminGatherer) Gather(factsRequests []entities.FactRequest) ([]entit
 	}
 
 	elementsToList := map[string]bool{"primitive": true, "clone": true, "master": true, "group": true,
-		"nvpair": true, "op": true, "rsc_location": true, "rsc_order": true, "rsc_colocation": true}
+		"nvpair": true, "op": true, "rsc_location": true, "rsc_order": true,
+		"rsc_colocation": true, "cluster_property_set": true}
 
 	factValueMap, err := parseXMLToFactValueMap(cibadmin, elementsToList)
 	if err != nil {
diff --git a/internal/factsengine/gatherers/cibadmin_test.go b/internal/factsengine/gatherers/cibadmin_test.go
index daa3b737..0b32edd7 100644
--- a/internal/factsengine/gatherers/cibadmin_test.go
+++ b/internal/factsengine/gatherers/cibadmin_test.go
@@ -92,7 +92,7 @@ func (suite *CibAdminTestSuite) TestCibAdminGather() {
 		{
 			Name:     "nvpair",
 			Gatherer: "cibadmin",
-			Argument: "cib.configuration.crm_config.cluster_property_set.nvpair.0",
+			Argument: "cib.configuration.crm_config.cluster_property_set.0.nvpair.0",
 			CheckID:  "check2",
 		},
 		{