diff --git a/scripts/helmcharts/openreplay/charts/assets/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/assets/templates/deployment.yaml
index 07977bfe6..1af5164ca 100644
--- a/scripts/helmcharts/openreplay/charts/assets/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/assets/templates/deployment.yaml
@@ -43,7 +43,7 @@ spec:
             - name: AWS_SECRET_ACCESS_KEY
               value: {{ .Values.global.s3.secretKey }}
             - name: S3_BUCKET_ASSETS
-              value: '{{ .Values.global.s3.assetsBucket }}'
+              value: {{ .Values.global.s3.assetsBucket }}
             - name: LICENSE_KEY
               value: '{{ .Values.global.enterpriseEditionLicense }}'
             - name: AWS_ENDPOINT
@@ -59,7 +59,7 @@ spec:
             # Ref: https://stackoverflow.com/questions/53634583/go-template-split-string-by-delimiter
             # We need https://bucketname.s3endpoint
             - name: ASSETS_ORIGIN
-              value: '{{ (split "://" .Values.global.s3.endpoint)._0 }}://{{.Values.global.s3.assetsBucket}}.{{ (split "://" .Values.global.s3.endpoint)._1 }}'
+              value: {{ (split "://" .Values.global.s3.endpoint)._0 }}://{{.Values.global.s3.assetsBucket}}.{{ (split "://" .Values.global.s3.endpoint)._1 }}
             {{- range $key, $val := .Values.env }}
             - name: {{ $key }}
               value: '{{ $val }}'
diff --git a/scripts/helmcharts/openreplay/charts/chalice/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/chalice/templates/deployment.yaml
index 6282def51..f3eb46d1d 100644
--- a/scripts/helmcharts/openreplay/charts/chalice/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/chalice/templates/deployment.yaml
@@ -69,11 +69,11 @@ spec:
             - name: sessions_region
               value: '{{ .Values.global.s3.region }}' 
             - name: sessions_bucket
-              value: '{{ .Values.global.s3.recordingsBucket }}'
+              value: {{ .Values.global.s3.recordingsBucket }}
             - name: sourcemaps_bucket
-              value: '{{ .Values.global.s3.sourcemapsBucket }}' 
+              value: {{ .Values.global.s3.sourcemapsBucket }} 
             - name: js_cache_bucket
-              value: '{{ .Values.global.s3.assetsBucket }}' 
+              value: {{ .Values.global.s3.assetsBucket }} 
             - name: EMAIL_HOST
               value: '{{ .Values.global.email.emailHost }}'
             - name: EMAIL_PORT
diff --git a/scripts/helmcharts/openreplay/charts/http/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/http/templates/deployment.yaml
index 8ec91c939..d728b7d02 100644
--- a/scripts/helmcharts/openreplay/charts/http/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/http/templates/deployment.yaml
@@ -55,7 +55,7 @@ spec:
             - name: POSTGRES_STRING
               value: 'postgres://{{ .Values.global.postgresql.postgresqlUser }}:{{ .Values.global.postgresql.postgresqlPassword }}@{{ .Values.global.postgresql.postgresqlHost }}:{{ .Values.global.postgresql.postgresqlPort }}/{{ .Values.global.postgresql.postgresqlDatabase }}'
             - name: ASSETS_ORIGIN
-              value: '{{ (split "://" .Values.global.s3.endpoint)._0 }}://{{.Values.global.s3.assetsBucket}}.{{ (split "://" .Values.global.s3.endpoint)._1 }}'
+              value: {{ (split "://" .Values.global.s3.endpoint)._0 }}://{{.Values.global.s3.assetsBucket}}.{{ (split "://" .Values.global.s3.endpoint)._1 }}
             {{- range $key, $val := .Values.env }}
             - name: {{ $key }}
               value: '{{ $val }}'
diff --git a/scripts/helmcharts/openreplay/charts/storage/templates/deployment.yaml b/scripts/helmcharts/openreplay/charts/storage/templates/deployment.yaml
index 2ea80f0e4..0004bfc7f 100644
--- a/scripts/helmcharts/openreplay/charts/storage/templates/deployment.yaml
+++ b/scripts/helmcharts/openreplay/charts/storage/templates/deployment.yaml
@@ -49,9 +49,9 @@ spec:
             - name: AWS_REGION_IOS
               value: '{{ .Values.global.s3.region }}'
             - name: S3_BUCKET_WEB
-              value: '{{ .Values.global.s3.recordingsBucket }}'
+              value: {{ .Values.global.s3.recordingsBucket }}
             - name: S3_BUCKET_IOS
-              value: '{{ .Values.global.s3.recordingsBucket }}'
+              value: {{ .Values.global.s3.recordingsBucket }}
             - name: REDIS_STRING
               value: '{{ .Values.global.redis.redisHost }}:{{ .Values.global.redis.redisPort }}'
             - name: LICENSE_KEY