diff --git a/charts/aws-efs-csi-driver/templates/_helpers.tpl b/charts/aws-efs-csi-driver/templates/_helpers.tpl
index 01793e89c..f3fe5f424 100644
--- a/charts/aws-efs-csi-driver/templates/_helpers.tpl
+++ b/charts/aws-efs-csi-driver/templates/_helpers.tpl
@@ -60,7 +60,7 @@ Create a string out of the map for controller tags flag
 */}}
 {{- define "aws-efs-csi-driver.tags" -}}
 {{- $tags := list -}}
-{{ range $key, $val := .Values.controller.tags }}
+{{ range $key, $val := . }}
 {{- $tags = print $key ":" $val | append $tags -}}
 {{- end -}}
 {{- join " " $tags | quote -}}
diff --git a/charts/aws-efs-csi-driver/templates/controller-deployment.yaml b/charts/aws-efs-csi-driver/templates/controller-deployment.yaml
index 8b555030e..83adfe31e 100644
--- a/charts/aws-efs-csi-driver/templates/controller-deployment.yaml
+++ b/charts/aws-efs-csi-driver/templates/controller-deployment.yaml
@@ -56,7 +56,7 @@ spec:
             # Uncomment below line to allow access point root directory to be deleted by controller.
             #- --delete-access-point-root-dir
             {{- if .Values.controller.tags }}
-            - --tags={{ include "aws-efs-csi-driver.tags" . }}
+            - --tags={{ include "aws-efs-csi-driver.tags" .Values.controller.tags }}
             {{- end }}
           env:
             - name: CSI_ENDPOINT
diff --git a/charts/aws-efs-csi-driver/values.yaml b/charts/aws-efs-csi-driver/values.yaml
index e40747be0..b44bed820 100644
--- a/charts/aws-efs-csi-driver/values.yaml
+++ b/charts/aws-efs-csi-driver/values.yaml
@@ -84,8 +84,8 @@ controller:
   create: true
   # Add additional tags to access points
   tags: {}
-    #  environment: prod
-    #  region: us-east-1
+    # environment: prod
+    # region: us-east-1
 
 storageClasses: []
 # Add StorageClass resources like: