diff --git a/helm-chart/templates/02-cluster-role.yaml b/helm-chart/templates/02-cluster-role.yaml
index 09126b64b..6b5094ac4 100644
--- a/helm-chart/templates/02-cluster-role.yaml
+++ b/helm-chart/templates/02-cluster-role.yaml
@@ -69,9 +69,18 @@ rules:
       - secrets
       - configmaps
     verbs:
+      - create
       - get
       - watch
       - list
       - update
       - patch
       - delete
+  - apiGroups:
+      - ""
+      - v1
+    resources:
+      - secrets
+      - configmaps
+    verbs:
+      - create
diff --git a/helm-chart/templates/18-cleanup-job.yaml b/helm-chart/templates/18-cleanup-job.yaml
index 3c36d626f..3dee7cd0f 100644
--- a/helm-chart/templates/18-cleanup-job.yaml
+++ b/helm-chart/templates/18-cleanup-job.yaml
@@ -21,4 +21,4 @@ spec:
         {{- end }}
           command: ["/bin/sh", "-c"]
           args:
-            - "kubectl delete cm kubeshark-config-map && kubectl delete secret kubeshark-secret"
\ No newline at end of file
+            - "kubectl delete cm kubeshark-config-map || true && kubectl delete secret kubeshark-secret || true"
\ No newline at end of file