diff --git a/library/common/1.0.0/templates/lib/workload/_daemonsetSpec.tpl b/library/common/1.0.0/templates/lib/workload/_daemonsetSpec.tpl
index feb4502d1d..a53ca3b76a 100644
--- a/library/common/1.0.0/templates/lib/workload/_daemonsetSpec.tpl
+++ b/library/common/1.0.0/templates/lib/workload/_daemonsetSpec.tpl
@@ -14,16 +14,15 @@ objectData:
 revisionHistoryLimit: {{ $objectData.revisionHistoryLimit | default 3 }}
 updateStrategy:
   type: {{ $strategy }}
-  {{- if and
-        (eq $objectData.strategy "RollingUpdate")
-        $objectData.rollingUpdate
-        (or (hasKey $objectData.rollingUpdate "maxUnavailable") (hasKey $objectData.rollingUpdate "maxSurge")) }}
+  {{- if and (eq $objectData.strategy "RollingUpdate") $objectData.rollingUpdate -}}
+    {{ if (or (hasKey $objectData.rollingUpdate "maxUnavailable") (hasKey $objectData.rollingUpdate "maxSurge")) }}
   rollingUpdate:
-    {{- if hasKey $objectData.rollingUpdate "maxUnavailable" }}
+      {{- if hasKey $objectData.rollingUpdate "maxUnavailable" }}
     maxUnavailable: {{ $objectData.rollingUpdate.maxUnavailable }}
-    {{- end -}}
-    {{- if hasKey $objectData.rollingUpdate "maxSurge" }}
+      {{- end -}}
+      {{- if hasKey $objectData.rollingUpdate "maxSurge" }}
     maxSurge: {{ $objectData.rollingUpdate.maxSurge }}
+      {{- end -}}
     {{- end -}}
   {{- end -}}
 {{- end -}}
diff --git a/library/common/1.0.0/templates/lib/workload/_deployementSpec.tpl b/library/common/1.0.0/templates/lib/workload/_deployementSpec.tpl
index 6d6862cda1..8cc5b27b02 100644
--- a/library/common/1.0.0/templates/lib/workload/_deployementSpec.tpl
+++ b/library/common/1.0.0/templates/lib/workload/_deployementSpec.tpl
@@ -15,16 +15,15 @@ replicas: {{ $objectData.replicas | default 1 }}
 revisionHistoryLimit: {{ $objectData.revisionHistoryLimit | default 3 }}
 strategy:
   type: {{ $strategy }}
-  {{- if and
-        (eq $objectData.strategy "RollingUpdate")
-        $objectData.rollingUpdate
-        (or (hasKey $objectData.rollingUpdate "maxUnavailable") (hasKey $objectData.rollingUpdate "partition")) }}
+  {{- if and (eq $objectData.strategy "RollingUpdate") $objectData.rollingUpdate -}}
+    {{ if (or (hasKey $objectData.rollingUpdate "maxUnavailable") (hasKey $objectData.rollingUpdate "maxSurge")) }}
   rollingUpdate:
-    {{- if hasKey $objectData.rollingUpdate "maxUnavailable" }}
+      {{- if hasKey $objectData.rollingUpdate "maxUnavailable" }}
     maxUnavailable: {{ $objectData.rollingUpdate.maxUnavailable }}
-    {{- end -}}
-    {{- if hasKey $objectData.rollingUpdate "maxSurge" }}
+      {{- end -}}
+      {{- if hasKey $objectData.rollingUpdate "maxSurge" }}
     maxSurge: {{ $objectData.rollingUpdate.maxSurge }}
+      {{- end -}}
     {{- end -}}
   {{- end -}}
 {{- end -}}
diff --git a/library/common/1.0.0/templates/lib/workload/_statefulsettSpec.tpl b/library/common/1.0.0/templates/lib/workload/_statefulsettSpec.tpl
index 99e1307f86..bc956b8896 100644
--- a/library/common/1.0.0/templates/lib/workload/_statefulsettSpec.tpl
+++ b/library/common/1.0.0/templates/lib/workload/_statefulsettSpec.tpl
@@ -16,16 +16,15 @@ revisionHistoryLimit: {{ $objectData.revisionHistoryLimit | default 3 }}
 serviceName: {{ $objectData.name }}
 updateStrategy:
   type: {{ $strategy }}
-  {{- if and
-        (eq $objectData.strategy "RollingUpdate")
-        $objectData.rollingUpdate
-        (or (hasKey $objectData.rollingUpdate "maxUnavailable") (hasKey $objectData.rollingUpdate "partition")) }}
+  {{- if and (eq $objectData.strategy "RollingUpdate") $objectData.rollingUpdate -}}
+    {{- if (or (hasKey $objectData.rollingUpdate "maxUnavailable") (hasKey $objectData.rollingUpdate "partition")) }}
   rollingUpdate:
-    {{- if hasKey $objectData.rollingUpdate "maxUnavailable" }}
+      {{- if hasKey $objectData.rollingUpdate "maxUnavailable" }}
     maxUnavailable: {{ $objectData.rollingUpdate.maxUnavailable }}
-    {{- end -}}
-    {{- if hasKey $objectData.rollingUpdate "partition" }}
+      {{- end -}}
+      {{- if hasKey $objectData.rollingUpdate "partition" }}
     partition: {{ $objectData.rollingUpdate.partition }}
+      {{- end -}}
     {{- end -}}
   {{- end -}}
 {{- end -}}