Revert "Merge branch 'fix-crd-names-try-2' into 'master'"

Revert "Merge branch 'fix-crd-names-try-2' into 'master'"

This reverts merge request !6386 (merged)

The additional rules have caused additional pressure on prometheus in our gprd clusters which is effecting our recording rules.