diff --git a/kiali-operator/templates/clusterrolebinding.yaml b/kiali-operator/templates/clusterrolebinding.yaml
index 6f24e9e..747939b 100644
--- a/kiali-operator/templates/clusterrolebinding.yaml
+++ b/kiali-operator/templates/clusterrolebinding.yaml
@@ -8,7 +8,7 @@ metadata:
 subjects:
 - kind: ServiceAccount
   name: {{ include "kiali-operator.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: "{{ .Release.Namespace }}"
 roleRef:
   kind: ClusterRole
   name: {{ include "kiali-operator.fullname" . }}
diff --git a/kiali-operator/templates/deployment.yaml b/kiali-operator/templates/deployment.yaml
index a46074e..14f4967 100644
--- a/kiali-operator/templates/deployment.yaml
+++ b/kiali-operator/templates/deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "kiali-operator.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: "{{ .Release.Namespace }}"
   labels:
   {{- include "kiali-operator.labels" . | nindent 4 }}
 spec:
@@ -14,7 +14,7 @@ spec:
   template:
     metadata:
       name: {{ include "kiali-operator.fullname" . }}
-      namespace: {{ .Release.Namespace }}
+      namespace: "{{ .Release.Namespace }}"
       labels:
         # required for the operator SDK metric service selector
         name: {{ include "kiali-operator.fullname" . }}
diff --git a/kiali-operator/templates/kiali-cr.yaml b/kiali-operator/templates/kiali-cr.yaml
index 38fb82f..ef77353 100644
--- a/kiali-operator/templates/kiali-cr.yaml
+++ b/kiali-operator/templates/kiali-cr.yaml
@@ -4,9 +4,9 @@ apiVersion: kiali.io/v1alpha1
 kind: Kiali
 metadata:
   {{- if .Values.watchNamespace }}
-  namespace: {{ .Values.watchNamespace }}
+  namespace: "{{ .Values.watchNamespace }}"
   {{- else if .Values.cr.namespace }}
-  namespace: {{ .Values.cr.namespace }}
+  namespace: "{{ .Values.cr.namespace }}"
   {{- end }}
   name: {{ .Values.cr.name }}
   labels:
diff --git a/kiali-operator/templates/serviceaccount.yaml b/kiali-operator/templates/serviceaccount.yaml
index 53638b3..64e8238 100644
--- a/kiali-operator/templates/serviceaccount.yaml
+++ b/kiali-operator/templates/serviceaccount.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "kiali-operator.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: "{{ .Release.Namespace }}"
   labels:
   {{- include "kiali-operator.labels" . | nindent 4 }}
 {{- if .Values.image.pullSecrets }}
diff --git a/kiali-server/templates/cabundle.yaml b/kiali-server/templates/cabundle.yaml
index 7462b95..7e87ed0 100644
--- a/kiali-server/templates/cabundle.yaml
+++ b/kiali-server/templates/cabundle.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "kiali-server.fullname" . }}-cabundle
-  namespace: {{ .Release.Namespace }}
+  namespace: "{{ .Release.Namespace }}"
   labels:
     {{- include "kiali-server.labels" . | nindent 4 }}
   annotations:
diff --git a/kiali-server/templates/configmap.yaml b/kiali-server/templates/configmap.yaml
index f97d6da..45b571e 100644
--- a/kiali-server/templates/configmap.yaml
+++ b/kiali-server/templates/configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "kiali-server.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: "{{ .Release.Namespace }}"
   labels:
     {{- include "kiali-server.labels" . | nindent 4 }}
   {{- if .Values.deployment.configmap_annotations }}
diff --git a/kiali-server/templates/deployment.yaml b/kiali-server/templates/deployment.yaml
index 34560fc..270aa7b 100644
--- a/kiali-server/templates/deployment.yaml
+++ b/kiali-server/templates/deployment.yaml
@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "kiali-server.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: "{{ .Release.Namespace }}"
   labels:
     {{- include "kiali-server.labels" . | nindent 4 }}
 spec:
