diff --git a/library/common/1.0.0/templates/classes/_service.tpl b/library/common/1.0.0/templates/classes/_service.tpl
index da9aefe49e..91327938ee 100644
--- a/library/common/1.0.0/templates/classes/_service.tpl
+++ b/library/common/1.0.0/templates/classes/_service.tpl
@@ -83,7 +83,8 @@ spec:
     {{- include "ix.v1.common.lib.service.spec.externalName" (dict "rootCtx" $rootCtx "objectData" $objectData) | trim | nindent 2 }}
   {{- else if eq $svcType "ExternalIP" -}}
     {{- include "ix.v1.common.lib.service.spec.externalIP" (dict "rootCtx" $rootCtx "objectData" $objectData) | trim | nindent 2 }}
-  {{- end }}
+  {{- end -}}
+  {{- /* Following apply to all service types */}}
   publishNotReadyAddresses: {{ include "ix.v1.common.lib.service.publishNotReadyAddresses" (dict "rootCtx" $rootCtx "objectData" $objectData) | trim }}
   {{- with (include "ix.v1.common.lib.service.externalIPs" (dict "rootCtx" $rootCtx "objectData" $objectData) | trim) }}
   externalIPs: