diff --git a/charts/fission-all/templates/_helpers.tpl b/charts/fission-all/templates/_helpers.tpl
index 60f4fa4e..a0988442 100644
--- a/charts/fission-all/templates/_helpers.tpl
+++ b/charts/fission-all/templates/_helpers.tpl
@@ -100,6 +100,6 @@ Define the svc's name
 {{- if .Values.builderNamespace -}}
 {{- printf "%s" .Values.builderNamespace -}}
 {{- else -}}
-{{- printf "%s" .Values.builderNamespace -}}
+{{- printf "%s" .Values.defaultNamespace -}}
 {{- end -}}
 {{- end -}}
diff --git a/charts/fission-all/templates/buildermgr/role-kubernetes.yaml b/charts/fission-all/templates/buildermgr/role-kubernetes.yaml
index e6d39662..b33e2217 100644
--- a/charts/fission-all/templates/buildermgr/role-kubernetes.yaml
+++ b/charts/fission-all/templates/buildermgr/role-kubernetes.yaml
@@ -4,10 +4,10 @@
 {{- range $namespace := $.Values.additionalFissionNamespaces }}
 {{ include "kubernetes-role-generator" (merge (dict "namespace" $namespace "component" "buildermgr") $) }}
 {{- end }}
+{{- end }}
 {{- if .Values.builderNamespace -}}
 {{ include "kubernetes-role-generator" (merge (dict "namespace" .Values.builderNamespace "component" "buildermgr") $) }}
 {{- end }}
 {{- if .Values.functionNamespace -}}
 {{ include "kubernetes-role-generator" (merge (dict "namespace" .Values.functionNamespace "component" "buildermgr") $) }}
 {{- end }}
-{{- end }}
diff --git a/charts/fission-all/templates/controller/role-kubernetes.yaml b/charts/fission-all/templates/controller/role-kubernetes.yaml
index 0716635c..f00fc113 100644
--- a/charts/fission-all/templates/controller/role-kubernetes.yaml
+++ b/charts/fission-all/templates/controller/role-kubernetes.yaml
@@ -4,10 +4,10 @@
 {{- range $namespace := $.Values.additionalFissionNamespaces }}
 {{ include "kubernetes-role-generator" (merge (dict "namespace" $namespace "component" "controller") $) }}
 {{- end }}
+{{- end }}
 {{- if .Values.builderNamespace -}}
 {{ include "kubernetes-role-generator" (merge (dict "namespace" .Values.builderNamespace "component" "controller") $) }}
 {{- end }}
 {{- if .Values.functionNamespace -}}
 {{ include "kubernetes-role-generator" (merge (dict "namespace" .Values.functionNamespace "component" "controller") $) }}
-{{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/fission-all/templates/executor/role-kubernetes.yaml b/charts/fission-all/templates/executor/role-kubernetes.yaml
index cac67ba0..479d563b 100644
--- a/charts/fission-all/templates/executor/role-kubernetes.yaml
+++ b/charts/fission-all/templates/executor/role-kubernetes.yaml
@@ -4,10 +4,10 @@
 {{- range $namespace := $.Values.additionalFissionNamespaces }}
 {{ include "kubernetes-role-generator" (merge (dict "namespace" $namespace "component" "executor") $) }}
 {{- end }}
+{{- end }}
 {{- if .Values.builderNamespace -}}
 {{ include "kubernetes-role-generator" (merge (dict "namespace" .Values.builderNamespace "component" "executor") $) }}
 {{- end }}
 {{- if .Values.functionNamespace -}}
 {{ include "kubernetes-role-generator" (merge (dict "namespace" .Values.functionNamespace "component" "executor") $) }}
 {{- end }}
-{{- end }}