diff --git a/helm/trident-operator/templates/_helpers.tpl b/helm/trident-operator/templates/_helpers.tpl
index cb62e381c..03ba49e13 100644
--- a/helm/trident-operator/templates/_helpers.tpl
+++ b/helm/trident-operator/templates/_helpers.tpl
@@ -121,6 +121,7 @@ Trident ExcludeAutosupport
 {{- end }}
 {{- end }}
 
+{{/*
 Trident AutoSupport image
 */}}
 {{- define "trident.autosupportImage" -}}
diff --git a/helm/trident-operator/templates/tridentorchestrator.yaml b/helm/trident-operator/templates/tridentorchestrator.yaml
index f9f857b3f..b32a13070 100644
--- a/helm/trident-operator/templates/tridentorchestrator.yaml
+++ b/helm/trident-operator/templates/tridentorchestrator.yaml
@@ -65,8 +65,8 @@ spec:
   {{- end }}
   imagePullPolicy: {{ include "imagePullPolicy" $ }}
   windows: {{ .Values.windows }}
-  cloudProvider: {{ .Values.cloudProvider }}
-  cloudIdentity: {{ .Values.cloudIdentity }}
+  cloudProvider: {{ .Values.cloudProvider | quote }}
+  cloudIdentity: {{ .Values.cloudIdentity | quote }}
   enableACP: {{ .Values.enableACP }}
   acpImage: {{ .Values.acpImage }}
   enableAutoBackendConfig: {{ or .Values.ontapConfigurator.enabled .Values.anfConfigurator.enabled }}