diff --git a/charts/pulsar/Chart.yaml b/charts/pulsar/Chart.yaml
index 4cb8dc4..2ea2fbf 100644
--- a/charts/pulsar/Chart.yaml
+++ b/charts/pulsar/Chart.yaml
@@ -21,7 +21,7 @@ apiVersion: v1
 appVersion: "2.6.0"
 description: Apache Pulsar Helm chart for Kubernetes
 name: pulsar
-version: 2.6.0-1
+version: 2.6.0-2
 home: https://pulsar.apache.org
 sources:
 - https://github.com/apache/pulsar
diff --git a/charts/pulsar/templates/broker-rbac.yaml b/charts/pulsar/templates/broker-rbac.yaml
index 8f37ed7..763efae 100644
--- a/charts/pulsar/templates/broker-rbac.yaml
+++ b/charts/pulsar/templates/broker-rbac.yaml
@@ -17,11 +17,11 @@
 # under the License.
 #
 
-  {{- if .Values.extra.functionsAsPods }}
+{{- if or .Values.components.functions .Values.extra.functionsAsPods }}
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
-  name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.functions.component }}"
+  name: "{{ template "pulsar.fullname" . }}-{{ .Values.functions.component }}"
 rules:
 - apiGroups: [""]
   resources:
@@ -41,20 +41,20 @@ rules:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.functions.component }}"
+  name: "{{ template "pulsar.fullname" . }}-{{ .Values.functions.component }}"
   namespace: {{ .Values.namespace }}
 ---
 
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
-  name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.functions.component }}"
+  name: "{{ template "pulsar.fullname" . }}-{{ .Values.functions.component }}"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.functions.component }}"
+  name: "{{ template "pulsar.fullname" . }}-{{ .Values.functions.component }}"
 subjects:
 - kind: ServiceAccount
-  name: "{{ template "pulsar.fullname" . }}-{{ .Values.broker.functions.component }}"
+  name: "{{ template "pulsar.fullname" . }}-{{ .Values.functions.component }}"
   namespace: {{ .Values.namespace }}
-  {{- end }}
+{{- end }}
diff --git a/charts/pulsar/templates/grafana-ingress.yaml b/charts/pulsar/templates/grafana-ingress.yaml
index 79f4a8b..17f15b1 100644
--- a/charts/pulsar/templates/grafana-ingress.yaml
+++ b/charts/pulsar/templates/grafana-ingress.yaml
@@ -17,8 +17,8 @@
 # under the License.
 #
 
-  {{- if .Values.extra.monitoring}}
-  {{- if .Values.grafana.ingress.enabled }}
+{{- if or .Values.monitoring.grafana .Values.extra.monitoring }}
+{{- if .Values.grafana.ingress.enabled }}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
@@ -46,5 +46,5 @@ spec:
           backend:
             serviceName: "{{ template "pulsar.fullname" . }}-{{ .Values.grafana.component }}"
             servicePort: {{ .Values.grafana.ingress.port }}
-  {{- end }}
-  {{- end }}
+{{- end }}
+{{- end }}