diff --git a/helm/templates/00-rbac.yaml b/helm/templates/00-rbac.yaml
index 3445db7..9453f6b 100644
--- a/helm/templates/00-rbac.yaml
+++ b/helm/templates/00-rbac.yaml
@@ -6,9 +6,6 @@
 {{- if .Values.global.instanceNamespace }}
   {{- $namespaces = append $namespaces .Values.global.instanceNamespace }}
 {{- end }}
-{{- if .Values.cpfs.labels }}
-  {{- $labels := .Values.cpfs.labels }}
-{{- end }}
 {{- range $i := $namespaces }}
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
@@ -17,11 +14,11 @@ metadata:
   namespace: {{ $i }}
   labels:
     component-id: {{ $chartName }}
-    {{- if .Values.cpfs.labels }}
-      {{- with $labels }}
+    {{- if $.Values.cpfs.labels }}
+      {{- with $.Values.cpfs.labels }}
         {{- toYaml . | nindent 4 }}
       {{- end }}
-    {{- end }}
+    {{- end}}
 rules:
   - verbs:
       - create
@@ -102,11 +99,11 @@ metadata:
   namespace: {{ $i }}
   labels:
     component-id: {{ $chartName }}
-    {{- if .Values.cpfs.labels }}
-      {{- with $labels }}
+    {{- if $.Values.cpfs.labels }}
+      {{- with $.Values.cpfs.labels }}
         {{- toYaml . | nindent 4 }}
       {{- end }}
-    {{- end }}
+    {{- end}}
 subjects:
   - kind: ServiceAccount
     name: ibm-namespace-scope-operator
@@ -126,9 +123,9 @@ metadata:
     app.kubernetes.io/name: ibm-namespace-scope-operator
     component-id: {{ .Chart.Name }}
     {{- if .Values.cpfs.labels }}
-      {{- with $labels }}
+      {{- with .Values.cpfs.labels }}
         {{- toYaml . | nindent 4 }}
       {{- end }}
-    {{- end }}
+    {{- end}}
   name: ibm-namespace-scope-operator
   namespace: {{ .Values.global.operatorNamespace }}
\ No newline at end of file