diff --git a/checks/kubernetes/cisbenchmarks/apiserver/admin_conf_ownership.rego b/checks/kubernetes/cisbenchmarks/apiserver/admin_conf_ownership.rego
index 0807cb70..8b5c8dcb 100644
--- a/checks/kubernetes/cisbenchmarks/apiserver/admin_conf_ownership.rego
+++ b/checks/kubernetes/cisbenchmarks/apiserver/admin_conf_ownership.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0061
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/apiserver/admin_conf_permission.rego b/checks/kubernetes/cisbenchmarks/apiserver/admin_conf_permission.rego
index 392e8210..7259c01b 100644
--- a/checks/kubernetes/cisbenchmarks/apiserver/admin_conf_permission.rego
+++ b/checks/kubernetes/cisbenchmarks/apiserver/admin_conf_permission.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0060
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/apiserver/kubernetes_pki_cert_permission.rego b/checks/kubernetes/cisbenchmarks/apiserver/kubernetes_pki_cert_permission.rego
index f3805cc0..622823c8 100644
--- a/checks/kubernetes/cisbenchmarks/apiserver/kubernetes_pki_cert_permission.rego
+++ b/checks/kubernetes/cisbenchmarks/apiserver/kubernetes_pki_cert_permission.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0068
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/apiserver/kubernetes_pki_directory_ownership.rego b/checks/kubernetes/cisbenchmarks/apiserver/kubernetes_pki_directory_ownership.rego
index 34aaef62..47dedb60 100644
--- a/checks/kubernetes/cisbenchmarks/apiserver/kubernetes_pki_directory_ownership.rego
+++ b/checks/kubernetes/cisbenchmarks/apiserver/kubernetes_pki_directory_ownership.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0066
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/apiserver/kubernetes_pki_key_permission.rego b/checks/kubernetes/cisbenchmarks/apiserver/kubernetes_pki_key_permission.rego
index 81eaa090..17732550 100644
--- a/checks/kubernetes/cisbenchmarks/apiserver/kubernetes_pki_key_permission.rego
+++ b/checks/kubernetes/cisbenchmarks/apiserver/kubernetes_pki_key_permission.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0067
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/apiserver/pod_spec_ownership.rego b/checks/kubernetes/cisbenchmarks/apiserver/pod_spec_ownership.rego
index 3eb1facd..16db5515 100644
--- a/checks/kubernetes/cisbenchmarks/apiserver/pod_spec_ownership.rego
+++ b/checks/kubernetes/cisbenchmarks/apiserver/pod_spec_ownership.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0049
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/apiserver/pod_spec_permission.rego b/checks/kubernetes/cisbenchmarks/apiserver/pod_spec_permission.rego
index 6760c301..803c53ad 100644
--- a/checks/kubernetes/cisbenchmarks/apiserver/pod_spec_permission.rego
+++ b/checks/kubernetes/cisbenchmarks/apiserver/pod_spec_permission.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0048
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/cni/pod_spec_ownership.rego b/checks/kubernetes/cisbenchmarks/cni/pod_spec_ownership.rego
index 9278074f..af2926ec 100644
--- a/checks/kubernetes/cisbenchmarks/cni/pod_spec_ownership.rego
+++ b/checks/kubernetes/cisbenchmarks/cni/pod_spec_ownership.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0057
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/cni/pod_spec_permission.rego b/checks/kubernetes/cisbenchmarks/cni/pod_spec_permission.rego
index 096e73ec..6b90ee3c 100644
--- a/checks/kubernetes/cisbenchmarks/cni/pod_spec_permission.rego
+++ b/checks/kubernetes/cisbenchmarks/cni/pod_spec_permission.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0056
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/controllermamager/controller_manager_conf_ownership.rego b/checks/kubernetes/cisbenchmarks/controllermamager/controller_manager_conf_ownership.rego
index fb3f0d19..354ca1f3 100644
--- a/checks/kubernetes/cisbenchmarks/controllermamager/controller_manager_conf_ownership.rego
+++ b/checks/kubernetes/cisbenchmarks/controllermamager/controller_manager_conf_ownership.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0065
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/controllermamager/controller_manager_conf_permission.rego b/checks/kubernetes/cisbenchmarks/controllermamager/controller_manager_conf_permission.rego
index 3b8275cd..6a494e32 100644
--- a/checks/kubernetes/cisbenchmarks/controllermamager/controller_manager_conf_permission.rego
+++ b/checks/kubernetes/cisbenchmarks/controllermamager/controller_manager_conf_permission.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0064
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/controllermamager/pod_spec_ownership.rego b/checks/kubernetes/cisbenchmarks/controllermamager/pod_spec_ownership.rego
index 2de151d8..d8805f30 100644
--- a/checks/kubernetes/cisbenchmarks/controllermamager/pod_spec_ownership.rego
+++ b/checks/kubernetes/cisbenchmarks/controllermamager/pod_spec_ownership.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0051
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/controllermamager/pod_spec_permission.rego b/checks/kubernetes/cisbenchmarks/controllermamager/pod_spec_permission.rego
index 545ef8a4..6e07b373 100644
--- a/checks/kubernetes/cisbenchmarks/controllermamager/pod_spec_permission.rego
+++ b/checks/kubernetes/cisbenchmarks/controllermamager/pod_spec_permission.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0050
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/etcd/data_directory_ownership.rego b/checks/kubernetes/cisbenchmarks/etcd/data_directory_ownership.rego
index a9586dc0..e576e5a9 100644
--- a/checks/kubernetes/cisbenchmarks/etcd/data_directory_ownership.rego
+++ b/checks/kubernetes/cisbenchmarks/etcd/data_directory_ownership.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0059
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/etcd/data_directory_permission.rego b/checks/kubernetes/cisbenchmarks/etcd/data_directory_permission.rego
index 7a25cfc4..82970e1a 100644
--- a/checks/kubernetes/cisbenchmarks/etcd/data_directory_permission.rego
+++ b/checks/kubernetes/cisbenchmarks/etcd/data_directory_permission.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0058
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/etcd/pod_spec_ownership.rego b/checks/kubernetes/cisbenchmarks/etcd/pod_spec_ownership.rego
index 0704cab8..6455a1e5 100644
--- a/checks/kubernetes/cisbenchmarks/etcd/pod_spec_ownership.rego
+++ b/checks/kubernetes/cisbenchmarks/etcd/pod_spec_ownership.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0055
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/etcd/pod_spec_permission.rego b/checks/kubernetes/cisbenchmarks/etcd/pod_spec_permission.rego
index 783daab1..f5f3ae38 100644
--- a/checks/kubernetes/cisbenchmarks/etcd/pod_spec_permission.rego
+++ b/checks/kubernetes/cisbenchmarks/etcd/pod_spec_permission.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0054
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/kubelet/certificate_authorities_file_ownership.rego b/checks/kubernetes/cisbenchmarks/kubelet/certificate_authorities_file_ownership.rego
index decd0098..d98d3f59 100644
--- a/checks/kubernetes/cisbenchmarks/kubelet/certificate_authorities_file_ownership.rego
+++ b/checks/kubernetes/cisbenchmarks/kubelet/certificate_authorities_file_ownership.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0076
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/kubelet/certificate_authorities_file_permission.rego b/checks/kubernetes/cisbenchmarks/kubelet/certificate_authorities_file_permission.rego
index bc97435d..a34d62ae 100644
--- a/checks/kubernetes/cisbenchmarks/kubelet/certificate_authorities_file_permission.rego
+++ b/checks/kubernetes/cisbenchmarks/kubelet/certificate_authorities_file_permission.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0075
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_anonymous_auth_argument.rego b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_anonymous_auth_argument.rego
index c71da248..4ebcd81c 100644
--- a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_anonymous_auth_argument.rego
+++ b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_anonymous_auth_argument.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0079
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_authorization_mode_argument.rego b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_authorization_mode_argument.rego
index 3132ef2e..3fc066a3 100644
--- a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_authorization_mode_argument.rego
+++ b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_authorization_mode_argument.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0080
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_client_ca_file_argument.rego b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_client_ca_file_argument.rego
index e14a0bae..7db4dc6d 100644
--- a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_client_ca_file_argument.rego
+++ b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_client_ca_file_argument.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0081
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_config_file_ownership.rego b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_config_file_ownership.rego
index 4f662f77..bba60fae 100644
--- a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_config_file_ownership.rego
+++ b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_config_file_ownership.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0074
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_config_file_permission.rego b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_config_file_permission.rego
index ea4e745f..c5511c76 100644
--- a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_config_file_permission.rego
+++ b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_config_file_permission.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0073
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_config_yaml_ownership.rego b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_config_yaml_ownership.rego
index eca14f71..4c3ab9af 100644
--- a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_config_yaml_ownership.rego
+++ b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_config_yaml_ownership.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0078
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_config_yaml_permission.rego b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_config_yaml_permission.rego
index 783f5896..19f58e03 100644
--- a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_config_yaml_permission.rego
+++ b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_config_yaml_permission.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0077
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_event_qps.rego b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_event_qps.rego
index 4744404c..274abdd9 100644
--- a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_event_qps.rego
+++ b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_event_qps.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0087
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_hostname_override.rego b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_hostname_override.rego
index 4d8beeac..f942999f 100644
--- a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_hostname_override.rego
+++ b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_hostname_override.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0086
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_make_iptables_util_chains.rego b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_make_iptables_util_chains.rego
index 41f12f39..305efee0 100644
--- a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_make_iptables_util_chains.rego
+++ b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_make_iptables_util_chains.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0084
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_only_use_strong_cryptographic.rego b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_only_use_strong_cryptographic.rego
index 195393f7..328e8b5e 100644
--- a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_only_use_strong_cryptographic.rego
+++ b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_only_use_strong_cryptographic.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0092
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_protect_kernel_defaults.rego b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_protect_kernel_defaults.rego
index 33b6030b..8c22eb73 100644
--- a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_protect_kernel_defaults.rego
+++ b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_protect_kernel_defaults.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0083
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_read_only_port_argument.rego b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_read_only_port_argument.rego
index bffbf9b0..ff7c7908 100644
--- a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_read_only_port_argument.rego
+++ b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_read_only_port_argument.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0082
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_rotate_certificates.rego b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_rotate_certificates.rego
index 9e1f7fd2..4582ba9a 100644
--- a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_rotate_certificates.rego
+++ b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_rotate_certificates.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0090
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_rotate_kubelet_server_certificate.rego b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_rotate_kubelet_server_certificate.rego
index 2aa30fa1..a2874a1a 100644
--- a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_rotate_kubelet_server_certificate.rego
+++ b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_rotate_kubelet_server_certificate.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0091
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_streaming_connection_argument.rego b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_streaming_connection_argument.rego
index 3d7b1789..18e6af67 100644
--- a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_streaming_connection_argument.rego
+++ b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_streaming_connection_argument.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0085
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_tls_cert_file.rego b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_tls_cert_file.rego
index 395b0a24..1a2c5e32 100644
--- a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_tls_cert_file.rego
+++ b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_tls_cert_file.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0088
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_tls_key_file.rego b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_tls_key_file.rego
index c97852f8..76ea6f15 100644
--- a/checks/kubernetes/cisbenchmarks/kubelet/kubelet_tls_key_file.rego
+++ b/checks/kubernetes/cisbenchmarks/kubelet/kubelet_tls_key_file.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0089
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/kubelet/kublet_service_file_ownership.rego b/checks/kubernetes/cisbenchmarks/kubelet/kublet_service_file_ownership.rego
index b5306f1a..3cf762c8 100644
--- a/checks/kubernetes/cisbenchmarks/kubelet/kublet_service_file_ownership.rego
+++ b/checks/kubernetes/cisbenchmarks/kubelet/kublet_service_file_ownership.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0070
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/kubelet/kublet_service_file_permission.rego b/checks/kubernetes/cisbenchmarks/kubelet/kublet_service_file_permission.rego
index 67b0b0f4..a4b03039 100644
--- a/checks/kubernetes/cisbenchmarks/kubelet/kublet_service_file_permission.rego
+++ b/checks/kubernetes/cisbenchmarks/kubelet/kublet_service_file_permission.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0069
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/kubelet/proxy_kube_config_file_ownership.rego b/checks/kubernetes/cisbenchmarks/kubelet/proxy_kube_config_file_ownership.rego
index c1f29543..c8dfa209 100644
--- a/checks/kubernetes/cisbenchmarks/kubelet/proxy_kube_config_file_ownership.rego
+++ b/checks/kubernetes/cisbenchmarks/kubelet/proxy_kube_config_file_ownership.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0072
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/kubelet/proxy_kube_config_file_permission.rego b/checks/kubernetes/cisbenchmarks/kubelet/proxy_kube_config_file_permission.rego
index d68bbeed..9439a3b9 100644
--- a/checks/kubernetes/cisbenchmarks/kubelet/proxy_kube_config_file_permission.rego
+++ b/checks/kubernetes/cisbenchmarks/kubelet/proxy_kube_config_file_permission.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0071
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/scheduler/pod_spec_ownership.rego b/checks/kubernetes/cisbenchmarks/scheduler/pod_spec_ownership.rego
index 19ff383e..6a70a504 100644
--- a/checks/kubernetes/cisbenchmarks/scheduler/pod_spec_ownership.rego
+++ b/checks/kubernetes/cisbenchmarks/scheduler/pod_spec_ownership.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0053
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/scheduler/pod_spec_permission.rego b/checks/kubernetes/cisbenchmarks/scheduler/pod_spec_permission.rego
index 49580c8c..f067988f 100644
--- a/checks/kubernetes/cisbenchmarks/scheduler/pod_spec_permission.rego
+++ b/checks/kubernetes/cisbenchmarks/scheduler/pod_spec_permission.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0052
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/scheduler/scheduler_conf_ownership.rego b/checks/kubernetes/cisbenchmarks/scheduler/scheduler_conf_ownership.rego
index 44a016a6..c4b88ad8 100644
--- a/checks/kubernetes/cisbenchmarks/scheduler/scheduler_conf_ownership.rego
+++ b/checks/kubernetes/cisbenchmarks/scheduler/scheduler_conf_ownership.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0063
 
 import data.lib.kubernetes
diff --git a/checks/kubernetes/cisbenchmarks/scheduler/scheduler_conf_permission.rego b/checks/kubernetes/cisbenchmarks/scheduler/scheduler_conf_permission.rego
index a948bbb5..f1075434 100644
--- a/checks/kubernetes/cisbenchmarks/scheduler/scheduler_conf_permission.rego
+++ b/checks/kubernetes/cisbenchmarks/scheduler/scheduler_conf_permission.rego
@@ -16,7 +16,7 @@
 #     selector:
 #     - type: kubernetes
 #       subtypes:
-#         - service: nodeinfo
+#         - kind: nodeinfo
 package builtin.kubernetes.KCV0062
 
 import data.lib.kubernetes