diff --git a/library/common/1.0.0/templates/lib/portal/_host.tpl b/library/common/1.0.0/templates/lib/portal/_host.tpl
index 35e091e9b7..9068f39d41 100644
--- a/library/common/1.0.0/templates/lib/portal/_host.tpl
+++ b/library/common/1.0.0/templates/lib/portal/_host.tpl
@@ -29,6 +29,6 @@
         {{- end -}}
       {{- end -}}
     {{- end -}}
-  {{- end }}
-{{ $portalHost }}
+  {{- end -}}
+{{- $portalHost -}}
 {{- end -}}
diff --git a/library/common/1.0.0/templates/lib/portal/_path.tpl b/library/common/1.0.0/templates/lib/portal/_path.tpl
index fa0acc84ef..6c498428a1 100644
--- a/library/common/1.0.0/templates/lib/portal/_path.tpl
+++ b/library/common/1.0.0/templates/lib/portal/_path.tpl
@@ -22,6 +22,6 @@
         {{- end -}}
       {{- end -}}
     {{- end -}}
-  {{- end }}
-{{ $portalPath }}
+  {{- end -}}
+{{- $portalPath -}}
 {{- end -}}
diff --git a/library/common/1.0.0/templates/lib/portal/_port.tpl b/library/common/1.0.0/templates/lib/portal/_port.tpl
index 037385bf5f..3a1d209bae 100644
--- a/library/common/1.0.0/templates/lib/portal/_port.tpl
+++ b/library/common/1.0.0/templates/lib/portal/_port.tpl
@@ -33,6 +33,6 @@
         {{- end -}}
       {{- end -}}
     {{- end -}}
-  {{- end }}
-{{ $portalPort }}
+  {{- end -}}
+{{- $portalPort -}}
 {{- end -}}
diff --git a/library/common/1.0.0/templates/lib/portal/_protocol.tpl b/library/common/1.0.0/templates/lib/portal/_protocol.tpl
index 491bf31445..4388705c13 100644
--- a/library/common/1.0.0/templates/lib/portal/_protocol.tpl
+++ b/library/common/1.0.0/templates/lib/portal/_protocol.tpl
@@ -29,6 +29,6 @@
         {{- end -}}
       {{- end -}}
     {{- end -}}
-  {{- end }}
-{{ $portalProtocol }}
+  {{- end -}}
+{{- $portalProtocol -}}
 {{- end -}}