diff --git a/assets/rancher-cis-benchmark/rancher-cis-benchmark-0.0.1.tgz b/assets/rancher-cis-benchmark/rancher-cis-benchmark-0.0.1.tgz
deleted file mode 100644
index 0e790022d..000000000
Binary files a/assets/rancher-cis-benchmark/rancher-cis-benchmark-0.0.1.tgz and /dev/null differ
diff --git a/assets/rancher-cis-benchmark/rancher-cis-benchmark-crd-0.0.1.tgz b/assets/rancher-cis-benchmark/rancher-cis-benchmark-crd-0.0.1.tgz
deleted file mode 100644
index 03f7ac0e1..000000000
Binary files a/assets/rancher-cis-benchmark/rancher-cis-benchmark-crd-0.0.1.tgz and /dev/null differ
diff --git a/packages/rancher-cis-benchmark/charts/templates/network_policy_allow_all.yaml b/packages/rancher-cis-benchmark/charts/templates/network_policy_allow_all.yaml
index 9c4150397..6ed5d645e 100644
--- a/packages/rancher-cis-benchmark/charts/templates/network_policy_allow_all.yaml
+++ b/packages/rancher-cis-benchmark/charts/templates/network_policy_allow_all.yaml
@@ -12,4 +12,4 @@ spec:
   - {}
   policyTypes:
   - Ingress
-  - Egress
\ No newline at end of file
+  - Egress
diff --git a/packages/rancher-cis-benchmark/charts/templates/patch_default_serviceaccount.yaml b/packages/rancher-cis-benchmark/charts/templates/patch_default_serviceaccount.yaml
index bac5b717a..1efa3ed1c 100644
--- a/packages/rancher-cis-benchmark/charts/templates/patch_default_serviceaccount.yaml
+++ b/packages/rancher-cis-benchmark/charts/templates/patch_default_serviceaccount.yaml
@@ -5,7 +5,7 @@ metadata:
   name: patch-sa
   annotations:
     "helm.sh/hook": post-install, post-upgrade
-    "helm.sh/hook-delete-policy": hook-succeeded, before-hook-creation, hook-failed
+    "helm.sh/hook-delete-policy": hook-succeeded, before-hook-creation
 spec:
   template:
     spec:
@@ -15,5 +15,6 @@ spec:
       - name: sa
         image: "{{ template "system_default_registry" . }}{{ .Values.global.kubectl.repository }}:{{ .Values.global.kubectl.tag }}"
         imagePullPolicy: {{ .Values.global.imagePullPolicy }}
-        command: ["kubectl", "patch", "serviceaccount", "-n", "cis-operator-system", "default", "-p", "{\"automountServiceAccountToken\": false}"]
-  backoffLimit: 1
\ No newline at end of file
+        command: ["kubectl", "patch", "serviceaccount", "default", "-p", "{\"automountServiceAccountToken\": false}"]
+        args: ["-n", {{ template "cis.namespace" . }}]
+  backoffLimit: 1
diff --git a/packages/rancher-cis-benchmark/charts/values.yaml b/packages/rancher-cis-benchmark/charts/values.yaml
index 6bbbd1f56..dd6fc2b9d 100644
--- a/packages/rancher-cis-benchmark/charts/values.yaml
+++ b/packages/rancher-cis-benchmark/charts/values.yaml
@@ -35,5 +35,5 @@ global:
   cattle:
     systemDefaultRegistry: ""
   kubectl:
-    repository: rancher/istio-kubectl
-    tag: 1.4.6
\ No newline at end of file
+    repository: rancher/kubectl
+    tag: v1.18.6