diff --git a/kiali-server/templates/hpa.yaml b/kiali-server/templates/hpa.yaml
index 934c4c1..60e5a01 100644
--- a/kiali-server/templates/hpa.yaml
+++ b/kiali-server/templates/hpa.yaml
@@ -4,7 +4,7 @@ apiVersion: {{ .Values.deployment.hpa.api_version }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "kiali-server.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: "{{ .Release.Namespace }}"
   labels:
     {{- include "kiali-server.labels" . | nindent 4 }}
 spec:
diff --git a/kiali-server/templates/ingress.yaml b/kiali-server/templates/ingress.yaml
index 27807fc..2a937dc 100644
--- a/kiali-server/templates/ingress.yaml
+++ b/kiali-server/templates/ingress.yaml
@@ -9,7 +9,7 @@ apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: {{ include "kiali-server.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: "{{ .Release.Namespace }}"
   labels:
     {{- if .Values.deployment.ingress.additional_labels }}
     {{- toYaml .Values.deployment.ingress.additional_labels | nindent 4 }}
diff --git a/kiali-server/templates/oauth.yaml b/kiali-server/templates/oauth.yaml
index 8658c7f..850c95e 100644
--- a/kiali-server/templates/oauth.yaml
+++ b/kiali-server/templates/oauth.yaml
@@ -5,7 +5,7 @@ apiVersion: oauth.openshift.io/v1
 kind: OAuthClient
 metadata:
   name: {{ include "kiali-server.fullname" . }}-{{ .Release.Namespace }}
-  namespace: {{ .Release.Namespace }}
+  namespace: "{{ .Release.Namespace }}"
   labels:
     {{- include "kiali-server.labels" . | nindent 4 }}
 redirectURIs:
diff --git a/kiali-server/templates/role-controlplane.yaml b/kiali-server/templates/role-controlplane.yaml
index 707501c..07bb535 100644
--- a/kiali-server/templates/role-controlplane.yaml
+++ b/kiali-server/templates/role-controlplane.yaml
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: {{ include "kiali-server.fullname" . }}-controlplane
-  namespace: {{ include "kiali-server.istio_namespace" . }}
+  namespace: "{{ include "kiali-server.istio_namespace" . }}"
   labels:
     {{- include "kiali-server.labels" . | nindent 4 }}
 rules:
diff --git a/kiali-server/templates/rolebinding-controlplane.yaml b/kiali-server/templates/rolebinding-controlplane.yaml
index 5a00158..fbaa2c2 100644
--- a/kiali-server/templates/rolebinding-controlplane.yaml
+++ b/kiali-server/templates/rolebinding-controlplane.yaml
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: {{ include "kiali-server.fullname" . }}-controlplane
-  namespace: {{ include "kiali-server.istio_namespace" . }}
+  namespace: "{{ include "kiali-server.istio_namespace" . }}"
   labels:
     {{- include "kiali-server.labels" . | nindent 4 }}
 roleRef:
@@ -13,5 +13,5 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: {{ include "kiali-server.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: "{{ .Release.Namespace }}"
 ...
diff --git a/kiali-server/templates/rolebinding.yaml b/kiali-server/templates/rolebinding.yaml
index 63f1922..dd0d585 100644
--- a/kiali-server/templates/rolebinding.yaml
+++ b/kiali-server/templates/rolebinding.yaml
@@ -20,5 +20,5 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: {{ include "kiali-server.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: "{{ .Release.Namespace }}"
 ...
diff --git a/kiali-server/templates/route.yaml b/kiali-server/templates/route.yaml
index 8325c14..eb10b01 100644
--- a/kiali-server/templates/route.yaml
+++ b/kiali-server/templates/route.yaml
@@ -6,7 +6,7 @@ apiVersion: route.openshift.io/v1
 kind: Route
 metadata:
   name: {{ include "kiali-server.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: "{{ .Release.Namespace }}"
   labels:
     {{- if .Values.deployment.ingress.additional_labels }}
     {{- toYaml .Values.deployment.ingress.additional_labels | nindent 4 }}
diff --git a/kiali-server/templates/service.yaml b/kiali-server/templates/service.yaml
index 111be7f..af87982 100644
--- a/kiali-server/templates/service.yaml
+++ b/kiali-server/templates/service.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "kiali-server.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: "{{ .Release.Namespace }}"
   labels:
     {{- include "kiali-server.labels" . | nindent 4 }}
   annotations:
diff --git a/kiali-server/templates/serviceaccount.yaml b/kiali-server/templates/serviceaccount.yaml
index 9151b6f..995d580 100644
--- a/kiali-server/templates/serviceaccount.yaml
+++ b/kiali-server/templates/serviceaccount.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "kiali-server.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: "{{ .Release.Namespace }}"
   labels:
     {{- include "kiali-server.labels" . | nindent 4 }}
 ...