diff --git a/library/common/1.0.0/templates/class/_service.tpl b/library/common/1.0.0/templates/class/_service.tpl
index 2a01cb2e5d..68de0e0a8a 100644
--- a/library/common/1.0.0/templates/class/_service.tpl
+++ b/library/common/1.0.0/templates/class/_service.tpl
@@ -39,13 +39,13 @@ metadata:
   {{- end }}
 spec:
   {{- if eq $svcType "ClusterIP" -}}
-    {{- include "ix.v1.common.class.serivce.clusterIP.spec" (dict "svc" $svcValues "root" $root) | indent 2 -}}
+    {{- include "ix.v1.common.class.serivce.clusterIP.spec" (dict "svc" $svcValues "root" $root) | nindent 2 -}}
   {{- else if eq $svcType "LoadBalancer" -}}
-    {{- include "ix.v1.common.class.serivce.loadBalancer.spec" (dict "svc" $svcValues "root" $root)| indent 2 -}}
+    {{- include "ix.v1.common.class.serivce.loadBalancer.spec" (dict "svc" $svcValues "root" $root)| nindent 2 -}}
   {{- else if eq $svcType "NodePort" -}}
-    {{- include "ix.v1.common.class.serivce.nodePort.spec" (dict "svc" $svcValues "root" $root) | indent 2 -}}
+    {{- include "ix.v1.common.class.serivce.nodePort.spec" (dict "svc" $svcValues "root" $root) | nindent 2 -}}
   {{- else if eq $svcType "ExternalName" -}}
-    {{- include "ix.v1.common.class.serivce.externalName.spec" (dict "svc" $svcValues "root" $root) | indent 2 -}}
+    {{- include "ix.v1.common.class.serivce.externalName.spec" (dict "svc" $svcValues "root" $root) | nindent 2 -}}
   {{- end -}}
   {{- include "ix.v1.common.class.serivce.sessionAffinity" (dict "svc" $svcValues "root" $root) | indent 2 -}}
   {{- include "ix.v1.common.class.serivce.externalIPs" (dict "svc" $svcValues "root" $root) | indent 2 -}}
diff --git a/library/common/1.0.0/templates/lib/service/_clusterIPSpec.tpl b/library/common/1.0.0/templates/lib/service/_clusterIPSpec.tpl
index 3e0829b5f8..e5c1a791c2 100644
--- a/library/common/1.0.0/templates/lib/service/_clusterIPSpec.tpl
+++ b/library/common/1.0.0/templates/lib/service/_clusterIPSpec.tpl
@@ -1,7 +1,7 @@
 {{- define "ix.v1.common.class.serivce.clusterIP.spec" -}}
   {{- $svcValues := .svc -}}
-  {{- $root := .root }}
+  {{- $root := .root -}}
 type: ClusterIP
-  {{- include "ix.v1.common.class.serivce.clusterIP" (dict "svc" $svcValues) | trim | nindent 0 -}}
-  {{- include "ix.v1.common.class.serivce.ipFamily" (dict "svc" $svcValues "root" $root) | trim | nindent 0 -}}
+  {{- include "ix.v1.common.class.serivce.clusterIP" (dict "svc" $svcValues) | indent 0 -}}
+  {{- include "ix.v1.common.class.serivce.ipFamily" (dict "svc" $svcValues "root" $root) | indent 0 -}}
 {{- end -}}
diff --git a/library/common/1.0.0/templates/lib/service/_externalNameSpec.tpl b/library/common/1.0.0/templates/lib/service/_externalNameSpec.tpl
index 87091f445d..a5fe7ddaea 100644
--- a/library/common/1.0.0/templates/lib/service/_externalNameSpec.tpl
+++ b/library/common/1.0.0/templates/lib/service/_externalNameSpec.tpl
@@ -1,8 +1,8 @@
 {{- define "ix.v1.common.class.serivce.externalName.spec" -}}
   {{- $svcValues := .svc -}}
-  {{- $root := .root }}
+  {{- $root := .root -}}
 type: ExternalName
 externalName: {{ required "<externalName> is required when service type is set to ExternalName" $svcValues.externalName }}
