diff --git a/charts/csi-powermax/templates/powermax-array-config.yaml b/charts/csi-powermax/templates/powermax-array-config.yaml
index 6c23b268..28f58939 100644
--- a/charts/csi-powermax/templates/powermax-array-config.yaml
+++ b/charts/csi-powermax/templates/powermax-array-config.yaml
@@ -7,5 +7,8 @@ data:
   powermax-array-config.yaml: |
     X_CSI_POWERMAX_PORTGROUPS: {{ .Values.global.portGroups | toYaml | default "" }}
     X_CSI_TRANSPORT_PROTOCOL: {{ .Values.global.transportProtocol | toYaml | default "" }}
-    X_CSI_POWERMAX_ENDPOINT: {{ .Values.global.endpoint | toYaml | default "" }}
+    {{- $_ := first .Values.global.storageArrays }}
+    {{- range $index, $value := .Values.global.storageArrays }}
+    X_CSI_POWERMAX_ENDPOINT: {{ $value.endpoint | toYaml | default "" }}
+    {{- end }}
     X_CSI_MANAGED_ARRAYS: {{ .Values.global.managedArrays | toYaml | default "" }}
diff --git a/charts/csi-powermax/values.yaml b/charts/csi-powermax/values.yaml
index 4d7a1e93..21ec463c 100644
--- a/charts/csi-powermax/values.yaml
+++ b/charts/csi-powermax/values.yaml
@@ -19,11 +19,6 @@ global:
   # Default value: None
   # Examples: "000000000001", "000000000002"
   managedArrays: "000000000001,000000000002"
-  # X_CSI_POWERMAX_ENDPOINT: Address of the Unisphere server that is managing the PowerMax arrays
-  # In case of multi-array, provide an endpoint of locally attached array
-  # Default value: None
-  # Example: https://0.0.0.1:8443
-  endpoint:
   # defaultCredentialsSecret
   defaultCredentialsSecret: powermax-creds
   # portGroups: Define the set of existing port groups that the driver will use.