diff --git a/tests/assertions/ocp4/ocp4-cis-4.17.yml b/tests/assertions/ocp4/ocp4-cis-4.17.yml
index 35c567940369..1118ba70a5e8 100644
--- a/tests/assertions/ocp4/ocp4-cis-4.17.yml
+++ b/tests/assertions/ocp4/ocp4-cis-4.17.yml
@@ -78,14 +78,14 @@ rule_results:
    default_result: PASS
    result_after_remediation: PASS
  e2e-cis-api-server-kubelet-client-cert:
-   default_result: NOT-APPLICABLE
-   result_after_remediation: NOT-APPLICABLE
+   default_result: PASS
+   result_after_remediation: PASS
  e2e-cis-api-server-kubelet-client-cert-pre-4-9:
    default_result: NOT-APPLICABLE
    result_after_remediation: NOT-APPLICABLE
  e2e-cis-api-server-kubelet-client-key:
-   default_result: NOT-APPLICABLE
-   result_after_remediation: NOT-APPLICABLE
+   default_result: PASS
+   result_after_remediation: PASS
  e2e-cis-api-server-kubelet-client-key-pre-4-9:
    default_result: NOT-APPLICABLE
    result_after_remediation: NOT-APPLICABLE
diff --git a/tests/assertions/ocp4/ocp4-high-4.17.yml b/tests/assertions/ocp4/ocp4-high-4.17.yml
index 9e56115478fb..c19e806d89f9 100644
--- a/tests/assertions/ocp4/ocp4-high-4.17.yml
+++ b/tests/assertions/ocp4/ocp4-high-4.17.yml
@@ -90,14 +90,14 @@ rule_results:
    default_result: PASS
    result_after_remediation: PASS
  e2e-high-api-server-kubelet-client-cert:
-   default_result: NOT-APPLICABLE
-   result_after_remediation: NOT-APPLICABLE
+   default_result: PASS
+   result_after_remediation: PASS
  e2e-high-api-server-kubelet-client-cert-pre-4-9:
    default_result: NOT-APPLICABLE
    result_after_remediation: NOT-APPLICABLE
  e2e-high-api-server-kubelet-client-key:
-   default_result: NOT-APPLICABLE
-   result_after_remediation: NOT-APPLICABLE
+   default_result: PASS
+   result_after_remediation: PASS
  e2e-high-api-server-kubelet-client-key-pre-4-9:
    default_result: NOT-APPLICABLE
    result_after_remediation: NOT-APPLICABLE
diff --git a/tests/assertions/ocp4/ocp4-moderate-4.17.yml b/tests/assertions/ocp4/ocp4-moderate-4.17.yml
index 867aa8a10ff3..1430b76baa2a 100644
--- a/tests/assertions/ocp4/ocp4-moderate-4.17.yml
+++ b/tests/assertions/ocp4/ocp4-moderate-4.17.yml
@@ -87,14 +87,14 @@ rule_results:
    default_result: PASS
    result_after_remediation: PASS
  e2e-moderate-api-server-kubelet-client-cert:
-   default_result: NOT-APPLICABLE
-   result_after_remediation: NOT-APPLICABLE
+   default_result: PASS
+   result_after_remediation: PASS
  e2e-moderate-api-server-kubelet-client-cert-pre-4-9:
    default_result: NOT-APPLICABLE
    result_after_remediation: NOT-APPLICABLE
  e2e-moderate-api-server-kubelet-client-key:
-   default_result: NOT-APPLICABLE
-   result_after_remediation: NOT-APPLICABLE
+   default_result: PASS
+   result_after_remediation: PASS
  e2e-moderate-api-server-kubelet-client-key-pre-4-9:
    default_result: NOT-APPLICABLE
    result_after_remediation: NOT-APPLICABLE
diff --git a/tests/assertions/ocp4/ocp4-pci-dss-4-0-4.17.yml b/tests/assertions/ocp4/ocp4-pci-dss-4-0-4.17.yml
index 96000b058537..7631dbd67ee3 100644
--- a/tests/assertions/ocp4/ocp4-pci-dss-4-0-4.17.yml
+++ b/tests/assertions/ocp4/ocp4-pci-dss-4-0-4.17.yml
@@ -78,14 +78,14 @@ rule_results:
    default_result: PASS
    result_after_remediation: PASS
  e2e-pci-dss-4-0-api-server-kubelet-client-cert:
-   default_result: NOT-APPLICABLE
-   result_after_remediation: NOT-APPLICABLE
+   default_result: PASS
+   result_after_remediation: PASS
  e2e-pci-dss-4-0-api-server-kubelet-client-cert-pre-4-9:
    default_result: NOT-APPLICABLE
    result_after_remediation: NOT-APPLICABLE
  e2e-pci-dss-4-0-api-server-kubelet-client-key:
-   default_result: NOT-APPLICABLE
-   result_after_remediation: NOT-APPLICABLE
+   default_result: PASS
+   result_after_remediation: PASS
  e2e-pci-dss-4-0-api-server-kubelet-client-key-pre-4-9:
    default_result: NOT-APPLICABLE
    result_after_remediation: NOT-APPLICABLE
diff --git a/tests/assertions/ocp4/ocp4-stig-4.17.yml b/tests/assertions/ocp4/ocp4-stig-4.17.yml
index c7c40832ac76..3e5b2ccedcc1 100644
--- a/tests/assertions/ocp4/ocp4-stig-4.17.yml
+++ b/tests/assertions/ocp4/ocp4-stig-4.17.yml
@@ -81,14 +81,14 @@ rule_results:
    default_result: PASS
    result_after_remediation: PASS
  e2e-stig-api-server-kubelet-client-cert:
-   default_result: NOT-APPLICABLE
-   result_after_remediation: NOT-APPLICABLE
+   default_result: PASS
+   result_after_remediation: PASS
  e2e-stig-api-server-kubelet-client-cert-pre-4-9:
    default_result: NOT-APPLICABLE
    result_after_remediation: NOT-APPLICABLE
  e2e-stig-api-server-kubelet-client-key:
-   default_result: NOT-APPLICABLE
-   result_after_remediation: NOT-APPLICABLE
+   default_result: PASS
+   result_after_remediation: PASS
  e2e-stig-api-server-kubelet-client-key-pre-4-9:
    default_result: NOT-APPLICABLE
    result_after_remediation: NOT-APPLICABLE