-  {{- include "ix.v1.common.class.serivce.clusterIP" (dict "svc" $svcValues) | trim | nindent 0 -}}
-  {{- include "ix.v1.common.class.serivce.externalTrafficPolicy" (dict "svc" $svcValues "root" $root) | trim | nindent 0 -}}
+  {{- include "ix.v1.common.class.serivce.clusterIP" (dict "svc" $svcValues) | indent 0 -}}
+  {{- include "ix.v1.common.class.serivce.externalTrafficPolicy" (dict "svc" $svcValues "root" $root) | indent 0 -}}
 {{- end -}}
diff --git a/library/common/1.0.0/templates/lib/service/_loadBalancerSpec.tpl b/library/common/1.0.0/templates/lib/service/_loadBalancerSpec.tpl
index c8bbd94364..cfaa991f1d 100644
--- a/library/common/1.0.0/templates/lib/service/_loadBalancerSpec.tpl
+++ b/library/common/1.0.0/templates/lib/service/_loadBalancerSpec.tpl
@@ -1,6 +1,6 @@
 {{- define "ix.v1.common.class.serivce.loadBalancer.spec" -}}
   {{- $svcValues := .svc -}}
-  {{- $root := .root }}
+  {{- $root := .root -}}
 type: LoadBalancer
   {{- with $svcValues.loadBalancerIP }}
 loadBalancerIP: {{ . }}
@@ -11,7 +11,7 @@ loadBalancerSourceRanges:
   - {{ tpl . $root }}
     {{- end }}
   {{- end -}}
-  {{- include "ix.v1.common.class.serivce.clusterIP" (dict "svc" $svcValues) | trim | nindent 0 -}}
-  {{- include "ix.v1.common.class.serivce.ipFamily" (dict "svc" $svcValues "root" $root) | trim | nindent 0 -}}
-  {{- include "ix.v1.common.class.serivce.externalTrafficPolicy" (dict "svc" $svcValues "root" $root) | trim | nindent 0 -}}
+  {{- include "ix.v1.common.class.serivce.clusterIP" (dict "svc" $svcValues) | indent 0 -}}
+  {{- include "ix.v1.common.class.serivce.ipFamily" (dict "svc" $svcValues "root" $root) | indent 0 -}}
+  {{- include "ix.v1.common.class.serivce.externalTrafficPolicy" (dict "svc" $svcValues "root" $root) | indent 0 -}}
 {{- end -}}
diff --git a/library/common/1.0.0/templates/lib/service/_nodePortSpec.tpl b/library/common/1.0.0/templates/lib/service/_nodePortSpec.tpl
index e8c74f99a7..2c4bb2aee0 100644
--- a/library/common/1.0.0/templates/lib/service/_nodePortSpec.tpl
+++ b/library/common/1.0.0/templates/lib/service/_nodePortSpec.tpl
@@ -1,8 +1,8 @@
 {{- define "ix.v1.common.class.serivce.nodePort.spec" -}}
   {{- $svcValues := .svc -}}
-  {{- $root := .root }}
+  {{- $root := .root -}}
 type: NodePort
-  {{- include "ix.v1.common.class.serivce.clusterIP" (dict "svc" $svcValues) | trim | nindent 0 -}}
-  {{- include "ix.v1.common.class.serivce.ipFamily" (dict "svc" $svcValues "root" $root) | trim | nindent 0 -}}
-  {{- include "ix.v1.common.class.serivce.externalTrafficPolicy" (dict "svc" $svcValues "root" $root) | trim | nindent 0 -}}
+  {{- include "ix.v1.common.class.serivce.clusterIP" (dict "svc" $svcValues) | indent 0 -}}
+  {{- include "ix.v1.common.class.serivce.ipFamily" (dict "svc" $svcValues "root" $root) | indent 0 -}}
+  {{- include "ix.v1.common.class.serivce.externalTrafficPolicy" (dict "svc" $svcValues "root" $root) | indent 0 -}}
 {{- end -}}