diff --git a/pkg/operator/controllers/rbac/bindata.go b/pkg/operator/controllers/rbac/bindata.go
index c09c5e24ed7..c20b3cafdb5 100644
--- a/pkg/operator/controllers/rbac/bindata.go
+++ b/pkg/operator/controllers/rbac/bindata.go
@@ -78,7 +78,7 @@ func (fi bindataFileInfo) Sys() interface{} {
 	return nil
 }
 
-var _clusterroleYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xbc\x5a\x5f\x8f\xe3\xb8\x0d\x7f\x9f\x4f\x61\x5c\x1f\x0e\x28\x30\x59\xf4\xad\x98\x3e\xde\x15\x45\x81\xa2\x07\x2c\xb6\x7d\x67\x64\xc6\xe6\x45\x16\xb5\x14\x95\xd9\xf4\xd3\x17\x92\x65\xc7\xce\x3f\x67\x9c\xdb\x7d\x1a\x9b\x92\xf9\x23\x29\x8a\xff\x32\x7f\xaa\x7e\xe1\x1a\xab\x06\x1d\x0a\x28\xd6\xd5\xf6\x58\xb5\x60\xf6\x9f\x1a\x74\x35\x05\xc3\x07\x94\xa3\x01\xd3\xe2\xdf\xaa\x5f\x7f\xab\xfe\xfd\xdb\x97\xea\xef\xbf\xfe\xf3\xcb\xe6\x05\x3c\xfd\x17\x25\x10\xbb\xb7\x4a\xb6\x60\x36\x10\xb5\x65\xa1\xff\x81\x12\xbb\xcd\xfe\xaf\x61\x43\xfc\xe9\xf0\x97\x97\x3d\xb9\xfa\xad\xfa\xc5\xc6\xa0\x28\x9f\xd9\xe2\x4b\x87\x0a\x35\x28\xbc\xbd\x54\x95\x11\xcc\x1f\x7c\xa1\x0e\x83\x42\xe7\xdf\x2a\x17\xad\x7d\xa9\x2a\x07\x1d\xbe\x55\xe1\x18\x14\xbb\x37\x10\x7e\x0d\x82\x2f\x12\x2d\x86\xb7\x97\xd7\x0a\x3c\xfd\x43\x38\xfa\x90\x98\xbc\x56\x3f\xfd\xf4\x52\x55\x82\x81\xa3\x18\x2c\x34\xc3\x9d\x67\x87\x4e\x83\x82\xc6\x80\xe1\xa5\xaa\x0e\x28\xdb\xb2\xdc\xa0\xe6\xbf\x96\x82\x3e\xca\xd0\xed\xa8\xe9\xc0\x87\xfc\x8a\xae\xf6\x4c\x4e\xcb\xdb\x01\x87\x47\x4b\x1d\xa9\x80\x6b\xb0\x7f\x4f\x9a\x04\x0f\x66\x78\xe5\xba\x3c\xf9\x64\xc0\xa0\xe8\xf4\xc0\x36\x76\x68\x2c\x50\x77\x7d\xa9\x50\xb9\x1e\x1f\x14\x3b\x6f\x41\xcb\x8a\xa0\xb7\x64\xb2\x29\x0d\x3b\x15\xb6\x16\x65\x58\xea\xb5\xf8\x1a\x59\xa1\x27\x05\x94\x03\x19\x04\x63\x38\x0e\x52\x17\xda\x3d\x2b\xa5\x87\x77\x50\xd3\x3e\x66\xaf\x24\xed\x27\xcb\xcd\x25\xc7\x8b\xcf\xa1\xee\x28\x24\x67\x12\x6c\x28\xa8\x4c\x9d\xe8\x92\x71\x17\x15\x94\x5c\xf3\x8e\xdb\x96\x79\xdf\x9f\x4b\xec\x3f\xea\x95\x39\x80\xa5\xfa\xee\x9e\x15\x3a\x82\x27\xfc\xa6\xe8\x92\x9c\xe1\xa6\x70\x26\x06\xe5\x6e\x20\xd6\xb8\x23\x47\xcf\x81\x3e\x64\x13\xf0\xf4\xdc\x09\x16\x06\x28\x1b\xf6\xe8\x42\x4b\x3b\xbd\x05\x24\xf8\x35\x62\xd0\xd1\x79\x56\xa1\xe5\x5b\x74\x79\xc3\x8a\xeb\x0a\x1e\x28\x8c\xc7\x59\x03\x76\xec\x02\x16\x57\xad\xd1\x5b\x3e\x76\xe3\x85\x2b\xce\x3f\xae\xa7\x0b\x8f\xbb\x68\x0b\x61\xa5\x78\x0b\x76\x38\x09\xd1\xfb\xd6\x0f\x44\x7a\xf4\x52\x09\x2f\x70\x36\x7d\x54\x5e\x2b\x7a\xd4\x16\x9d\x96\xb0\x73\xd3\x33\x95\xf7\xe8\xd2\x79\xe2\xfb\x19\x50\x0e\xfe\x78\x9d\xf1\x79\x2a\xb9\xe4\x1b\xd0\xee\x42\xdc\xfe\x8e\x46\xc1\x18\x0c\xe1\x84\x31\x5b\xcc\x39\x63\xb6\x76\xfd\xa3\x0f\x0b\xf6\x90\x6d\x85\x2d\x6e\xc9\xd5\xe4\x9a\x70\x4e\x2f\xde\x7b\xbe\x63\x58\x7a\x38\x59\x7d\x44\xac\xe1\xf5\x8a\xc9\x7e\x88\x59\x26\xda\x0a\x06\x15\x32\xcf\x04\xc7\xa8\x1c\x0c\x58\x72\xcd\x25\x52\x16\x89\x9d\x82\xf5\x5c\x0f\x3b\x9f\x71\xf6\x01\xea\xb1\x83\x9f\x23\xbe\x56\x1d\x98\x96\x1c\x3e\x2d\xc8\x36\x93\x2f\x51\x85\xdd\xef\xbc\xed\xb1\xca\xc3\x1a\xee\x91\x6c\xbd\xa0\x60\xde\x73\x0a\x7a\x85\xf0\xbd\x01\x1f\x8d\x7a\x06\x45\x69\x97\x82\x12\xde\x49\xd2\x93\x4d\xd4\xb8\xec\x8c\x39\xa7\xad\xd4\xc2\x58\x8e\xf5\xc6\xa1\xbe\xb3\xec\x17\xfd\x83\x63\xed\x85\x0e\xa0\x48\xfe\xa9\xe4\x91\x59\x19\xc1\x3a\x85\x61\xb0\x4b\xc0\xe3\xc6\xf0\xa4\xb6\x59\xe6\xe5\x3a\xa1\xaf\x27\xc2\x95\x64\x71\xe6\x37\xe3\xa5\x61\x9f\xda\x10\x96\x19\xf1\xd0\xf7\x19\x61\xc0\x0e\x63\xe8\xac\x5d\x28\x4f\x3b\x04\x8d\x82\xcd\x58\x10\x53\x07\x0d\xa6\x7a\x02\x9d\x7a\xb6\x64\x68\xba\x50\x1e\xdd\x4e\x20\xa8\x44\x93\xbe\x1d\x68\x29\x2e\x0d\x6c\xcb\x89\x9e\x17\xee\x9c\xb4\x29\x8f\x45\xe2\x36\x96\xbb\xe7\x85\x53\x18\x1d\x5f\xbe\x0d\xc0\xc1\xb4\x58\xc7\xf5\x17\xbf\x68\xbe\x74\xc8\xfd\x2e\x63\xa9\xe6\x77\x67\x19\xea\x99\xdd\x52\x01\x2b\x0e\xac\xe5\xc6\x92\xdb\xcf\xd6\x2e\x08\x8e\xcb\x25\x39\xb7\xbe\xb7\xb1\xa1\x39\xe9\x6b\x24\xb3\x0f\x0a\xa2\x33\xf2\x11\x3a\x1b\xa0\xf3\xf7\x33\xda\x7d\xad\x53\x49\xe8\x2d\xb8\xac\x7a\x36\xf6\x82\x0d\x3c\xd7\xe5\xe0\x0c\x3b\x87\x46\xe9\x40\x7a\x34\x2d\x9a\xfd\x6a\x29\x58\x6a\x72\xf7\x0b\x12\x8b\x70\xbf\xcb\xbc\x03\x30\xf6\xda\x37\xb9\x8f\xed\xa6\x5d\x5f\xe3\xf7\x4d\xea\x6d\x88\xa1\x87\x5d\xc1\x7a\x67\xf9\xbd\x9c\xd5\xe6\xd4\x4a\xdc\x42\x4a\xbb\xd3\x7d\xe8\x60\xb8\x27\xc4\x42\x7a\xb4\x78\x40\xfb\x47\xf4\x6a\x2d\xda\x6e\xc1\x4b\xd2\x16\xd3\x82\xa8\xa0\xe7\x40\xca\x32\xdc\xd4\x72\x85\x6f\x6d\x58\x21\x4e\x0e\x3a\x0b\xf2\x4c\x03\x53\x7e\x54\x41\xe8\xbe\x3b\x60\x46\x19\xb1\x97\xb2\xeb\x07\xf9\x2a\x34\x13\x8d\xca\xdb\xc3\x75\x6d\xfe\xa8\x74\xbf\xc7\x47\x2f\xff\xb4\x30\xc9\x0c\xbc\x44\xb7\x3a\xe8\x96\x74\xf0\x28\x78\xed\x82\xa0\x61\x59\x5b\x0d\xa5\xfb\x62\x1c\x6d\x8c\x33\xbb\xab\x00\x25\xae\xbd\x82\x2a\x98\x36\xf5\x84\xaf\x4f\x8f\x18\x12\x28\x1f\xdc\x86\xe5\x4a\x15\x8d\x59\xff\x1d\x09\xbe\x83\xb5\x61\x42\x23\x3f\x7d\xfb\xca\xab\x63\x5f\xa9\x8c\x17\x4c\x5b\x76\xb5\x08\x56\xdb\x31\x96\x8f\xf4\xf9\x0b\x9e\xb2\xd0\x98\x3d\xe6\x6b\xeb\xe5\x9c\x85\xa7\x65\x67\x54\x20\x87\x22\xd1\x29\x75\x38\x75\xce\xd3\xb0\x63\x4a\xdd\xc7\x2d\x5a\xd4\x29\x69\x86\xeb\x99\xed\x15\xf2\x5a\x95\x30\x75\x60\xb7\x33\xc2\x64\x56\xc9\x77\x7d\xfa\x92\x33\x35\x0b\x13\xab\xa0\x2c\x39\x50\x8c\x35\x5b\xa1\x94\x7a\x6f\xe4\xb0\x56\x37\x76\x39\x66\xbb\x66\x63\x58\x90\xc3\xc6\x70\x77\xa5\x4e\xb5\x28\xda\x81\x4b\xa1\x66\x6a\xf5\x29\x7d\x34\x41\xe1\x39\xa6\x89\xed\x29\x63\x74\xa8\x2d\xc6\x70\x41\xc8\xe3\x87\x5e\xbd\x7e\x3e\x37\xe3\xa1\x2d\x38\xce\x7b\xd6\x46\xa8\x49\xd3\xf1\x48\x84\xea\x6f\xab\x70\xd4\x41\xad\xe1\x43\xbf\xa7\xe7\x44\x48\x96\xbe\x75\xd8\x25\x8e\x1a\x0b\x63\x6d\x7d\xb5\xd2\x9e\x94\xea\x6b\x04\xe1\x1a\x6f\x8a\x30\x5c\xc1\x51\x84\x15\x00\x0f\x1a\xf9\x5a\xb3\x73\xd6\xab\xcd\x3a\x1c\x13\xa8\x16\x1a\x7b\xa5\xb3\x28\x71\xea\x77\x4c\xa0\xe0\xc0\x87\x96\xf5\x7c\xca\x7f\x6a\x85\x50\x4d\x7d\xd9\x03\xf5\xf2\xcd\x3b\xa1\x72\x26\x67\x9c\x52\x04\x3a\x6b\xde\x12\xe9\xb4\x6d\x76\x29\xd2\xd2\xac\xb3\x29\xa4\x2b\x57\x79\xf0\xf9\x59\x53\x35\x1a\xf2\x0c\x72\xa4\xdf\xc0\x2d\x97\xc9\xc0\x2c\x74\x3c\x79\xac\xe1\x6e\xa4\x30\xa0\x60\xb9\x29\xb4\xe9\xf9\x15\x61\x66\x8d\x2a\xb9\xa0\x60\x73\xea\x29\x1a\xd9\x6e\x7a\xb0\x03\xa6\x61\x57\xd3\xc9\x4d\x06\x72\x93\xc5\x9b\x4b\xd7\x6b\x1a\xb7\xc1\x08\xf9\x27\x22\xa3\x07\xb3\x4f\xc6\xda\x3c\xa6\x77\xd9\xde\x81\xa3\xdd\xc2\xd0\xe0\x12\x0a\x65\xc7\xe9\xe4\xcc\x52\x7e\x9f\xec\xf4\xc2\x3b\x5a\xdd\x31\x66\x1f\x3f\x5e\xed\x0a\x6b\x0a\x12\xb3\xe5\xb6\xb1\x6e\x86\x22\x21\xa5\x36\x34\x31\xf5\x1f\xcf\x85\x1f\xdf\x4f\x4d\x37\xcb\x83\xf7\xb2\xb3\x4c\x2d\x56\xc3\xe5\x36\x65\x11\x2a\xef\xba\x3e\xf1\xb9\x71\x68\x1f\x61\xbc\x52\xf8\xfc\x6b\xe4\xe2\x08\xc9\x5b\xc2\x7a\x98\x98\x9f\xff\x8e\xf9\xb0\x13\x3e\x82\xf5\x51\x90\x3b\xaa\xdd\xfc\x39\xfc\x47\xfe\x48\x70\x4f\xbe\x94\xfc\x17\xc7\xf4\x51\xd7\xf2\x2f\xf3\x9e\x8f\x37\x6c\x6b\xb0\xfa\xd4\x73\xaf\xf4\x18\x66\x0b\x4f\x25\xfe\x21\x40\x6c\xc8\xf5\x03\xb4\x25\xfb\x81\x6b\x10\xac\x65\xf3\x4c\x09\x3b\xa2\x7e\x18\xec\xf4\x6d\xce\xff\xdf\x52\x1a\x0d\x2a\x40\xab\x07\x3c\x43\xe1\xb1\x29\xa9\xf6\xa6\xbd\xcb\x3f\x2c\x0c\x75\xca\xa4\xe2\x3b\x5b\x29\x85\xc9\x95\xa5\xb5\x22\x2e\x48\x76\x5e\x66\x05\x3a\xf5\x37\xa9\xb4\xea\x3f\x37\xe0\xc1\x90\xd2\xbc\x29\xb9\xd4\xe3\xd4\x82\xaf\x14\x77\xf8\x0f\x8e\xa5\x5f\x3f\x84\xf7\x28\xc3\xe6\x5c\x56\xb8\xa1\xfe\xb8\x4f\x5d\x2b\x57\x74\xb8\xf4\x93\xcc\x24\x45\x97\x0f\x56\x82\x45\xdf\x08\xd4\xb8\xe9\x8b\xbb\x25\xd8\xb2\xfb\xa9\x90\x11\xc3\xe2\xff\x38\x4c\x8a\x2f\xca\xf5\xfa\xe8\x0d\xe9\xe3\xef\x87\x9b\xb6\x14\xc0\x63\x07\xde\x97\x68\xbf\x34\x94\x7b\x6f\x51\x10\xb6\x1c\x75\x61\x7a\x44\xfe\x34\x3e\xe0\x03\x8a\xed\x31\x72\xfc\x20\x2f\x98\xea\xd8\x0f\xc5\x2b\xc7\xee\x73\x81\xf8\xcf\xe7\x7f\x95\xdd\x3f\xff\xf9\xe7\xcb\xcf\xff\x1f\x00\x00\xff\xff\xc3\x85\xb5\xcb\x69\x26\x00\x00")
+var _clusterroleYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xbc\x1a\x4d\xaf\xe3\xb8\xed\xfe\x7e\x85\xb1\x3d\x2c\x50\xe0\x79\x50\xf4\x52\xbc\x1e\x77\x8b\xa2\x40\xd1\x05\x06\xd3\xde\x19\x89\xb1\xb9\x91\x45\x0d\x25\xe5\x4d\xfa\xeb\x0b\xc9\xb2\x63\x3b\x1f\xce\x73\x3a\x73\x8a\x4d\x51\xfc\x12\xc5\x2f\xe7\x0f\xd5\x2f\xac\xb1\x6a\xd0\xa2\x40\x40\x5d\xed\x4e\x55\x0b\xea\xf0\xa9\x41\xab\xc9\x2b\x3e\xa2\x9c\x14\xa8\x16\xff\x5a\xfd\xfa\x5b\xf5\xaf\xdf\xbe\x54\x7f\xfb\xf5\x1f\x5f\xea\x17\x70\xf4\x1f\x14\x4f\x6c\xdf\x2a\xd9\x81\xaa\x21\x86\x96\x85\xfe\x0b\x81\xd8\xd6\x87\xbf\xf8\x9a\xf8\xd3\xf1\x4f\x2f\x07\xb2\xfa\xad\xfa\xc5\x44\x1f\x50\x3e\xb3\xc1\x97\x0e\x03\x68\x08\xf0\xf6\x52\x55\x4a\x30\x6f\xf8\x42\x1d\xfa\x00\x9d\x7b\xab\x6c\x34\xe6\xa5\xaa\x2c\x74\xf8\x56\xf9\x93\x0f\xd8\xbd\x81\xf0\xab\x17\x7c\x91\x68\xd0\xbf\xbd\xbc\x56\xe0\xe8\xef\xc2\xd1\xf9\x44\xe4\xb5\xfa\xe9\xa7\x97\xaa\x12\xf4\x1c\x45\x61\x81\x29\xee\x1c\x5b\xb4\xc1\x07\x08\xd1\xa3\x7f\xa9\xaa\x23\xca\xae\x2c\x37\x18\xf2\xaf\x21\x1f\x1e\x25\x68\xf7\xd4\x74\xe0\x7c\x7e\x45\xab\x1d\x93\x0d\xe5\xed\x88\xc3\xa3\xa1\x8e\x82\x80\x6d\xb0\x7f\x4f\x9a\x78\x07\x6a\x78\x65\x5d\x9e\x5c\x32\xa0\x0f\x68\xc3\x91\x4d\xec\x50\x19\xa0\xee\xfa\x52\x81\xb2\x1e\x1f\x02\x76\xce\x40\x28\x2b\x82\xce\x90\xca\xa6\x54\x6c\x83\xb0\x31\x28\xc3\x52\xaf\xc5\xd7\xc8\x01\x7a\x90\x47\x39\x92\x42\x50\x8a\xe3\x20\x75\x81\xdd\xb3\x52\x7a\x78\x87\xa0\xda\xc7\xec\x95\xa4\xfd\x64\xb8\xb9\xa4\x78\xb1\x1d\x74\x47\x3e\x39\x93\x60\x43\x3e\xc8\xd4\x89\x2e\x09\x77\x31\x40\x20\xdb\xbc\xe3\xae\x65\x3e\xf4\xe7\x12\xfb\x4d\xbd\x32\x47\x30\xa4\xef\xe2\x6c\xd0\x11\x1c\xe1\xb7\x80\x36\xc9\xe9\x6f\x0a\xa7\xa2\x0f\xdc\x0d\x40\x8d\x7b\xb2\xf4\x1c\xd3\x87\x6c\x02\x8e\x9e\x3b\xc1\x42\x00\xa5\x66\x87\xd6\xb7\xb4\x0f\xb7\x18\x09\x7e\x8d\xe8\xc3\xe8\x3c\x9b\xb8\xe5\x5b\x74\x79\xc3\x8a\xeb\x0a\x1e\xc9\x8f\xc7\xa9\x01\x3b\xb6\x1e\x8b\xab\x6a\x74\x86\x4f\xdd\x78\xe1\x8a\xf3\x8f\xeb\xe9\xc2\xe3\x3e\x9a\x02\xd8\x28\xde\x8a\x1d\xce\x42\xf4\xbe\xf5\x03\x39\x3d\x7a\xa9\x84\x57\x28\xab\x3e\x2a\x6f\x15\x3d\x86\x16\x6d\x28\x61\xe7\xa6\x67\x06\x3e\xa0\x4d\xe7\x89\xef\x0b\x46\x39\xf8\xe3\x75\xc2\xcb\x54\x72\x49\xd7\xa3\xd9\xfb\xb8\xfb\x1d\x55\x00\xa5\xd0\xfb\x33\x8f\xd9\x62\xce\x19\xb3\xb5\xeb\x9b\x3e\x2c\xd8\x43\xb6\x15\x36\xb8\x23\xab\xc9\x36\x7e\x09\x2f\xde\xbb\xc4\x18\x96\x1e\x4e\x56\x1f\x11\x6b\x78\xbd\x62\xb2\x1f\x62\x96\x89\xb6\x82\x3e\x08\xa9\x67\x82\x63\x0c\xec\x15\x18\xb2\xcd\x25\xa7\x2c\x12\xdb\x00\xc6\xb1\x1e\x30\x9f\x71\xf6\x81\xd5\x63\x07\x3f\xe7\xf8\x5a\x75\xa0\x5a\xb2\xf8\xb4\x20\xbb\x0c\xbe\xe4\x2a\x6c\x7f\xe7\x5d\xcf\xab\x3c\x6c\xa1\x1e\xc9\xe8\x15\x05\x33\xce\x39\xe8\x15\xc0\xf7\x66\xf8\x68\xd4\x53\x28\x81\xf6\x29\x28\xe1\x9d\x24\x3d\x41\xa2\xc6\x66\x67\xcc\x39\x6d\xa3\x16\xca\x70\xd4\xb5\xc5\xf0\xce\x72\x58\xf5\x0f\x8e\xda\x09\x1d\x21\x20\xb9\xa7\x92\x47\x26\xa5\x04\x75\x0a\xc3\x60\xd6\x18\x8f\x88\xfe\x49\x6d\xb3\xcc\xeb\x75\x42\x5f\x4f\xf8\x2b\xc9\x62\xe1\x37\xe3\xa5\x61\x97\xda\x10\x96\x19\xf0\xd8\xf7\x19\x7e\xe0\xed\xc7\xd0\xa9\xad\x2f\x4f\x7b\x84\x10\x05\x9b\xb1\x20\xa6\x0e\x1a\x4c\xf5\x04\xda\xe0\xd8\x90\xa2\xe9\x82\xa6\x06\x7d\xe8\x48\x84\x65\x2c\x1b\xf2\xca\xe4\x31\x40\xb3\xc4\xb0\x7b\x01\x1f\x24\xaa\xc4\x6c\x80\xa5\x40\x36\xc8\x51\x5c\x60\x59\xe9\x73\x52\xbf\x3c\x16\x15\xdb\x58\x2e\xab\x13\x4e\x71\x77\x7c\xf9\x36\x48\xea\x55\x8b\x3a\x6e\x8f\x14\xc5\x54\x6b\x5e\xd1\x63\x29\x43\x9a\xdf\xad\x61\xd0\x33\x43\xa7\x8a\x57\x2c\x18\xc3\x8d\x21\x7b\x98\xad\x5d\x00\x2c\x97\x5b\xb5\x3c\x2e\x67\x62\x43\x73\xd0\xd7\x48\xea\xe0\x03\x48\x98\x1f\x2c\x74\x6e\x38\xde\x02\x3a\x41\x67\xce\xe0\x6d\x86\x48\x65\xa5\x33\x60\xb3\x35\xb2\xfd\x57\xcc\xe2\x58\x97\xb3\x54\x6c\x2d\xaa\x40\x47\x0a\x27\xd5\xa2\x3a\x6c\x96\x82\x45\x93\xbd\x5f\xd4\x18\x84\xfb\x9d\xea\x1d\x06\x63\xbf\x7e\x93\xfa\xd8\xb2\x9a\xed\x7d\x42\xdf\xe8\xde\x66\x31\xf4\xc1\x1b\x48\xef\x0d\xbf\x97\xb3\xaa\xcf\xed\xc8\x2d\x4e\x09\x3b\x5d\x91\x0e\x86\xab\x43\x2c\x14\x4e\x06\x8f\x68\xfe\x1f\xfd\x5e\x8b\xa6\x5b\xf1\x92\x84\xa2\x5a\x90\x20\xe8\xd8\x53\x60\x19\x2e\x6f\xb9\xd5\xb7\x10\x36\x88\x93\x63\xd2\x8a\x3c\xcb\x10\xe6\x83\x20\x74\xdf\x9d\x61\xe6\x32\xf2\x5e\xcb\xd0\x1f\xa4\x1b\xa0\x99\x07\xe5\x0f\xd5\xc6\x79\x53\xe9\xa0\x4f\x8f\x5e\xfe\x69\x71\x93\x09\x38\x89\x76\x73\x1c\x9e\x67\x8d\xba\x64\xb5\xfa\xdb\xeb\xcd\xf9\x06\x06\x30\x7f\x16\xec\x50\xd3\x24\x96\x5e\x80\xa7\x23\xa0\x4d\x72\xe5\xcc\xf5\xa8\x51\xb4\xf5\x82\x8a\x65\x6b\xa5\x47\x0e\xba\x07\x94\x27\x07\x5a\x27\xb9\x26\xd3\xb0\x11\xb6\x55\xd5\xc4\x4c\x59\xaa\x95\x55\xfb\xab\x5c\x4b\xac\x7f\x85\x10\x40\xb5\xa9\xd7\x7e\x7d\x7a\x74\x93\x98\xf2\xd1\xd6\x2c\x57\xba\x13\xd0\x1d\xd9\x5c\x98\x9c\x76\xe0\x51\x0f\x79\x56\x38\x0e\x25\x0c\xe6\xe3\xd9\x93\xe0\x3b\x18\x33\x85\x91\x9b\xbe\x7d\x65\x3f\xdb\xf1\xdc\x1c\xa8\xf4\x29\xeb\x37\x64\x4c\xa9\x65\xc7\x58\x25\x95\xf7\x16\xc1\x84\x76\xcc\x98\x23\x7c\xfe\xb2\x79\x44\x53\x08\xcc\x02\xfd\x03\x42\x03\x59\x14\x89\x36\x50\x87\xd3\x6b\x7e\x1e\x3d\x4d\xa1\x87\xb8\x43\x83\x61\x0a\x9a\xf1\x3d\x57\x78\x33\xb0\x63\x36\x57\xc0\x5b\x35\xcd\xf7\xfe\x7a\x67\x04\x29\x1c\x04\x30\x2d\xfb\x62\xfd\x5d\xa7\xfa\x1c\x1c\x77\x5e\x09\xb9\x30\x99\xa2\x05\x98\x24\x88\x3d\x49\xf7\x0e\x82\xd3\x1c\xda\x82\xe8\x04\x4b\xa8\x3d\x80\x7d\x18\x10\xcf\x03\xf5\x8b\x25\x8f\x21\x8c\xf3\x0b\x27\xe8\x84\xfb\xf9\x1d\xd9\x66\xc2\x72\x0a\xde\x6e\x0c\x21\x75\xbb\xfe\x98\x4c\xd7\xf9\x6e\xa4\xba\xa4\x4c\xcd\xca\x8c\xd5\x07\x96\x9c\x96\xc6\x2e\xa3\x40\x4a\x87\x32\x52\xd8\xaa\x1b\xdb\x5c\x21\xd8\xa6\x56\x2c\xc8\xbe\x56\xdc\x5d\x09\x1d\x06\x25\x74\x60\x53\x62\x9b\x7a\xe6\x14\x3e\x9a\xa0\xd0\x1c\xed\xbf\x3b\x1f\x45\x87\xa1\xc5\xe8\x2f\x00\x79\x60\xd6\xab\xd7\x47\x92\x19\x8d\xd0\x82\xe5\x8c\xb3\x35\x1f\x4e\xd4\x5c\x69\x21\x93\x42\x29\x4b\x8d\x02\x65\x88\xa0\x81\xdd\x50\xe2\x6d\x94\x61\xd2\xaa\x3f\x92\xfb\xfa\xc0\x9a\x63\xb3\xcc\xdb\x38\x77\xa0\xe7\x44\x48\x66\xb8\x99\x0b\xfb\x0c\xad\x0c\x8c\x0d\xe6\xd5\x76\x73\xd2\xe0\x6e\x11\x84\x35\xde\x14\x61\x08\x95\xa3\x08\x1b\x18\x3c\x68\xe4\x6b\x23\x82\xc5\x84\x63\x36\x17\x50\x9e\xb4\xd0\x38\x61\x58\x44\xf3\xf3\x94\x40\x79\xf2\x16\x9c\x6f\x39\x2c\xbf\x8d\x9d\x07\x08\x18\x94\xbe\x9c\x1c\xf4\xf2\xcd\xe7\x07\xe5\x4c\x16\x94\xc8\x7a\x6a\xda\xe0\xe7\x13\x8c\x94\x3f\x16\x83\x90\x04\x3a\x6f\x9e\x5d\xd7\xb4\x34\x6b\xfa\x0b\xe8\x4a\x90\x61\xb9\x92\x5f\x66\x9f\xc0\x66\x93\x88\xd1\xf0\x0b\x61\x46\xf8\x0d\x89\x4a\x00\x50\x30\x0b\x77\x4f\xba\x81\xbf\x1b\xdd\x14\x04\x30\xdc\x14\xd8\xf4\xbc\x8b\x30\xb3\x71\x10\x59\x1f\xc0\xe4\x3a\xa4\x68\x64\xba\xa9\x23\x0c\x3c\x15\x5b\x4d\x67\xe3\x0c\xe0\x26\x8b\x37\x97\xae\xd7\x74\x91\x3d\x37\xa8\xeb\x40\x1d\x92\xb1\xea\xc7\xf4\x2e\xe8\x1d\x58\xda\xaf\x8c\xe6\x2e\x59\xa1\xec\x39\x9d\x9c\x5a\xab\xdb\x26\x98\x4e\x78\x4f\x9b\x67\x2a\x7d\xe9\x7a\x75\x6e\xa2\xc9\x4b\xcc\x96\xdb\x45\xdd\x6c\x2e\xf0\x7a\x0e\xf5\x03\x61\x32\xd7\xd2\x97\xa1\x30\x95\x47\x1e\x0d\x59\xbc\x81\xb0\x45\xa8\xfe\xc3\x48\xbd\xfe\x6d\xad\x60\x96\xc1\xe4\x66\x76\x79\x8a\xb0\xca\x2a\x63\x5d\x1f\xea\xde\xf0\x98\x8f\x10\xde\x28\x7c\xfe\xc3\xc1\xea\x94\xd8\x19\x42\x3d\x7c\x14\x5b\xfe\x55\xe1\xe1\x1b\xf0\x08\xaf\x8f\x32\xb9\xa3\xda\xcd\x7f\xbc\xfc\xc8\xef\x80\xf7\xe4\x4b\x95\xca\xea\x97\xb8\xb8\x79\x74\x50\xc6\xb1\x1f\x9f\xa7\x6c\xe1\xd5\x67\xc4\x7b\x01\x60\x18\xfd\x3d\x55\xa5\x78\x54\x31\x11\xa9\xc9\xf6\xad\xf8\x9a\xfd\xc0\x36\x08\xc6\xb0\x7a\xa6\xe6\x1f\xb9\x7e\x98\xd9\x79\x6f\x2e\x56\xbe\xa5\x1c\xee\x83\x00\x6d\x9e\xbf\x0e\x55\x52\x5d\xf2\xfc\x4d\x7b\x97\xff\x24\x0d\x45\xd5\xa4\x3c\x5d\xac\x94\x2a\xea\xca\xd2\x56\x11\x57\x24\x5b\xd6\x84\x9e\xce\x0d\x61\xaa\x03\xfb\xed\x0a\x1c\x28\x0a\x34\xef\xe2\x2e\xf5\x38\x4f\x83\x36\x8a\x3b\x4c\xe8\xd6\x3e\x70\x0a\x1f\x50\x06\xe4\x5c\xd3\xd8\xa1\xf8\xb9\x0f\xdd\x2a\x57\xb4\xb8\xf6\xd5\x75\x52\x1f\x94\x0d\x1b\x99\x45\xd7\x08\x68\xac\xfb\xca\x72\x8d\x6d\xc1\x7e\x2a\x64\x44\xbf\xfa\x37\xa6\x49\xe5\x47\xb9\xb9\x18\xbd\x21\x6d\xfe\x7e\x7c\x13\x4a\x61\x78\xea\xc0\xb9\xeb\x93\x90\x0b\xca\xef\x2d\x0a\xc2\x8e\x63\x58\x19\x64\x92\x3b\x0f\x9f\xf8\x88\x62\x7a\x1e\x39\x7e\x90\x13\x4c\x45\xf4\x87\xe2\x95\x65\xfb\xb9\xb0\xf8\xf7\xe7\x7f\x16\xec\x9f\xff\xf8\xf3\xe5\xf6\xff\x05\x00\x00\xff\xff\x44\xab\x56\xb9\x4c\x2a\x00\x00")
 
 func clusterroleYamlBytes() ([]byte, error) {
 	return bindataRead(
diff --git a/pkg/operator/controllers/rbac/staticresources/clusterrole.yaml b/pkg/operator/controllers/rbac/staticresources/clusterrole.yaml
index cc333102638..8bf1f434fad 100644
--- a/pkg/operator/controllers/rbac/staticresources/clusterrole.yaml
+++ b/pkg/operator/controllers/rbac/staticresources/clusterrole.yaml
@@ -222,7 +222,9 @@ rules:
   - dnses
   - featuregates
   - imagecontentpolicies
+  - imagedigestmirrorsets
   - images
+  - imagetagmirrorsets
   - infrastructures
   - ingresses
   - networks
@@ -245,6 +247,7 @@ rules:
   - consolenotifications
   - consoleplugins
   - consolequickstarts
+  - consolesamples
   - consoleyamlsamples
   verbs:
   - get
@@ -332,6 +335,15 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - infrastructure.cluster.x-k8s.io
+  resources:
+  - metal3remediations
+  - metal3remediationtemplates
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - ingress.operator.openshift.io
   resources:
@@ -340,6 +352,15 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - ipam.cluster.x-k8s.io
+  resources:
+  - ipaddressclaims
+  - ipaddresses
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - k8s.cni.cncf.io
   resources:
@@ -351,9 +372,11 @@ rules:
 - apiGroups:
   - k8s.ovn.org
   resources:
+  - adminpolicybasedexternalroutes
   - egressfirewalls
   - egressips
   - egressqoses
+  - egressservices
   verbs:
   - get
   - list
@@ -361,10 +384,10 @@ rules:
 - apiGroups:
   - machine.openshift.io
   resources:
+  - controlplanemachinesets
   - machinehealthchecks
   - machines
   - machinesets
-  - controlplanemachinesets
   verbs:
   - get
   - list
@@ -375,12 +398,29 @@ rules:
   - containerruntimeconfigs
   - controllerconfigs
   - kubeletconfigs
+  - machineconfignodes
   - machineconfigpools
   - machineconfigs
   verbs:
   - get
   - list
   - watch
+- apiGroups:
+  - metal3.io
+  resources:
+  - baremetalhosts
+  - bmceventsubscriptions
+  - dataimages
+  - firmwareschemas
+  - hardwaredata
+  - hostfirmwarecomponents
+  - hostfirmwaresettings
+  - preprovisioningimages
+  - provisionings
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - metrics.k8s.io
   resources:
@@ -413,6 +453,15 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - monitoring.openshift.io
+  resources:
+  - alertingrules
+  - alertrelabelconfigs
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - network.operator.openshift.io
   resources:
@@ -453,10 +502,12 @@ rules:
   - etcds
   - imagecontentsourcepolicies
   - ingresscontrollers
+  - insightsoperators
   - kubeapiservers
   - kubecontrollermanagers
   - kubeschedulers
   - kubestorageversionmigrators
+  - machineconfigurations
   - networks
   - openshiftapiservers
   - openshiftcontrollermanagers
@@ -500,7 +551,15 @@ rules:
   - policy
   resources:
   - poddisruptionbudgets
-  - podsecuritypolicies
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - policy.networking.k8s.io
+  resources:
+  - adminnetworkpolicies
+  - baselineadminnetworkpolicies
   verbs:
   - get
   - list
diff --git a/pkg/util/dynamichelper/discovery/cache/admissionregistration.k8s.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/admissionregistration.k8s.io/v1/serverresources.json
index 89fdc16fdc6..a406d2baf3f 100644
--- a/pkg/util/dynamichelper/discovery/cache/admissionregistration.k8s.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/admissionregistration.k8s.io/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "mutatingwebhookconfigurations",
-            "singularName": "",
+            "singularName": "mutatingwebhookconfiguration",
             "namespaced": false,
             "kind": "MutatingWebhookConfiguration",
             "verbs": [
@@ -25,7 +25,7 @@
         },
         {
             "name": "validatingwebhookconfigurations",
-            "singularName": "",
+            "singularName": "validatingwebhookconfiguration",
             "namespaced": false,
             "kind": "ValidatingWebhookConfiguration",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/apiextensions.k8s.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/apiextensions.k8s.io/v1/serverresources.json
index 4a12d80e663..9e14c35575c 100644
--- a/pkg/util/dynamichelper/discovery/cache/apiextensions.k8s.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/apiextensions.k8s.io/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "customresourcedefinitions",
-            "singularName": "",
+            "singularName": "customresourcedefinition",
             "namespaced": false,
             "kind": "CustomResourceDefinition",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/apiregistration.k8s.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/apiregistration.k8s.io/v1/serverresources.json
index 1e4d2107b7a..bbc63b51393 100644
--- a/pkg/util/dynamichelper/discovery/cache/apiregistration.k8s.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/apiregistration.k8s.io/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "apiservices",
-            "singularName": "",
+            "singularName": "apiservice",
             "namespaced": false,
             "kind": "APIService",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/apps.openshift.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/apps.openshift.io/v1/serverresources.json
index 68e97c0e972..79ac9b93424 100644
--- a/pkg/util/dynamichelper/discovery/cache/apps.openshift.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/apps.openshift.io/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "deploymentconfigs",
-            "singularName": "",
+            "singularName": "deploymentconfig",
             "namespaced": true,
             "kind": "DeploymentConfig",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/apps/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/apps/v1/serverresources.json
index 0579bda4f46..10078ffff6b 100644
--- a/pkg/util/dynamichelper/discovery/cache/apps/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/apps/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "controllerrevisions",
-            "singularName": "",
+            "singularName": "controllerrevision",
             "namespaced": true,
             "kind": "ControllerRevision",
             "verbs": [
@@ -22,7 +22,7 @@
         },
         {
             "name": "daemonsets",
-            "singularName": "",
+            "singularName": "daemonset",
             "namespaced": true,
             "kind": "DaemonSet",
             "verbs": [
@@ -56,7 +56,7 @@
         },
         {
             "name": "deployments",
-            "singularName": "",
+            "singularName": "deployment",
             "namespaced": true,
             "kind": "Deployment",
             "verbs": [
@@ -103,7 +103,7 @@
         },
         {
             "name": "replicasets",
-            "singularName": "",
+            "singularName": "replicaset",
             "namespaced": true,
             "kind": "ReplicaSet",
             "verbs": [
@@ -150,7 +150,7 @@
         },
         {
             "name": "statefulsets",
-            "singularName": "",
+            "singularName": "statefulset",
             "namespaced": true,
             "kind": "StatefulSet",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/assets_version b/pkg/util/dynamichelper/discovery/cache/assets_version
index 67675b27e6e..013e8adab15 100644
--- a/pkg/util/dynamichelper/discovery/cache/assets_version
+++ b/pkg/util/dynamichelper/discovery/cache/assets_version
@@ -1 +1 @@
-4.11.44
+4.16.14
diff --git a/pkg/util/dynamichelper/discovery/cache/authentication.k8s.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/authentication.k8s.io/v1/serverresources.json
index 22f985d77db..bca6165bff8 100644
--- a/pkg/util/dynamichelper/discovery/cache/authentication.k8s.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/authentication.k8s.io/v1/serverresources.json
@@ -3,9 +3,18 @@
     "apiVersion": "v1",
     "groupVersion": "authentication.k8s.io/v1",
     "resources": [
+        {
+            "name": "selfsubjectreviews",
+            "singularName": "selfsubjectreview",
+            "namespaced": false,
+            "kind": "SelfSubjectReview",
+            "verbs": [
+                "create"
+            ]
+        },
         {
             "name": "tokenreviews",
-            "singularName": "",
+            "singularName": "tokenreview",
             "namespaced": false,
             "kind": "TokenReview",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/authorization.k8s.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/authorization.k8s.io/v1/serverresources.json
index 6935c5f7dca..71fc667cfec 100644
--- a/pkg/util/dynamichelper/discovery/cache/authorization.k8s.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/authorization.k8s.io/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "localsubjectaccessreviews",
-            "singularName": "",
+            "singularName": "localsubjectaccessreview",
             "namespaced": true,
             "kind": "LocalSubjectAccessReview",
             "verbs": [
@@ -14,7 +14,7 @@
         },
         {
             "name": "selfsubjectaccessreviews",
-            "singularName": "",
+            "singularName": "selfsubjectaccessreview",
             "namespaced": false,
             "kind": "SelfSubjectAccessReview",
             "verbs": [
@@ -23,7 +23,7 @@
         },
         {
             "name": "selfsubjectrulesreviews",
-            "singularName": "",
+            "singularName": "selfsubjectrulesreview",
             "namespaced": false,
             "kind": "SelfSubjectRulesReview",
             "verbs": [
@@ -32,7 +32,7 @@
         },
         {
             "name": "subjectaccessreviews",
-            "singularName": "",
+            "singularName": "subjectaccessreview",
             "namespaced": false,
             "kind": "SubjectAccessReview",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/authorization.openshift.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/authorization.openshift.io/v1/serverresources.json
index 725f0b4cbf3..e9f00d11025 100644
--- a/pkg/util/dynamichelper/discovery/cache/authorization.openshift.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/authorization.openshift.io/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "clusterrolebindings",
-            "singularName": "",
+            "singularName": "clusterrolebinding",
             "namespaced": false,
             "kind": "ClusterRoleBinding",
             "verbs": [
@@ -19,7 +19,7 @@
         },
         {
             "name": "clusterroles",
-            "singularName": "",
+            "singularName": "clusterrole",
             "namespaced": false,
             "kind": "ClusterRole",
             "verbs": [
@@ -33,7 +33,7 @@
         },
         {
             "name": "localresourceaccessreviews",
-            "singularName": "",
+            "singularName": "localresourceaccessreview",
             "namespaced": true,
             "kind": "LocalResourceAccessReview",
             "verbs": [
@@ -42,7 +42,7 @@
         },
         {
             "name": "localsubjectaccessreviews",
-            "singularName": "",
+            "singularName": "localsubjectaccessreview",
             "namespaced": true,
             "kind": "LocalSubjectAccessReview",
             "verbs": [
@@ -51,7 +51,7 @@
         },
         {
             "name": "resourceaccessreviews",
-            "singularName": "",
+            "singularName": "localresourceaccessreview",
             "namespaced": false,
             "kind": "ResourceAccessReview",
             "verbs": [
@@ -60,7 +60,7 @@
         },
         {
             "name": "rolebindingrestrictions",
-            "singularName": "",
+            "singularName": "rolebindingrestriction",
             "namespaced": true,
             "kind": "RoleBindingRestriction",
             "verbs": [
@@ -76,7 +76,7 @@
         },
         {
             "name": "rolebindings",
-            "singularName": "",
+            "singularName": "rolebinding",
             "namespaced": true,
             "kind": "RoleBinding",
             "verbs": [
@@ -90,7 +90,7 @@
         },
         {
             "name": "roles",
-            "singularName": "",
+            "singularName": "role",
             "namespaced": true,
             "kind": "Role",
             "verbs": [
@@ -104,7 +104,7 @@
         },
         {
             "name": "selfsubjectrulesreviews",
-            "singularName": "",
+            "singularName": "selfsubjectrulesreview",
             "namespaced": true,
             "kind": "SelfSubjectRulesReview",
             "verbs": [
@@ -113,7 +113,7 @@
         },
         {
             "name": "subjectaccessreviews",
-            "singularName": "",
+            "singularName": "subjectaccessreview",
             "namespaced": false,
             "kind": "SubjectAccessReview",
             "verbs": [
@@ -122,7 +122,7 @@
         },
         {
             "name": "subjectrulesreviews",
-            "singularName": "",
+            "singularName": "subjectrulesreview",
             "namespaced": true,
             "kind": "SubjectRulesReview",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/autoscaling/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/autoscaling/v1/serverresources.json
index 4839a0b6e7c..539ef27d166 100644
--- a/pkg/util/dynamichelper/discovery/cache/autoscaling/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/autoscaling/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "horizontalpodautoscalers",
-            "singularName": "",
+            "singularName": "horizontalpodautoscaler",
             "namespaced": true,
             "kind": "HorizontalPodAutoscaler",
             "verbs": [
@@ -24,7 +24,7 @@
             "categories": [
                 "all"
             ],
-            "storageVersionHash": "oQlkt7f5j/A="
+            "storageVersionHash": "qwQve8ut294="
         },
         {
             "name": "horizontalpodautoscalers/status",
diff --git a/pkg/util/dynamichelper/discovery/cache/autoscaling/v2/serverresources.json b/pkg/util/dynamichelper/discovery/cache/autoscaling/v2/serverresources.json
index 0e72ba9d635..7b9c0309aa7 100644
--- a/pkg/util/dynamichelper/discovery/cache/autoscaling/v2/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/autoscaling/v2/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "horizontalpodautoscalers",
-            "singularName": "",
+            "singularName": "horizontalpodautoscaler",
             "namespaced": true,
             "kind": "HorizontalPodAutoscaler",
             "verbs": [
@@ -24,7 +24,7 @@
             "categories": [
                 "all"
             ],
-            "storageVersionHash": "oQlkt7f5j/A="
+            "storageVersionHash": "qwQve8ut294="
         },
         {
             "name": "horizontalpodautoscalers/status",
diff --git a/pkg/util/dynamichelper/discovery/cache/autoscaling/v2beta1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/autoscaling/v2beta1/serverresources.json
deleted file mode 100644
index d13955ac28c..00000000000
--- a/pkg/util/dynamichelper/discovery/cache/autoscaling/v2beta1/serverresources.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "kind": "APIResourceList",
-    "apiVersion": "v1",
-    "groupVersion": "autoscaling/v2beta1",
-    "resources": [
-        {
-            "name": "horizontalpodautoscalers",
-            "singularName": "",
-            "namespaced": true,
-            "kind": "HorizontalPodAutoscaler",
-            "verbs": [
-                "create",
-                "delete",
-                "deletecollection",
-                "get",
-                "list",
-                "patch",
-                "update",
-                "watch"
-            ],
-            "shortNames": [
-                "hpa"
-            ],
-            "categories": [
-                "all"
-            ],
-            "storageVersionHash": "oQlkt7f5j/A="
-        },
-        {
-            "name": "horizontalpodautoscalers/status",
-            "singularName": "",
-            "namespaced": true,
-            "kind": "HorizontalPodAutoscaler",
-            "verbs": [
-                "get",
-                "patch",
-                "update"
-            ]
-        }
-    ]
-}
diff --git a/pkg/util/dynamichelper/discovery/cache/autoscaling/v2beta2/serverresources.json b/pkg/util/dynamichelper/discovery/cache/autoscaling/v2beta2/serverresources.json
deleted file mode 100644
index d3610d5d5af..00000000000
--- a/pkg/util/dynamichelper/discovery/cache/autoscaling/v2beta2/serverresources.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "kind": "APIResourceList",
-    "apiVersion": "v1",
-    "groupVersion": "autoscaling/v2beta2",
-    "resources": [
-        {
-            "name": "horizontalpodautoscalers",
-            "singularName": "",
-            "namespaced": true,
-            "kind": "HorizontalPodAutoscaler",
-            "verbs": [
-                "create",
-                "delete",
-                "deletecollection",
-                "get",
-                "list",
-                "patch",
-                "update",
-                "watch"
-            ],
-            "shortNames": [
-                "hpa"
-            ],
-            "categories": [
-                "all"
-            ],
-            "storageVersionHash": "oQlkt7f5j/A="
-        },
-        {
-            "name": "horizontalpodautoscalers/status",
-            "singularName": "",
-            "namespaced": true,
-            "kind": "HorizontalPodAutoscaler",
-            "verbs": [
-                "get",
-                "patch",
-                "update"
-            ]
-        }
-    ]
-}
diff --git a/pkg/util/dynamichelper/discovery/cache/batch/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/batch/v1/serverresources.json
index 22e459a18e9..943b5fbeffc 100644
--- a/pkg/util/dynamichelper/discovery/cache/batch/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/batch/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "cronjobs",
-            "singularName": "",
+            "singularName": "cronjob",
             "namespaced": true,
             "kind": "CronJob",
             "verbs": [
@@ -39,7 +39,7 @@
         },
         {
             "name": "jobs",
-            "singularName": "",
+            "singularName": "job",
             "namespaced": true,
             "kind": "Job",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/build.openshift.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/build.openshift.io/v1/serverresources.json
index 1349030afc9..4e12c1026a8 100644
--- a/pkg/util/dynamichelper/discovery/cache/build.openshift.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/build.openshift.io/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "buildconfigs",
-            "singularName": "",
+            "singularName": "buildconfig",
             "namespaced": true,
             "kind": "BuildConfig",
             "verbs": [
@@ -55,7 +55,7 @@
         },
         {
             "name": "builds",
-            "singularName": "",
+            "singularName": "build",
             "namespaced": true,
             "kind": "Build",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/certificates.k8s.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/certificates.k8s.io/v1/serverresources.json
index 0602f68f220..a05d5217dfc 100644
--- a/pkg/util/dynamichelper/discovery/cache/certificates.k8s.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/certificates.k8s.io/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "certificatesigningrequests",
-            "singularName": "",
+            "singularName": "certificatesigningrequest",
             "namespaced": false,
             "kind": "CertificateSigningRequest",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/config.openshift.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/config.openshift.io/v1/serverresources.json
index 2517d1fd4d8..8693f7dfd7e 100644
--- a/pkg/util/dynamichelper/discovery/cache/config.openshift.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/config.openshift.io/v1/serverresources.json
@@ -258,6 +258,37 @@
                 "update"
             ]
         },
+        {
+            "name": "imagedigestmirrorsets",
+            "singularName": "imagedigestmirrorset",
+            "namespaced": false,
+            "kind": "ImageDigestMirrorSet",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "shortNames": [
+                "idms"
+            ],
+            "storageVersionHash": "zi/B9bSSdlo="
+        },
+        {
+            "name": "imagedigestmirrorsets/status",
+            "singularName": "",
+            "namespaced": false,
+            "kind": "ImageDigestMirrorSet",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        },
         {
             "name": "images",
             "singularName": "image",
@@ -286,6 +317,37 @@
                 "update"
             ]
         },
+        {
+            "name": "imagetagmirrorsets",
+            "singularName": "imagetagmirrorset",
+            "namespaced": false,
+            "kind": "ImageTagMirrorSet",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "shortNames": [
+                "itms"
+            ],
+            "storageVersionHash": "4StnNv6vobU="
+        },
+        {
+            "name": "imagetagmirrorsets/status",
+            "singularName": "",
+            "namespaced": false,
+            "kind": "ImageTagMirrorSet",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        },
         {
             "name": "infrastructures",
             "singularName": "infrastructure",
diff --git a/pkg/util/dynamichelper/discovery/cache/console.openshift.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/console.openshift.io/v1/serverresources.json
index b4069f29f5c..cbcd4bb2a32 100644
--- a/pkg/util/dynamichelper/discovery/cache/console.openshift.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/console.openshift.io/v1/serverresources.json
@@ -115,6 +115,23 @@
                 "update"
             ]
         },
+        {
+            "name": "consoleplugins",
+            "singularName": "consoleplugin",
+            "namespaced": false,
+            "kind": "ConsolePlugin",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "storageVersionHash": "WBtt+/5eUyQ="
+        },
         {
             "name": "consolequickstarts",
             "singularName": "consolequickstart",
@@ -132,6 +149,23 @@
             ],
             "storageVersionHash": "jjkxMYsy4hY="
         },
+        {
+            "name": "consolesamples",
+            "singularName": "consolesample",
+            "namespaced": false,
+            "kind": "ConsoleSample",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "storageVersionHash": "CXjz4f830fg="
+        },
         {
             "name": "consoleyamlsamples",
             "singularName": "consoleyamlsample",
diff --git a/pkg/util/dynamichelper/discovery/cache/console.openshift.io/v1alpha1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/console.openshift.io/v1alpha1/serverresources.json
index 836c98d97c9..5ad40307777 100644
--- a/pkg/util/dynamichelper/discovery/cache/console.openshift.io/v1alpha1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/console.openshift.io/v1alpha1/serverresources.json
@@ -18,7 +18,7 @@
                 "update",
                 "watch"
             ],
-            "storageVersionHash": "ACCeQvz0mH0="
+            "storageVersionHash": "WBtt+/5eUyQ="
         }
     ]
 }
diff --git a/pkg/util/dynamichelper/discovery/cache/coordination.k8s.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/coordination.k8s.io/v1/serverresources.json
index a058fe9275f..96df98c5304 100644
--- a/pkg/util/dynamichelper/discovery/cache/coordination.k8s.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/coordination.k8s.io/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "leases",
-            "singularName": "",
+            "singularName": "lease",
             "namespaced": true,
             "kind": "Lease",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/discovery.k8s.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/discovery.k8s.io/v1/serverresources.json
index 00815af942e..ed1fbda5f7f 100644
--- a/pkg/util/dynamichelper/discovery/cache/discovery.k8s.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/discovery.k8s.io/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "endpointslices",
-            "singularName": "",
+            "singularName": "endpointslice",
             "namespaced": true,
             "kind": "EndpointSlice",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/discovery.k8s.io/v1beta1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/discovery.k8s.io/v1beta1/serverresources.json
deleted file mode 100644
index f4bf270f86e..00000000000
--- a/pkg/util/dynamichelper/discovery/cache/discovery.k8s.io/v1beta1/serverresources.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "kind": "APIResourceList",
-    "apiVersion": "v1",
-    "groupVersion": "discovery.k8s.io/v1beta1",
-    "resources": [
-        {
-            "name": "endpointslices",
-            "singularName": "",
-            "namespaced": true,
-            "kind": "EndpointSlice",
-            "verbs": [
-                "create",
-                "delete",
-                "deletecollection",
-                "get",
-                "list",
-                "patch",
-                "update",
-                "watch"
-            ],
-            "storageVersionHash": "Nx3SIv6I0mE="
-        }
-    ]
-}
diff --git a/pkg/util/dynamichelper/discovery/cache/events.k8s.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/events.k8s.io/v1/serverresources.json
index fa8712aa2a2..5d623d9c5ce 100644
--- a/pkg/util/dynamichelper/discovery/cache/events.k8s.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/events.k8s.io/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "events",
-            "singularName": "",
+            "singularName": "event",
             "namespaced": true,
             "kind": "Event",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/events.k8s.io/v1beta1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/events.k8s.io/v1beta1/serverresources.json
deleted file mode 100644
index 4eb767973cf..00000000000
--- a/pkg/util/dynamichelper/discovery/cache/events.k8s.io/v1beta1/serverresources.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "kind": "APIResourceList",
-    "apiVersion": "v1",
-    "groupVersion": "events.k8s.io/v1beta1",
-    "resources": [
-        {
-            "name": "events",
-            "singularName": "",
-            "namespaced": true,
-            "kind": "Event",
-            "verbs": [
-                "create",
-                "delete",
-                "deletecollection",
-                "get",
-                "list",
-                "patch",
-                "update",
-                "watch"
-            ],
-            "shortNames": [
-                "ev"
-            ],
-            "storageVersionHash": "r2yiGXH7wu8="
-        }
-    ]
-}
diff --git a/pkg/util/dynamichelper/discovery/cache/flowcontrol.apiserver.k8s.io/v1beta2/serverresources.json b/pkg/util/dynamichelper/discovery/cache/flowcontrol.apiserver.k8s.io/v1/serverresources.json
similarity index 84%
rename from pkg/util/dynamichelper/discovery/cache/flowcontrol.apiserver.k8s.io/v1beta2/serverresources.json
rename to pkg/util/dynamichelper/discovery/cache/flowcontrol.apiserver.k8s.io/v1/serverresources.json
index 91b5e0d57b9..c60be987a84 100644
--- a/pkg/util/dynamichelper/discovery/cache/flowcontrol.apiserver.k8s.io/v1beta2/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/flowcontrol.apiserver.k8s.io/v1/serverresources.json
@@ -1,11 +1,11 @@
 {
     "kind": "APIResourceList",
     "apiVersion": "v1",
-    "groupVersion": "flowcontrol.apiserver.k8s.io/v1beta2",
+    "groupVersion": "flowcontrol.apiserver.k8s.io/v1",
     "resources": [
         {
             "name": "flowschemas",
-            "singularName": "",
+            "singularName": "flowschema",
             "namespaced": false,
             "kind": "FlowSchema",
             "verbs": [
@@ -18,7 +18,7 @@
                 "update",
                 "watch"
             ],
-            "storageVersionHash": "9bSnTLYweJ0="
+            "storageVersionHash": "9NnFrw7ZEmA="
         },
         {
             "name": "flowschemas/status",
@@ -33,7 +33,7 @@
         },
         {
             "name": "prioritylevelconfigurations",
-            "singularName": "",
+            "singularName": "prioritylevelconfiguration",
             "namespaced": false,
             "kind": "PriorityLevelConfiguration",
             "verbs": [
@@ -46,7 +46,7 @@
                 "update",
                 "watch"
             ],
-            "storageVersionHash": "BFVwf8eYnsw="
+            "storageVersionHash": "+CwSrEWTDhc="
         },
         {
             "name": "prioritylevelconfigurations/status",
diff --git a/pkg/util/dynamichelper/discovery/cache/flowcontrol.apiserver.k8s.io/v1beta1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/flowcontrol.apiserver.k8s.io/v1beta3/serverresources.json
similarity index 84%
rename from pkg/util/dynamichelper/discovery/cache/flowcontrol.apiserver.k8s.io/v1beta1/serverresources.json
rename to pkg/util/dynamichelper/discovery/cache/flowcontrol.apiserver.k8s.io/v1beta3/serverresources.json
index f9e89509cd2..fef8b500cbf 100644
--- a/pkg/util/dynamichelper/discovery/cache/flowcontrol.apiserver.k8s.io/v1beta1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/flowcontrol.apiserver.k8s.io/v1beta3/serverresources.json
@@ -1,11 +1,11 @@
 {
     "kind": "APIResourceList",
     "apiVersion": "v1",
-    "groupVersion": "flowcontrol.apiserver.k8s.io/v1beta1",
+    "groupVersion": "flowcontrol.apiserver.k8s.io/v1beta3",
     "resources": [
         {
             "name": "flowschemas",
-            "singularName": "",
+            "singularName": "flowschema",
             "namespaced": false,
             "kind": "FlowSchema",
             "verbs": [
@@ -18,7 +18,7 @@
                 "update",
                 "watch"
             ],
-            "storageVersionHash": "9bSnTLYweJ0="
+            "storageVersionHash": "9NnFrw7ZEmA="
         },
         {
             "name": "flowschemas/status",
@@ -33,7 +33,7 @@
         },
         {
             "name": "prioritylevelconfigurations",
-            "singularName": "",
+            "singularName": "prioritylevelconfiguration",
             "namespaced": false,
             "kind": "PriorityLevelConfiguration",
             "verbs": [
@@ -46,7 +46,7 @@
                 "update",
                 "watch"
             ],
-            "storageVersionHash": "BFVwf8eYnsw="
+            "storageVersionHash": "+CwSrEWTDhc="
         },
         {
             "name": "prioritylevelconfigurations/status",
diff --git a/pkg/util/dynamichelper/discovery/cache/image.openshift.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/image.openshift.io/v1/serverresources.json
index e367092ac83..baaaf87545e 100644
--- a/pkg/util/dynamichelper/discovery/cache/image.openshift.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/image.openshift.io/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "images",
-            "singularName": "",
+            "singularName": "image",
             "namespaced": false,
             "kind": "Image",
             "verbs": [
@@ -22,7 +22,7 @@
         },
         {
             "name": "imagesignatures",
-            "singularName": "",
+            "singularName": "imagesignature",
             "namespaced": false,
             "kind": "ImageSignature",
             "verbs": [
@@ -32,7 +32,7 @@
         },
         {
             "name": "imagestreamimages",
-            "singularName": "",
+            "singularName": "imagestreamimage",
             "namespaced": true,
             "kind": "ImageStreamImage",
             "verbs": [
@@ -44,7 +44,7 @@
         },
         {
             "name": "imagestreamimports",
-            "singularName": "",
+            "singularName": "imagestreamimport",
             "namespaced": true,
             "kind": "ImageStreamImport",
             "verbs": [
@@ -53,7 +53,7 @@
         },
         {
             "name": "imagestreammappings",
-            "singularName": "",
+            "singularName": "imagestreammapping",
             "namespaced": true,
             "kind": "ImageStreamMapping",
             "verbs": [
@@ -62,7 +62,7 @@
         },
         {
             "name": "imagestreams",
-            "singularName": "",
+            "singularName": "imagestream",
             "namespaced": true,
             "kind": "ImageStream",
             "verbs": [
@@ -114,7 +114,7 @@
         },
         {
             "name": "imagestreamtags",
-            "singularName": "",
+            "singularName": "imagestreamtag",
             "namespaced": true,
             "kind": "ImageStreamTag",
             "verbs": [
@@ -131,7 +131,7 @@
         },
         {
             "name": "imagetags",
-            "singularName": "",
+            "singularName": "imagetag",
             "namespaced": true,
             "kind": "ImageTag",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/infrastructure.cluster.x-k8s.io/v1alpha5/serverresources.json b/pkg/util/dynamichelper/discovery/cache/infrastructure.cluster.x-k8s.io/v1alpha5/serverresources.json
new file mode 100644
index 00000000000..d11b4e92fdd
--- /dev/null
+++ b/pkg/util/dynamichelper/discovery/cache/infrastructure.cluster.x-k8s.io/v1alpha5/serverresources.json
@@ -0,0 +1,80 @@
+{
+    "kind": "APIResourceList",
+    "apiVersion": "v1",
+    "groupVersion": "infrastructure.cluster.x-k8s.io/v1alpha5",
+    "resources": [
+        {
+            "name": "metal3remediations",
+            "singularName": "metal3remediation",
+            "namespaced": true,
+            "kind": "Metal3Remediation",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "shortNames": [
+                "m3r",
+                "m3remediation"
+            ],
+            "categories": [
+                "cluster-api"
+            ],
+            "storageVersionHash": "SrAcbALkkZQ="
+        },
+        {
+            "name": "metal3remediations/status",
+            "singularName": "",
+            "namespaced": true,
+            "kind": "Metal3Remediation",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        },
+        {
+            "name": "metal3remediationtemplates",
+            "singularName": "metal3remediationtemplate",
+            "namespaced": true,
+            "kind": "Metal3RemediationTemplate",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "shortNames": [
+                "m3remediationtemplate",
+                "m3remediationtemplates",
+                "m3rt",
+                "metal3remediationtemplate",
+                "metal3rt"
+            ],
+            "categories": [
+                "cluster-api"
+            ],
+            "storageVersionHash": "aCU2tlZnrXs="
+        },
+        {
+            "name": "metal3remediationtemplates/status",
+            "singularName": "",
+            "namespaced": true,
+            "kind": "Metal3RemediationTemplate",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        }
+    ]
+}
diff --git a/pkg/util/dynamichelper/discovery/cache/infrastructure.cluster.x-k8s.io/v1beta1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/infrastructure.cluster.x-k8s.io/v1beta1/serverresources.json
new file mode 100644
index 00000000000..dcccd255f9f
--- /dev/null
+++ b/pkg/util/dynamichelper/discovery/cache/infrastructure.cluster.x-k8s.io/v1beta1/serverresources.json
@@ -0,0 +1,80 @@
+{
+    "kind": "APIResourceList",
+    "apiVersion": "v1",
+    "groupVersion": "infrastructure.cluster.x-k8s.io/v1beta1",
+    "resources": [
+        {
+            "name": "metal3remediations",
+            "singularName": "metal3remediation",
+            "namespaced": true,
+            "kind": "Metal3Remediation",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "shortNames": [
+                "m3r",
+                "m3remediation"
+            ],
+            "categories": [
+                "cluster-api"
+            ],
+            "storageVersionHash": "SrAcbALkkZQ="
+        },
+        {
+            "name": "metal3remediations/status",
+            "singularName": "",
+            "namespaced": true,
+            "kind": "Metal3Remediation",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        },
+        {
+            "name": "metal3remediationtemplates",
+            "singularName": "metal3remediationtemplate",
+            "namespaced": true,
+            "kind": "Metal3RemediationTemplate",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "shortNames": [
+                "m3remediationtemplate",
+                "m3remediationtemplates",
+                "m3rt",
+                "metal3remediationtemplate",
+                "metal3rt"
+            ],
+            "categories": [
+                "cluster-api"
+            ],
+            "storageVersionHash": "aCU2tlZnrXs="
+        },
+        {
+            "name": "metal3remediationtemplates/status",
+            "singularName": "",
+            "namespaced": true,
+            "kind": "Metal3RemediationTemplate",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        }
+    ]
+}
diff --git a/pkg/util/dynamichelper/discovery/cache/ipam.cluster.x-k8s.io/v1alpha1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/ipam.cluster.x-k8s.io/v1alpha1/serverresources.json
new file mode 100644
index 00000000000..8d449d2c591
--- /dev/null
+++ b/pkg/util/dynamichelper/discovery/cache/ipam.cluster.x-k8s.io/v1alpha1/serverresources.json
@@ -0,0 +1,58 @@
+{
+    "kind": "APIResourceList",
+    "apiVersion": "v1",
+    "groupVersion": "ipam.cluster.x-k8s.io/v1alpha1",
+    "resources": [
+        {
+            "name": "ipaddressclaims",
+            "singularName": "ipaddressclaim",
+            "namespaced": true,
+            "kind": "IPAddressClaim",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "categories": [
+                "cluster-api"
+            ],
+            "storageVersionHash": "N6WtanXTMEQ="
+        },
+        {
+            "name": "ipaddressclaims/status",
+            "singularName": "",
+            "namespaced": true,
+            "kind": "IPAddressClaim",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        },
+        {
+            "name": "ipaddresses",
+            "singularName": "ipaddress",
+            "namespaced": true,
+            "kind": "IPAddress",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "categories": [
+                "cluster-api"
+            ],
+            "storageVersionHash": "NilqVVotPvk="
+        }
+    ]
+}
diff --git a/pkg/util/dynamichelper/discovery/cache/policy/v1beta1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/ipam.cluster.x-k8s.io/v1beta1/serverresources.json
similarity index 58%
rename from pkg/util/dynamichelper/discovery/cache/policy/v1beta1/serverresources.json
rename to pkg/util/dynamichelper/discovery/cache/ipam.cluster.x-k8s.io/v1beta1/serverresources.json
index 26a18b8cab5..d0a30506bc8 100644
--- a/pkg/util/dynamichelper/discovery/cache/policy/v1beta1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/ipam.cluster.x-k8s.io/v1beta1/serverresources.json
@@ -1,13 +1,13 @@
 {
     "kind": "APIResourceList",
     "apiVersion": "v1",
-    "groupVersion": "policy/v1beta1",
+    "groupVersion": "ipam.cluster.x-k8s.io/v1beta1",
     "resources": [
         {
-            "name": "poddisruptionbudgets",
-            "singularName": "",
+            "name": "ipaddressclaims",
+            "singularName": "ipaddressclaim",
             "namespaced": true,
-            "kind": "PodDisruptionBudget",
+            "kind": "IPAddressClaim",
             "verbs": [
                 "create",
                 "delete",
@@ -18,16 +18,16 @@
                 "update",
                 "watch"
             ],
-            "shortNames": [
-                "pdb"
+            "categories": [
+                "cluster-api"
             ],
-            "storageVersionHash": "6BGBu0kpHtk="
+            "storageVersionHash": "N6WtanXTMEQ="
         },
         {
-            "name": "poddisruptionbudgets/status",
+            "name": "ipaddressclaims/status",
             "singularName": "",
             "namespaced": true,
-            "kind": "PodDisruptionBudget",
+            "kind": "IPAddressClaim",
             "verbs": [
                 "get",
                 "patch",
@@ -35,10 +35,10 @@
             ]
         },
         {
-            "name": "podsecuritypolicies",
-            "singularName": "",
-            "namespaced": false,
-            "kind": "PodSecurityPolicy",
+            "name": "ipaddresses",
+            "singularName": "ipaddress",
+            "namespaced": true,
+            "kind": "IPAddress",
             "verbs": [
                 "create",
                 "delete",
@@ -49,10 +49,10 @@
                 "update",
                 "watch"
             ],
-            "shortNames": [
-                "psp"
+            "categories": [
+                "cluster-api"
             ],
-            "storageVersionHash": "khBLobUXkqA="
+            "storageVersionHash": "NilqVVotPvk="
         }
     ]
 }
diff --git a/pkg/util/dynamichelper/discovery/cache/k8s.ovn.org/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/k8s.ovn.org/v1/serverresources.json
index 12386718de2..3b324b5f966 100644
--- a/pkg/util/dynamichelper/discovery/cache/k8s.ovn.org/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/k8s.ovn.org/v1/serverresources.json
@@ -3,6 +3,37 @@
     "apiVersion": "v1",
     "groupVersion": "k8s.ovn.org/v1",
     "resources": [
+        {
+            "name": "adminpolicybasedexternalroutes",
+            "singularName": "adminpolicybasedexternalroute",
+            "namespaced": false,
+            "kind": "AdminPolicyBasedExternalRoute",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "shortNames": [
+                "apbexternalroute"
+            ],
+            "storageVersionHash": "mP1M6SN2oOo="
+        },
+        {
+            "name": "adminpolicybasedexternalroutes/status",
+            "singularName": "",
+            "namespaced": false,
+            "kind": "AdminPolicyBasedExternalRoute",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        },
         {
             "name": "egressfirewalls",
             "singularName": "egressfirewall",
@@ -20,6 +51,17 @@
             ],
             "storageVersionHash": "AElnPxlhG7g="
         },
+        {
+            "name": "egressfirewalls/status",
+            "singularName": "",
+            "namespaced": true,
+            "kind": "EgressFirewall",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        },
         {
             "name": "egressips",
             "singularName": "egressip",
@@ -67,6 +109,34 @@
                 "patch",
                 "update"
             ]
+        },
+        {
+            "name": "egressservices",
+            "singularName": "egressservice",
+            "namespaced": true,
+            "kind": "EgressService",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "storageVersionHash": "i7/QsTd2GEY="
+        },
+        {
+            "name": "egressservices/status",
+            "singularName": "",
+            "namespaced": true,
+            "kind": "EgressService",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
         }
     ]
 }
diff --git a/pkg/util/dynamichelper/discovery/cache/machine.openshift.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/machine.openshift.io/v1/serverresources.json
new file mode 100644
index 00000000000..8bfd65540ab
--- /dev/null
+++ b/pkg/util/dynamichelper/discovery/cache/machine.openshift.io/v1/serverresources.json
@@ -0,0 +1,48 @@
+{
+    "kind": "APIResourceList",
+    "apiVersion": "v1",
+    "groupVersion": "machine.openshift.io/v1",
+    "resources": [
+        {
+            "name": "controlplanemachinesets",
+            "singularName": "controlplanemachineset",
+            "namespaced": true,
+            "kind": "ControlPlaneMachineSet",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "storageVersionHash": "3DJk3ap4Ez8="
+        },
+        {
+            "name": "controlplanemachinesets/scale",
+            "singularName": "",
+            "namespaced": true,
+            "group": "autoscaling",
+            "version": "v1",
+            "kind": "Scale",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        },
+        {
+            "name": "controlplanemachinesets/status",
+            "singularName": "",
+            "namespaced": true,
+            "kind": "ControlPlaneMachineSet",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        }
+    ]
+}
diff --git a/pkg/util/dynamichelper/discovery/cache/batch/v1beta1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/machineconfiguration.openshift.io/v1alpha1/serverresources.json
similarity index 53%
rename from pkg/util/dynamichelper/discovery/cache/batch/v1beta1/serverresources.json
rename to pkg/util/dynamichelper/discovery/cache/machineconfiguration.openshift.io/v1alpha1/serverresources.json
index 9eaae39d420..1ceb02fd7cb 100644
--- a/pkg/util/dynamichelper/discovery/cache/batch/v1beta1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/machineconfiguration.openshift.io/v1alpha1/serverresources.json
@@ -1,13 +1,13 @@
 {
     "kind": "APIResourceList",
     "apiVersion": "v1",
-    "groupVersion": "batch/v1beta1",
+    "groupVersion": "machineconfiguration.openshift.io/v1alpha1",
     "resources": [
         {
-            "name": "cronjobs",
-            "singularName": "",
-            "namespaced": true,
-            "kind": "CronJob",
+            "name": "machineconfignodes",
+            "singularName": "machineconfignode",
+            "namespaced": false,
+            "kind": "MachineConfigNode",
             "verbs": [
                 "create",
                 "delete",
@@ -18,19 +18,13 @@
                 "update",
                 "watch"
             ],
-            "shortNames": [
-                "cj"
-            ],
-            "categories": [
-                "all"
-            ],
-            "storageVersionHash": "sd5LIXh4Fjs="
+            "storageVersionHash": "ZdQ5xb1zCcc="
         },
         {
-            "name": "cronjobs/status",
+            "name": "machineconfignodes/status",
             "singularName": "",
-            "namespaced": true,
-            "kind": "CronJob",
+            "namespaced": false,
+            "kind": "MachineConfigNode",
             "verbs": [
                 "get",
                 "patch",
diff --git a/pkg/util/dynamichelper/discovery/cache/metal3.io/v1alpha1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/metal3.io/v1alpha1/serverresources.json
new file mode 100644
index 00000000000..0528652c7d0
--- /dev/null
+++ b/pkg/util/dynamichelper/discovery/cache/metal3.io/v1alpha1/serverresources.json
@@ -0,0 +1,254 @@
+{
+    "kind": "APIResourceList",
+    "apiVersion": "v1",
+    "groupVersion": "metal3.io/v1alpha1",
+    "resources": [
+        {
+            "name": "baremetalhosts",
+            "singularName": "baremetalhost",
+            "namespaced": true,
+            "kind": "BareMetalHost",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "shortNames": [
+                "bmh",
+                "bmhost"
+            ],
+            "storageVersionHash": "6I9mpSMReUg="
+        },
+        {
+            "name": "baremetalhosts/status",
+            "singularName": "",
+            "namespaced": true,
+            "kind": "BareMetalHost",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        },
+        {
+            "name": "bmceventsubscriptions",
+            "singularName": "bmceventsubscription",
+            "namespaced": true,
+            "kind": "BMCEventSubscription",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "shortNames": [
+                "bes",
+                "bmcevent"
+            ],
+            "storageVersionHash": "igD4aTghQJ0="
+        },
+        {
+            "name": "bmceventsubscriptions/status",
+            "singularName": "",
+            "namespaced": true,
+            "kind": "BMCEventSubscription",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        },
+        {
+            "name": "dataimages",
+            "singularName": "dataimage",
+            "namespaced": true,
+            "kind": "DataImage",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "storageVersionHash": "51jT16xALkk="
+        },
+        {
+            "name": "dataimages/status",
+            "singularName": "",
+            "namespaced": true,
+            "kind": "DataImage",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        },
+        {
+            "name": "firmwareschemas",
+            "singularName": "firmwareschema",
+            "namespaced": true,
+            "kind": "FirmwareSchema",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "storageVersionHash": "qcYszB47DJE="
+        },
+        {
+            "name": "hardwaredata",
+            "singularName": "hardwaredata",
+            "namespaced": true,
+            "kind": "HardwareData",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "shortNames": [
+                "hd"
+            ],
+            "storageVersionHash": "d3ZEE2XIvnM="
+        },
+        {
+            "name": "hostfirmwarecomponents",
+            "singularName": "hostfirmwarecomponents",
+            "namespaced": true,
+            "kind": "HostFirmwareComponents",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "storageVersionHash": "aMnPSnD6x2Q="
+        },
+        {
+            "name": "hostfirmwarecomponents/status",
+            "singularName": "",
+            "namespaced": true,
+            "kind": "HostFirmwareComponents",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        },
+        {
+            "name": "hostfirmwaresettings",
+            "singularName": "hostfirmwaresettings",
+            "namespaced": true,
+            "kind": "HostFirmwareSettings",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "shortNames": [
+                "hfs"
+            ],
+            "storageVersionHash": "Ok8ThNUbb4U="
+        },
+        {
+            "name": "hostfirmwaresettings/status",
+            "singularName": "",
+            "namespaced": true,
+            "kind": "HostFirmwareSettings",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        },
+        {
+            "name": "preprovisioningimages",
+            "singularName": "preprovisioningimage",
+            "namespaced": true,
+            "kind": "PreprovisioningImage",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "shortNames": [
+                "ppimg"
+            ],
+            "storageVersionHash": "+h3tQm2OJHg="
+        },
+        {
+            "name": "preprovisioningimages/status",
+            "singularName": "",
+            "namespaced": true,
+            "kind": "PreprovisioningImage",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        },
+        {
+            "name": "provisionings",
+            "singularName": "provisioning",
+            "namespaced": false,
+            "kind": "Provisioning",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "storageVersionHash": "MFsHXPBs+No="
+        },
+        {
+            "name": "provisionings/status",
+            "singularName": "",
+            "namespaced": false,
+            "kind": "Provisioning",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        }
+    ]
+}
diff --git a/pkg/util/dynamichelper/discovery/cache/monitoring.coreos.com/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/monitoring.coreos.com/v1/serverresources.json
index a7cb958ccd0..d79fcd86c5a 100644
--- a/pkg/util/dynamichelper/discovery/cache/monitoring.coreos.com/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/monitoring.coreos.com/v1/serverresources.json
@@ -26,6 +26,17 @@
             ],
             "storageVersionHash": "NshW3zg1K7o="
         },
+        {
+            "name": "alertmanagers/status",
+            "singularName": "",
+            "namespaced": true,
+            "kind": "Alertmanager",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        },
         {
             "name": "podmonitors",
             "singularName": "podmonitor",
@@ -95,6 +106,19 @@
             ],
             "storageVersionHash": "C8naPY4eojU="
         },
+        {
+            "name": "prometheuses/scale",
+            "singularName": "",
+            "namespaced": true,
+            "group": "autoscaling",
+            "version": "v1",
+            "kind": "Scale",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        },
         {
             "name": "prometheuses/status",
             "singularName": "",
@@ -174,6 +198,17 @@
                 "prometheus-operator"
             ],
             "storageVersionHash": "YBxpg/kA6UI="
+        },
+        {
+            "name": "thanosrulers/status",
+            "singularName": "",
+            "namespaced": true,
+            "kind": "ThanosRuler",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
         }
     ]
 }
diff --git a/pkg/util/dynamichelper/discovery/cache/monitoring.openshift.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/monitoring.openshift.io/v1/serverresources.json
new file mode 100644
index 00000000000..6cbc77b3ff2
--- /dev/null
+++ b/pkg/util/dynamichelper/discovery/cache/monitoring.openshift.io/v1/serverresources.json
@@ -0,0 +1,63 @@
+{
+    "kind": "APIResourceList",
+    "apiVersion": "v1",
+    "groupVersion": "monitoring.openshift.io/v1",
+    "resources": [
+        {
+            "name": "alertingrules",
+            "singularName": "alertingrule",
+            "namespaced": true,
+            "kind": "AlertingRule",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "storageVersionHash": "bsdwDVR+1Pw="
+        },
+        {
+            "name": "alertingrules/status",
+            "singularName": "",
+            "namespaced": true,
+            "kind": "AlertingRule",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        },
+        {
+            "name": "alertrelabelconfigs",
+            "singularName": "alertrelabelconfig",
+            "namespaced": true,
+            "kind": "AlertRelabelConfig",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "storageVersionHash": "T/uaSH4Ar1I="
+        },
+        {
+            "name": "alertrelabelconfigs/status",
+            "singularName": "",
+            "namespaced": true,
+            "kind": "AlertRelabelConfig",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        }
+    ]
+}
diff --git a/pkg/util/dynamichelper/discovery/cache/networking.k8s.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/networking.k8s.io/v1/serverresources.json
index 3e9dfb20878..87269f121a4 100644
--- a/pkg/util/dynamichelper/discovery/cache/networking.k8s.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/networking.k8s.io/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "ingressclasses",
-            "singularName": "",
+            "singularName": "ingressclass",
             "namespaced": false,
             "kind": "IngressClass",
             "verbs": [
@@ -22,7 +22,7 @@
         },
         {
             "name": "ingresses",
-            "singularName": "",
+            "singularName": "ingress",
             "namespaced": true,
             "kind": "Ingress",
             "verbs": [
@@ -53,7 +53,7 @@
         },
         {
             "name": "networkpolicies",
-            "singularName": "",
+            "singularName": "networkpolicy",
             "namespaced": true,
             "kind": "NetworkPolicy",
             "verbs": [
@@ -70,17 +70,6 @@
                 "netpol"
             ],
             "storageVersionHash": "YpfwF18m1G8="
-        },
-        {
-            "name": "networkpolicies/status",
-            "singularName": "",
-            "namespaced": true,
-            "kind": "NetworkPolicy",
-            "verbs": [
-                "get",
-                "patch",
-                "update"
-            ]
         }
     ]
 }
diff --git a/pkg/util/dynamichelper/discovery/cache/node.k8s.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/node.k8s.io/v1/serverresources.json
index 630cb847a57..5ee0923deb5 100644
--- a/pkg/util/dynamichelper/discovery/cache/node.k8s.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/node.k8s.io/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "runtimeclasses",
-            "singularName": "",
+            "singularName": "runtimeclass",
             "namespaced": false,
             "kind": "RuntimeClass",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/node.k8s.io/v1beta1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/node.k8s.io/v1beta1/serverresources.json
deleted file mode 100644
index 142057c547a..00000000000
--- a/pkg/util/dynamichelper/discovery/cache/node.k8s.io/v1beta1/serverresources.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "kind": "APIResourceList",
-    "apiVersion": "v1",
-    "groupVersion": "node.k8s.io/v1beta1",
-    "resources": [
-        {
-            "name": "runtimeclasses",
-            "singularName": "",
-            "namespaced": false,
-            "kind": "RuntimeClass",
-            "verbs": [
-                "create",
-                "delete",
-                "deletecollection",
-                "get",
-                "list",
-                "patch",
-                "update",
-                "watch"
-            ],
-            "storageVersionHash": "WQTu1GL3T2Q="
-        }
-    ]
-}
diff --git a/pkg/util/dynamichelper/discovery/cache/oauth.openshift.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/oauth.openshift.io/v1/serverresources.json
index 56537120cfd..442105d2fe1 100644
--- a/pkg/util/dynamichelper/discovery/cache/oauth.openshift.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/oauth.openshift.io/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "oauthaccesstokens",
-            "singularName": "",
+            "singularName": "oauthaccesstoken",
             "namespaced": false,
             "kind": "OAuthAccessToken",
             "verbs": [
@@ -22,7 +22,7 @@
         },
         {
             "name": "oauthauthorizetokens",
-            "singularName": "",
+            "singularName": "oauthauthorizetoken",
             "namespaced": false,
             "kind": "OAuthAuthorizeToken",
             "verbs": [
@@ -39,7 +39,7 @@
         },
         {
             "name": "oauthclientauthorizations",
-            "singularName": "",
+            "singularName": "oauthclientauthorization",
             "namespaced": false,
             "kind": "OAuthClientAuthorization",
             "verbs": [
@@ -56,7 +56,7 @@
         },
         {
             "name": "oauthclients",
-            "singularName": "",
+            "singularName": "oauthclient",
             "namespaced": false,
             "kind": "OAuthClient",
             "verbs": [
@@ -73,7 +73,7 @@
         },
         {
             "name": "tokenreviews",
-            "singularName": "",
+            "singularName": "tokenreview",
             "namespaced": false,
             "group": "authentication.k8s.io",
             "version": "v1",
@@ -84,7 +84,7 @@
         },
         {
             "name": "useroauthaccesstokens",
-            "singularName": "",
+            "singularName": "useroauthaccesstoken",
             "namespaced": false,
             "kind": "UserOAuthAccessToken",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/operator.openshift.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/operator.openshift.io/v1/serverresources.json
index ed91cef3034..8f969d7db0e 100644
--- a/pkg/util/dynamichelper/discovery/cache/operator.openshift.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/operator.openshift.io/v1/serverresources.json
@@ -274,6 +274,47 @@
                 "update"
             ]
         },
+        {
+            "name": "insightsoperators",
+            "singularName": "insightsoperator",
+            "namespaced": false,
+            "kind": "InsightsOperator",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "storageVersionHash": "mHoo1CahpYs="
+        },
+        {
+            "name": "insightsoperators/scale",
+            "singularName": "",
+            "namespaced": false,
+            "group": "autoscaling",
+            "version": "v1",
+            "kind": "Scale",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        },
+        {
+            "name": "insightsoperators/status",
+            "singularName": "",
+            "namespaced": false,
+            "kind": "InsightsOperator",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        },
         {
             "name": "kubeapiservers",
             "singularName": "kubeapiserver",
@@ -392,6 +433,34 @@
                 "update"
             ]
         },
+        {
+            "name": "machineconfigurations",
+            "singularName": "machineconfiguration",
+            "namespaced": false,
+            "kind": "MachineConfiguration",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "storageVersionHash": "UPqiDyTnPzc="
+        },
+        {
+            "name": "machineconfigurations/status",
+            "singularName": "",
+            "namespaced": false,
+            "kind": "MachineConfiguration",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        },
         {
             "name": "networks",
             "singularName": "network",
diff --git a/pkg/util/dynamichelper/discovery/cache/packages.operators.coreos.com/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/packages.operators.coreos.com/v1/serverresources.json
index fd0e2c9c99d..122c799f20b 100644
--- a/pkg/util/dynamichelper/discovery/cache/packages.operators.coreos.com/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/packages.operators.coreos.com/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "packagemanifests",
-            "singularName": "",
+            "singularName": "packagemanifest",
             "namespaced": true,
             "kind": "PackageManifest",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/policy.networking.k8s.io/v1alpha1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/policy.networking.k8s.io/v1alpha1/serverresources.json
new file mode 100644
index 00000000000..65625c51f5b
--- /dev/null
+++ b/pkg/util/dynamichelper/discovery/cache/policy.networking.k8s.io/v1alpha1/serverresources.json
@@ -0,0 +1,69 @@
+{
+    "kind": "APIResourceList",
+    "apiVersion": "v1",
+    "groupVersion": "policy.networking.k8s.io/v1alpha1",
+    "resources": [
+        {
+            "name": "adminnetworkpolicies",
+            "singularName": "adminnetworkpolicy",
+            "namespaced": false,
+            "kind": "AdminNetworkPolicy",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "shortNames": [
+                "anp"
+            ],
+            "storageVersionHash": "kSYsA/7eg18="
+        },
+        {
+            "name": "adminnetworkpolicies/status",
+            "singularName": "",
+            "namespaced": false,
+            "kind": "AdminNetworkPolicy",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        },
+        {
+            "name": "baselineadminnetworkpolicies",
+            "singularName": "baselineadminnetworkpolicy",
+            "namespaced": false,
+            "kind": "BaselineAdminNetworkPolicy",
+            "verbs": [
+                "create",
+                "delete",
+                "deletecollection",
+                "get",
+                "list",
+                "patch",
+                "update",
+                "watch"
+            ],
+            "shortNames": [
+                "banp"
+            ],
+            "storageVersionHash": "KFUZYBf4fKs="
+        },
+        {
+            "name": "baselineadminnetworkpolicies/status",
+            "singularName": "",
+            "namespaced": false,
+            "kind": "BaselineAdminNetworkPolicy",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        }
+    ]
+}
diff --git a/pkg/util/dynamichelper/discovery/cache/policy/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/policy/v1/serverresources.json
index 89bf137920e..96de1a131ad 100644
--- a/pkg/util/dynamichelper/discovery/cache/policy/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/policy/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "poddisruptionbudgets",
-            "singularName": "",
+            "singularName": "poddisruptionbudget",
             "namespaced": true,
             "kind": "PodDisruptionBudget",
             "verbs": [
@@ -21,7 +21,7 @@
             "shortNames": [
                 "pdb"
             ],
-            "storageVersionHash": "6BGBu0kpHtk="
+            "storageVersionHash": "EVWiDmWqyJw="
         },
         {
             "name": "poddisruptionbudgets/status",
diff --git a/pkg/util/dynamichelper/discovery/cache/project.openshift.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/project.openshift.io/v1/serverresources.json
index 0dd74bca7c1..a1937b5a5f8 100644
--- a/pkg/util/dynamichelper/discovery/cache/project.openshift.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/project.openshift.io/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "projectrequests",
-            "singularName": "",
+            "singularName": "projectrequest",
             "namespaced": false,
             "kind": "ProjectRequest",
             "verbs": [
@@ -15,7 +15,7 @@
         },
         {
             "name": "projects",
-            "singularName": "",
+            "singularName": "project",
             "namespaced": false,
             "kind": "Project",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/quota.openshift.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/quota.openshift.io/v1/serverresources.json
index 68f07648876..89a1ceeed18 100644
--- a/pkg/util/dynamichelper/discovery/cache/quota.openshift.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/quota.openshift.io/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "appliedclusterresourcequotas",
-            "singularName": "",
+            "singularName": "appliedclusterresourcequota",
             "namespaced": true,
             "kind": "AppliedClusterResourceQuota",
             "verbs": [
@@ -15,7 +15,7 @@
         },
         {
             "name": "clusterresourcequotas",
-            "singularName": "",
+            "singularName": "clusterresourcequota",
             "namespaced": false,
             "kind": "ClusterResourceQuota",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/rbac.authorization.k8s.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/rbac.authorization.k8s.io/v1/serverresources.json
index 343427e5eea..3b0c17f3bcb 100644
--- a/pkg/util/dynamichelper/discovery/cache/rbac.authorization.k8s.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/rbac.authorization.k8s.io/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "clusterrolebindings",
-            "singularName": "",
+            "singularName": "clusterrolebinding",
             "namespaced": false,
             "kind": "ClusterRoleBinding",
             "verbs": [
@@ -22,7 +22,7 @@
         },
         {
             "name": "clusterroles",
-            "singularName": "",
+            "singularName": "clusterrole",
             "namespaced": false,
             "kind": "ClusterRole",
             "verbs": [
@@ -39,7 +39,7 @@
         },
         {
             "name": "rolebindings",
-            "singularName": "",
+            "singularName": "rolebinding",
             "namespaced": true,
             "kind": "RoleBinding",
             "verbs": [
@@ -56,7 +56,7 @@
         },
         {
             "name": "roles",
-            "singularName": "",
+            "singularName": "role",
             "namespaced": true,
             "kind": "Role",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/route.openshift.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/route.openshift.io/v1/serverresources.json
index 63c16b93abb..c8bc54b0bf0 100644
--- a/pkg/util/dynamichelper/discovery/cache/route.openshift.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/route.openshift.io/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "routes",
-            "singularName": "",
+            "singularName": "route",
             "namespaced": true,
             "kind": "Route",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/scheduling.k8s.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/scheduling.k8s.io/v1/serverresources.json
index 63b377b7714..dcb3f6fa76e 100644
--- a/pkg/util/dynamichelper/discovery/cache/scheduling.k8s.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/scheduling.k8s.io/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "priorityclasses",
-            "singularName": "",
+            "singularName": "priorityclass",
             "namespaced": false,
             "kind": "PriorityClass",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/security.openshift.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/security.openshift.io/v1/serverresources.json
index 6ae5eae6926..3fa4c9603e6 100644
--- a/pkg/util/dynamichelper/discovery/cache/security.openshift.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/security.openshift.io/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "podsecuritypolicyreviews",
-            "singularName": "",
+            "singularName": "podsecuritypolicyreview",
             "namespaced": true,
             "kind": "PodSecurityPolicyReview",
             "verbs": [
@@ -14,7 +14,7 @@
         },
         {
             "name": "podsecuritypolicyselfsubjectreviews",
-            "singularName": "",
+            "singularName": "podsecuritypolicyselfsubjectreview",
             "namespaced": true,
             "kind": "PodSecurityPolicySelfSubjectReview",
             "verbs": [
@@ -23,7 +23,7 @@
         },
         {
             "name": "podsecuritypolicysubjectreviews",
-            "singularName": "",
+            "singularName": "podsecuritypolicysubjectreview",
             "namespaced": true,
             "kind": "PodSecurityPolicySubjectReview",
             "verbs": [
@@ -32,7 +32,7 @@
         },
         {
             "name": "rangeallocations",
-            "singularName": "",
+            "singularName": "rangeallocation",
             "namespaced": false,
             "kind": "RangeAllocation",
             "verbs": [
@@ -49,7 +49,7 @@
         },
         {
             "name": "securitycontextconstraints",
-            "singularName": "",
+            "singularName": "securitycontextconstraint",
             "namespaced": false,
             "kind": "SecurityContextConstraints",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/servergroups.json b/pkg/util/dynamichelper/discovery/cache/servergroups.json
index 2fe9d0ccb25..fec2629282e 100644
--- a/pkg/util/dynamichelper/discovery/cache/servergroups.json
+++ b/pkg/util/dynamichelper/discovery/cache/servergroups.json
@@ -50,10 +50,6 @@
                 {
                     "groupVersion": "events.k8s.io/v1",
                     "version": "v1"
-                },
-                {
-                    "groupVersion": "events.k8s.io/v1beta1",
-                    "version": "v1beta1"
                 }
             ]
         },
@@ -97,14 +93,6 @@
                 {
                     "groupVersion": "autoscaling/v1",
                     "version": "v1"
-                },
-                {
-                    "groupVersion": "autoscaling/v2beta1",
-                    "version": "v2beta1"
-                },
-                {
-                    "groupVersion": "autoscaling/v2beta2",
-                    "version": "v2beta2"
                 }
             ]
         },
@@ -118,10 +106,6 @@
                 {
                     "groupVersion": "batch/v1",
                     "version": "v1"
-                },
-                {
-                    "groupVersion": "batch/v1beta1",
-                    "version": "v1beta1"
                 }
             ]
         },
@@ -161,10 +145,6 @@
                 {
                     "groupVersion": "policy/v1",
                     "version": "v1"
-                },
-                {
-                    "groupVersion": "policy/v1beta1",
-                    "version": "v1beta1"
                 }
             ]
         },
@@ -191,10 +171,6 @@
                 {
                     "groupVersion": "storage.k8s.io/v1",
                     "version": "v1"
-                },
-                {
-                    "groupVersion": "storage.k8s.io/v1beta1",
-                    "version": "v1beta1"
                 }
             ]
         },
@@ -260,10 +236,6 @@
                 {
                     "groupVersion": "node.k8s.io/v1",
                     "version": "v1"
-                },
-                {
-                    "groupVersion": "node.k8s.io/v1beta1",
-                    "version": "v1beta1"
                 }
             ]
         },
@@ -277,27 +249,23 @@
                 {
                     "groupVersion": "discovery.k8s.io/v1",
                     "version": "v1"
-                },
-                {
-                    "groupVersion": "discovery.k8s.io/v1beta1",
-                    "version": "v1beta1"
                 }
             ]
         },
         {
             "name": "flowcontrol.apiserver.k8s.io",
             "preferredVersion": {
-                "groupVersion": "flowcontrol.apiserver.k8s.io/v1beta2",
-                "version": "v1beta2"
+                "groupVersion": "flowcontrol.apiserver.k8s.io/v1",
+                "version": "v1"
             },
             "versions": [
                 {
-                    "groupVersion": "flowcontrol.apiserver.k8s.io/v1beta2",
-                    "version": "v1beta2"
+                    "groupVersion": "flowcontrol.apiserver.k8s.io/v1",
+                    "version": "v1"
                 },
                 {
-                    "groupVersion": "flowcontrol.apiserver.k8s.io/v1beta1",
-                    "version": "v1beta1"
+                    "groupVersion": "flowcontrol.apiserver.k8s.io/v1beta3",
+                    "version": "v1beta3"
                 }
             ]
         },
@@ -612,6 +580,23 @@
                 }
             ]
         },
+        {
+            "name": "machine.openshift.io",
+            "preferredVersion": {
+                "groupVersion": "machine.openshift.io/v1",
+                "version": "v1"
+            },
+            "versions": [
+                {
+                    "groupVersion": "machine.openshift.io/v1",
+                    "version": "v1"
+                },
+                {
+                    "groupVersion": "machine.openshift.io/v1beta1",
+                    "version": "v1beta1"
+                }
+            ]
+        },
         {
             "name": "machineconfiguration.openshift.io",
             "preferredVersion": {
@@ -622,6 +607,10 @@
                 {
                     "groupVersion": "machineconfiguration.openshift.io/v1",
                     "version": "v1"
+                },
+                {
+                    "groupVersion": "machineconfiguration.openshift.io/v1alpha1",
+                    "version": "v1alpha1"
                 }
             ]
         },
@@ -646,6 +635,19 @@
                 }
             ]
         },
+        {
+            "name": "monitoring.openshift.io",
+            "preferredVersion": {
+                "groupVersion": "monitoring.openshift.io/v1",
+                "version": "v1"
+            },
+            "versions": [
+                {
+                    "groupVersion": "monitoring.openshift.io/v1",
+                    "version": "v1"
+                }
+            ]
+        },
         {
             "name": "network.operator.openshift.io",
             "preferredVersion": {
@@ -783,6 +785,36 @@
                 }
             ]
         },
+        {
+            "name": "ipam.cluster.x-k8s.io",
+            "preferredVersion": {
+                "groupVersion": "ipam.cluster.x-k8s.io/v1beta1",
+                "version": "v1beta1"
+            },
+            "versions": [
+                {
+                    "groupVersion": "ipam.cluster.x-k8s.io/v1beta1",
+                    "version": "v1beta1"
+                },
+                {
+                    "groupVersion": "ipam.cluster.x-k8s.io/v1alpha1",
+                    "version": "v1alpha1"
+                }
+            ]
+        },
+        {
+            "name": "metal3.io",
+            "preferredVersion": {
+                "groupVersion": "metal3.io/v1alpha1",
+                "version": "v1alpha1"
+            },
+            "versions": [
+                {
+                    "groupVersion": "metal3.io/v1alpha1",
+                    "version": "v1alpha1"
+                }
+            ]
+        },
         {
             "name": "migration.k8s.io",
             "preferredVersion": {
@@ -796,6 +828,19 @@
                 }
             ]
         },
+        {
+            "name": "policy.networking.k8s.io",
+            "preferredVersion": {
+                "groupVersion": "policy.networking.k8s.io/v1alpha1",
+                "version": "v1alpha1"
+            },
+            "versions": [
+                {
+                    "groupVersion": "policy.networking.k8s.io/v1alpha1",
+                    "version": "v1alpha1"
+                }
+            ]
+        },
         {
             "name": "preview.aro.openshift.io",
             "preferredVersion": {
@@ -836,27 +881,31 @@
             ]
         },
         {
-            "name": "helm.openshift.io",
+            "name": "infrastructure.cluster.x-k8s.io",
             "preferredVersion": {
-                "groupVersion": "helm.openshift.io/v1beta1",
+                "groupVersion": "infrastructure.cluster.x-k8s.io/v1beta1",
                 "version": "v1beta1"
             },
             "versions": [
                 {
-                    "groupVersion": "helm.openshift.io/v1beta1",
+                    "groupVersion": "infrastructure.cluster.x-k8s.io/v1beta1",
                     "version": "v1beta1"
+                },
+                {
+                    "groupVersion": "infrastructure.cluster.x-k8s.io/v1alpha5",
+                    "version": "v1alpha5"
                 }
             ]
         },
         {
-            "name": "machine.openshift.io",
+            "name": "helm.openshift.io",
             "preferredVersion": {
-                "groupVersion": "machine.openshift.io/v1beta1",
+                "groupVersion": "helm.openshift.io/v1beta1",
                 "version": "v1beta1"
             },
             "versions": [
                 {
-                    "groupVersion": "machine.openshift.io/v1beta1",
+                    "groupVersion": "helm.openshift.io/v1beta1",
                     "version": "v1beta1"
                 }
             ]
diff --git a/pkg/util/dynamichelper/discovery/cache/storage.k8s.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/storage.k8s.io/v1/serverresources.json
index cc6abae5551..8ce0bfc319d 100644
--- a/pkg/util/dynamichelper/discovery/cache/storage.k8s.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/storage.k8s.io/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "csidrivers",
-            "singularName": "",
+            "singularName": "csidriver",
             "namespaced": false,
             "kind": "CSIDriver",
             "verbs": [
@@ -22,7 +22,7 @@
         },
         {
             "name": "csinodes",
-            "singularName": "",
+            "singularName": "csinode",
             "namespaced": false,
             "kind": "CSINode",
             "verbs": [
@@ -39,7 +39,7 @@
         },
         {
             "name": "csistoragecapacities",
-            "singularName": "",
+            "singularName": "csistoragecapacity",
             "namespaced": true,
             "kind": "CSIStorageCapacity",
             "verbs": [
@@ -52,11 +52,11 @@
                 "update",
                 "watch"
             ],
-            "storageVersionHash": "4as6MA/kOg0="
+            "storageVersionHash": "xeVl+2Ly1kE="
         },
         {
             "name": "storageclasses",
-            "singularName": "",
+            "singularName": "storageclass",
             "namespaced": false,
             "kind": "StorageClass",
             "verbs": [
@@ -76,7 +76,7 @@
         },
         {
             "name": "volumeattachments",
-            "singularName": "",
+            "singularName": "volumeattachment",
             "namespaced": false,
             "kind": "VolumeAttachment",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/storage.k8s.io/v1beta1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/storage.k8s.io/v1beta1/serverresources.json
deleted file mode 100644
index 5e65dae94dd..00000000000
--- a/pkg/util/dynamichelper/discovery/cache/storage.k8s.io/v1beta1/serverresources.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "kind": "APIResourceList",
-    "apiVersion": "v1",
-    "groupVersion": "storage.k8s.io/v1beta1",
-    "resources": [
-        {
-            "name": "csistoragecapacities",
-            "singularName": "",
-            "namespaced": true,
-            "kind": "CSIStorageCapacity",
-            "verbs": [
-                "create",
-                "delete",
-                "deletecollection",
-                "get",
-                "list",
-                "patch",
-                "update",
-                "watch"
-            ],
-            "storageVersionHash": "4as6MA/kOg0="
-        }
-    ]
-}
diff --git a/pkg/util/dynamichelper/discovery/cache/template.openshift.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/template.openshift.io/v1/serverresources.json
index dc88c7fff4e..61544ce5a69 100644
--- a/pkg/util/dynamichelper/discovery/cache/template.openshift.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/template.openshift.io/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "brokertemplateinstances",
-            "singularName": "",
+            "singularName": "brokertemplateinstance",
             "namespaced": false,
             "kind": "BrokerTemplateInstance",
             "verbs": [
@@ -22,7 +22,7 @@
         },
         {
             "name": "processedtemplates",
-            "singularName": "",
+            "singularName": "processedtemplate",
             "namespaced": true,
             "kind": "Template",
             "verbs": [
@@ -31,7 +31,7 @@
         },
         {
             "name": "templateinstances",
-            "singularName": "",
+            "singularName": "templateinstance",
             "namespaced": true,
             "kind": "TemplateInstance",
             "verbs": [
@@ -59,7 +59,7 @@
         },
         {
             "name": "templates",
-            "singularName": "",
+            "singularName": "template",
             "namespaced": true,
             "kind": "Template",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/tuned.openshift.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/tuned.openshift.io/v1/serverresources.json
index 07098256677..92154bae87c 100644
--- a/pkg/util/dynamichelper/discovery/cache/tuned.openshift.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/tuned.openshift.io/v1/serverresources.json
@@ -20,6 +20,17 @@
             ],
             "storageVersionHash": "Ymd5utw2PCg="
         },
+        {
+            "name": "profiles/status",
+            "singularName": "",
+            "namespaced": true,
+            "kind": "Profile",
+            "verbs": [
+                "get",
+                "patch",
+                "update"
+            ]
+        },
         {
             "name": "tuneds",
             "singularName": "tuned",
diff --git a/pkg/util/dynamichelper/discovery/cache/user.openshift.io/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/user.openshift.io/v1/serverresources.json
index 25746ae6eb3..0a23d26adc2 100644
--- a/pkg/util/dynamichelper/discovery/cache/user.openshift.io/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/user.openshift.io/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "groups",
-            "singularName": "",
+            "singularName": "group",
             "namespaced": false,
             "kind": "Group",
             "verbs": [
@@ -22,7 +22,7 @@
         },
         {
             "name": "identities",
-            "singularName": "",
+            "singularName": "identity",
             "namespaced": false,
             "kind": "Identity",
             "verbs": [
@@ -39,7 +39,7 @@
         },
         {
             "name": "useridentitymappings",
-            "singularName": "",
+            "singularName": "useridentitymapping",
             "namespaced": false,
             "kind": "UserIdentityMapping",
             "verbs": [
@@ -52,7 +52,7 @@
         },
         {
             "name": "users",
-            "singularName": "",
+            "singularName": "user",
             "namespaced": false,
             "kind": "User",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache/v1/serverresources.json b/pkg/util/dynamichelper/discovery/cache/v1/serverresources.json
index 96efb730fa4..da8c33ca7ea 100644
--- a/pkg/util/dynamichelper/discovery/cache/v1/serverresources.json
+++ b/pkg/util/dynamichelper/discovery/cache/v1/serverresources.json
@@ -5,7 +5,7 @@
     "resources": [
         {
             "name": "bindings",
-            "singularName": "",
+            "singularName": "binding",
             "namespaced": true,
             "kind": "Binding",
             "verbs": [
@@ -14,7 +14,7 @@
         },
         {
             "name": "componentstatuses",
-            "singularName": "",
+            "singularName": "componentstatus",
             "namespaced": false,
             "kind": "ComponentStatus",
             "verbs": [
@@ -27,7 +27,7 @@
         },
         {
             "name": "configmaps",
-            "singularName": "",
+            "singularName": "configmap",
             "namespaced": true,
             "kind": "ConfigMap",
             "verbs": [
@@ -47,7 +47,7 @@
         },
         {
             "name": "endpoints",
-            "singularName": "",
+            "singularName": "endpoints",
             "namespaced": true,
             "kind": "Endpoints",
             "verbs": [
@@ -67,7 +67,7 @@
         },
         {
             "name": "events",
-            "singularName": "",
+            "singularName": "event",
             "namespaced": true,
             "kind": "Event",
             "verbs": [
@@ -87,7 +87,7 @@
         },
         {
             "name": "limitranges",
-            "singularName": "",
+            "singularName": "limitrange",
             "namespaced": true,
             "kind": "LimitRange",
             "verbs": [
@@ -107,7 +107,7 @@
         },
         {
             "name": "namespaces",
-            "singularName": "",
+            "singularName": "namespace",
             "namespaced": false,
             "kind": "Namespace",
             "verbs": [
@@ -146,7 +146,7 @@
         },
         {
             "name": "nodes",
-            "singularName": "",
+            "singularName": "node",
             "namespaced": false,
             "kind": "Node",
             "verbs": [
@@ -190,7 +190,7 @@
         },
         {
             "name": "persistentvolumeclaims",
-            "singularName": "",
+            "singularName": "persistentvolumeclaim",
             "namespaced": true,
             "kind": "PersistentVolumeClaim",
             "verbs": [
@@ -221,7 +221,7 @@
         },
         {
             "name": "persistentvolumes",
-            "singularName": "",
+            "singularName": "persistentvolume",
             "namespaced": false,
             "kind": "PersistentVolume",
             "verbs": [
@@ -252,7 +252,7 @@
         },
         {
             "name": "pods",
-            "singularName": "",
+            "singularName": "pod",
             "namespaced": true,
             "kind": "Pod",
             "verbs": [
@@ -369,7 +369,7 @@
         },
         {
             "name": "podtemplates",
-            "singularName": "",
+            "singularName": "podtemplate",
             "namespaced": true,
             "kind": "PodTemplate",
             "verbs": [
@@ -386,7 +386,7 @@
         },
         {
             "name": "replicationcontrollers",
-            "singularName": "",
+            "singularName": "replicationcontroller",
             "namespaced": true,
             "kind": "ReplicationController",
             "verbs": [
@@ -433,7 +433,7 @@
         },
         {
             "name": "resourcequotas",
-            "singularName": "",
+            "singularName": "resourcequota",
             "namespaced": true,
             "kind": "ResourceQuota",
             "verbs": [
@@ -464,7 +464,7 @@
         },
         {
             "name": "secrets",
-            "singularName": "",
+            "singularName": "secret",
             "namespaced": true,
             "kind": "Secret",
             "verbs": [
@@ -481,7 +481,7 @@
         },
         {
             "name": "serviceaccounts",
-            "singularName": "",
+            "singularName": "serviceaccount",
             "namespaced": true,
             "kind": "ServiceAccount",
             "verbs": [
@@ -512,7 +512,7 @@
         },
         {
             "name": "services",
-            "singularName": "",
+            "singularName": "service",
             "namespaced": true,
             "kind": "Service",
             "verbs": [
diff --git a/pkg/util/dynamichelper/discovery/cache_fallback_discovery_client_test.go b/pkg/util/dynamichelper/discovery/cache_fallback_discovery_client_test.go
index f8540f0ae1d..aadb8914051 100644
--- a/pkg/util/dynamichelper/discovery/cache_fallback_discovery_client_test.go
+++ b/pkg/util/dynamichelper/discovery/cache_fallback_discovery_client_test.go
@@ -37,7 +37,7 @@ func TestVersion(t *testing.T) {
 
 	assetsVersion := strings.TrimSuffix(string(b), "\n")
 	// NOTE: This is checking for the version of the oldest supported minor stream.
-	if assetsVersion != "4.11.44" {
+	if assetsVersion != "4.16.14" {
 		t.Error("discovery cache is out of date: run make discoverycache")
 	}
 }