diff --git a/helm/templates/NOTES.txt b/helm/templates/NOTES.txt
index bcf3d52..0255a88 100644
--- a/helm/templates/NOTES.txt
+++ b/helm/templates/NOTES.txt
@@ -6,7 +6,7 @@ The NuvlaEdge has just been installed on your Kubernetes node {{ .Values.kuberne
    for the certificate used to manage the NuvlaEdge instance please run the
    following command as system admin of the K8s cluster:{{printf "\n\n" }}
 
-   {{- if .Values.SET_MULTIPLE -}}
+   {{- if eq .Values.credManager.csr_name "nuvlaedge-csr" -}}
      kubectl certificate approve {{ .Values.credManager.csr_name }}{{ printf "-" }}{{ include "nuvlaedge.uuid" . }}{{printf "\n\n" }}
    {{- else -}}
      kubectl certificate approve {{ .Values.credManager.csr_name }}{{printf "\n\n" }}
diff --git a/helm/templates/kubernetes-credentials-manager-job.yaml b/helm/templates/kubernetes-credentials-manager-job.yaml
index a61bc39..9706f7a 100644
--- a/helm/templates/kubernetes-credentials-manager-job.yaml
+++ b/helm/templates/kubernetes-credentials-manager-job.yaml
@@ -32,8 +32,6 @@ spec:
               value: {{ .Values.NUVLAEDGE_UUID }}
             - name: MY_NAMESPACE
               value: {{ include "nuvlaedge.namespace" . }}
-            - name: SET_MULTIPLE
-              value: {{ .Values.SET_MULTIPLE }}
       volumes:
         - name: nuvlaedge-data
           hostPath: