diff --git a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
index 2d95c4402d..75f78123a7 100644
--- a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
+++ b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-controller.yaml
@@ -292,13 +292,11 @@ spec:
               name: socket-dir
             - mountPath: /etc/kubernetes/
               name: azure-cred
-            {{- if eq .Values.cloud "AzureStackCloud" }}
-            {{- if ne .Values.linux.distro "fedora" }}
+            {{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
             - name: ssl
               mountPath: /etc/ssl/certs
               readOnly: true
             {{- end }}
-            {{- end }}
             {{- if eq .Values.linux.distro "fedora" }}
             - name: ssl
               mountPath: /etc/ssl/certs
@@ -319,13 +317,11 @@ spec:
           hostPath:
             path: /etc/kubernetes/
             type: DirectoryOrCreate
-        {{- if eq .Values.cloud "AzureStackCloud" }}
-        {{- if ne .Values.linux.distro "fedora" }}
+        {{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
         - name: ssl
           hostPath:
             path: /etc/ssl/certs
         {{- end }}
-        {{- end }}
         {{- if eq .Values.linux.distro "fedora" }}
         - name: ssl
           hostPath:
diff --git a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
index 0bb4268261..b1d624a8fb 100644
--- a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
+++ b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
@@ -211,13 +211,11 @@ spec:
               name: sys-devices-dir
             - mountPath: /sys/class/
               name: sys-class
-            {{- if eq .Values.cloud "AzureStackCloud" }}
-            {{- if ne .Values.linux.distro "fedora" }}
+            {{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
             - name: ssl
               mountPath: /etc/ssl/certs
               readOnly: true
             {{- end }}
-            {{- end }}
             {{- if eq .Values.linux.distro "fedora" }}
             - name: ssl
               mountPath: /etc/ssl/certs
@@ -256,13 +254,11 @@ spec:
             path: /sys/class/
             type: Directory
           name: sys-class
-        {{- if eq .Values.cloud "AzureStackCloud" }}
-        {{- if ne .Values.linux.distro "fedora" }}
+        {{- if and (eq .Values.cloud "AzureStackCloud") (ne .Values.linux.distro "fedora") }}
         - name: ssl
           hostPath:
             path: /etc/ssl/certs
         {{- end }}
-        {{- end }}
         {{- if eq .Values.linux.distro "fedora" }}
         - name: ssl
           hostPath: