diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/ServiceManifest.xml
index d67ae028d..3ef82903a 100644
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/ServiceManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/ServiceManifest.xml
@@ -24,7 +24,7 @@
       <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
       <EnvironmentVariable Name="ConnectionString" Value="basketdata.eshoponservicefabric"/>
       <EnvironmentVariable Name="identityUrl" Value="http://identityapi.eshoponservicefabric:5105"/>
-      <EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_sf_dns:5105"/>
+      <EnvironmentVariable Name="IdentityUrlExternal" Value="http://#{your_sf_dns}#:5105"/>
       <EnvironmentVariable Name="EventBusConnection" Value="rabbitmq.eshoponservicefabric"/>
       <EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>
       <EnvironmentVariable Name="EventBusUserName" Value="admin"/>
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationParameters/Cloud.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationParameters/Cloud.xml
index b58cd8a2e..9f1f007c1 100644
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationParameters/Cloud.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationParameters/Cloud.xml
@@ -12,7 +12,7 @@
     <Parameter Name="OrderingApi_InstanceCount" Value="-1" />
     <Parameter Name="CatalogApi_InstanceCount" Value="-1" />
     <Parameter Name="BasketApi_InstanceCount" Value="-1" />
-    <Parameter Name="IdentityUrlExternal" Value="http://your_sf_dns:5105" />
-    <Parameter Name="PicBaseUrl" Value="http://your_sf_dns:19081/eShopOnServiceFabric/CatalogApi/api/v1/catalog/items/[0]/pic/" />
+    <Parameter Name="IdentityUrlExternal" Value="http://#{your_sf_dns}#:5105" />
+    <Parameter Name="PicBaseUrl" Value="http://#{your_sf_dns}#:19081/eShopOnServiceFabric/CatalogApi/api/v1/catalog/items/[0]/pic/" />
   </Parameters>
 </Application>
diff --git a/ServiceFabric/eShopOnServiceFabric/PublishProfiles/Cloud.xml b/ServiceFabric/eShopOnServiceFabric/PublishProfiles/Cloud.xml
index 26804a1fe..2ab9df11c 100644
--- a/ServiceFabric/eShopOnServiceFabric/PublishProfiles/Cloud.xml
+++ b/ServiceFabric/eShopOnServiceFabric/PublishProfiles/Cloud.xml
@@ -20,6 +20,6 @@
                                     AzureActiveDirectory="true"
                                     ServerCertThumbprint="0123456789012345678901234567890123456789" />
   -->
-  <ClusterConnectionParameters ConnectionEndpoint="your_sf_dns:19000" />
+  <ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" />
   <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
 </PublishProfile>
\ No newline at end of file
diff --git a/ServiceFabric/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Cloud.xml b/ServiceFabric/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Cloud.xml
index 1b832fb20..26f348fd1 100644
--- a/ServiceFabric/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Cloud.xml
+++ b/ServiceFabric/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Cloud.xml
@@ -2,12 +2,12 @@
 <Application Name="fabric:/eShopOnServiceFabricIdSrv" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Parameters>
     <Parameter Name="IdentityApi_InstanceCount" Value="-1" />
-    <Parameter Name="SpaClient" Value="http://your_sf_dns:5104" />
-    <Parameter Name="XamarinCallback" Value="http://your_sf_dns:5105/xamarincallback" />
-    <Parameter Name="MvcClient" Value="http://your_sf_dns:5100" />
-    <Parameter Name="LocationApiClient" Value="http://your_sf_dns:19081/eShopOnServiceFabric/LocationsApi" />
-    <Parameter Name="MarketingApiClient" Value="http://your_sf_dns:19081/eShopOnServiceFabric/MarketingApi" />
-    <Parameter Name="BasketApiClient" Value="http://your_sf_dns:19081/eShopOnServiceFabric/BasketApi" />
-    <Parameter Name="OrderingApiClient" Value="http://your_sf_dns:19081/eShopOnServiceFabric/OrderingApi" />
+    <Parameter Name="SpaClient" Value="http://#{your_sf_dns}#:5104" />
+    <Parameter Name="XamarinCallback" Value="http://#{your_sf_dns}#:5105/xamarincallback" />
+    <Parameter Name="MvcClient" Value="http://#{your_sf_dns}#:5100" />
+    <Parameter Name="LocationApiClient" Value="http://#{your_sf_dns}#:19081/eShopOnServiceFabric/LocationsApi" />
+    <Parameter Name="MarketingApiClient" Value="http://#{your_sf_dns}#:19081/eShopOnServiceFabric/MarketingApi" />
+    <Parameter Name="BasketApiClient" Value="http://#{your_sf_dns}#:19081/eShopOnServiceFabric/BasketApi" />
+    <Parameter Name="OrderingApiClient" Value="http://#{your_sf_dns}#:19081/eShopOnServiceFabric/OrderingApi" />
   </Parameters>
 </Application>
diff --git a/ServiceFabric/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Cloud.xml b/ServiceFabric/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Cloud.xml
index 26804a1fe..2ab9df11c 100644
--- a/ServiceFabric/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Cloud.xml
+++ b/ServiceFabric/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Cloud.xml
@@ -20,6 +20,6 @@
                                     AzureActiveDirectory="true"
                                     ServerCertThumbprint="0123456789012345678901234567890123456789" />
   -->
-  <ClusterConnectionParameters ConnectionEndpoint="your_sf_dns:19000" />
+  <ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" />
   <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
 </PublishProfile>
\ No newline at end of file
diff --git a/ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Cloud.xml b/ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Cloud.xml
index 4cfdd41d3..6bdcbe2e1 100644
--- a/ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Cloud.xml
+++ b/ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Cloud.xml
@@ -2,6 +2,6 @@
 <Application Name="fabric:/eShopOnServiceFabricWebMVC" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Parameters>
     <Parameter Name="WebMVC_InstanceCount" Value="-1" />
-    <Parameter Name="IdentityUrl" Value="http://your_sf_dns:5105" />
+    <Parameter Name="IdentityUrl" Value="http://#{your_sf_dns}#:5105" />
   </Parameters>
 </Application>
\ No newline at end of file
diff --git a/ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Cloud.xml b/ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Cloud.xml
index 26804a1fe..2ab9df11c 100644
--- a/ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Cloud.xml
+++ b/ServiceFabric/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Cloud.xml
@@ -20,6 +20,6 @@
                                     AzureActiveDirectory="true"
                                     ServerCertThumbprint="0123456789012345678901234567890123456789" />
   -->
-  <ClusterConnectionParameters ConnectionEndpoint="your_sf_dns:19000" />
+  <ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" />
   <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
 </PublishProfile>
\ No newline at end of file
diff --git a/ServiceFabric/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml
index c60705576..f907caddc 100644
--- a/ServiceFabric/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml
@@ -22,11 +22,11 @@
     <EnvironmentVariables>
       <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
       <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
-      <EnvironmentVariable Name="CatalogUrl" Value="http://your_sf_dns:19081/eShopOnServiceFabric/CatalogApi"/>
-      <EnvironmentVariable Name="OrderingUrl" Value="http://your_sf_dns:19081/eShopOnServiceFabric/OrderingApi"/>
-      <EnvironmentVariable Name="BasketUrl" Value="http://your_sf_dns:19081/eShopOnServiceFabric/BasketApi"/>
-      <EnvironmentVariable Name="MarketingUrl" Value="http://your_sf_dns:19081/eShopOnServiceFabric/MarketingApi"/>
-      <EnvironmentVariable Name="IdentityUrl" Value="http://your_sf_dns:5105"/>
+      <EnvironmentVariable Name="CatalogUrl" Value="http://#{your_sf_dns}#:19081/eShopOnServiceFabric/CatalogApi"/>
+      <EnvironmentVariable Name="OrderingUrl" Value="http://#{your_sf_dns}#:19081/eShopOnServiceFabric/OrderingApi"/>
+      <EnvironmentVariable Name="BasketUrl" Value="http://#{your_sf_dns}#:19081/eShopOnServiceFabric/BasketApi"/>
+      <EnvironmentVariable Name="MarketingUrl" Value="http://#{your_sf_dns}#:19081/eShopOnServiceFabric/MarketingApi"/>
+      <EnvironmentVariable Name="IdentityUrl" Value="http://#{your_sf_dns}#:5105"/>
       <EnvironmentVariable Name="CatalogUrlHC" Value="http://catalogapi.eshoponservicefabric:5101/hc"/>
       <EnvironmentVariable Name="OrderingUrlHC" Value="http://orderingapi.eshoponservicefabric:5102/hc"/>
       <EnvironmentVariable Name="IdentityUrlHC" Value="http://identityapi.eshoponservicefabric:5105/hc"/>
diff --git a/ServiceFabric/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Cloud.xml b/ServiceFabric/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Cloud.xml
index 961839849..1505355be 100644
--- a/ServiceFabric/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Cloud.xml
+++ b/ServiceFabric/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Cloud.xml
@@ -2,10 +2,10 @@
 <Application Name="fabric:/eShopOnServiceFabricWebSPA" xmlns="http://schemas.microsoft.com/2011/01/fabric" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Parameters>
     <Parameter Name="WebSPA_InstanceCount" Value="-1" />
-    <Parameter Name="CatalogUrl" Value="http://your_sf_dns:19081/eShopOnServiceFabric/CatalogApi" />
-    <Parameter Name="OrderingUrl" Value="http://your_sf_dns:19081/eShopOnServiceFabric/OrderingApi" />
-    <Parameter Name="BasketUrl" Value="http://your_sf_dns:19081/eShopOnServiceFabric/BasketApi" />
-    <Parameter Name="MarketingUrl" Value="http://your_sf_dns:19081/eShopOnServiceFabric/MarketingApi" />
-    <Parameter Name="IdentityUrl" Value="http://your_sf_dns:5105" />
+    <Parameter Name="CatalogUrl" Value="http://#{your_sf_dns}#:19081/eShopOnServiceFabric/CatalogApi" />
+    <Parameter Name="OrderingUrl" Value="http://#{your_sf_dns}#:19081/eShopOnServiceFabric/OrderingApi" />
+    <Parameter Name="BasketUrl" Value="http://#{your_sf_dns}#:19081/eShopOnServiceFabric/BasketApi" />
+    <Parameter Name="MarketingUrl" Value="http://#{your_sf_dns}#:19081/eShopOnServiceFabric/MarketingApi" />
+    <Parameter Name="IdentityUrl" Value="http://#{your_sf_dns}#:5105" />
   </Parameters>
 </Application>
diff --git a/ServiceFabric/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Cloud.xml b/ServiceFabric/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Cloud.xml
index 26804a1fe..2ab9df11c 100644
--- a/ServiceFabric/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Cloud.xml
+++ b/ServiceFabric/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Cloud.xml
@@ -20,6 +20,6 @@
                                     AzureActiveDirectory="true"
                                     ServerCertThumbprint="0123456789012345678901234567890123456789" />
   -->
-  <ClusterConnectionParameters ConnectionEndpoint="your_sf_dns:19000" />
+  <ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" />
   <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
 </PublishProfile>
\ No newline at end of file
diff --git a/ServiceFabric/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Cloud.xml b/ServiceFabric/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Cloud.xml
index 26804a1fe..2ab9df11c 100644
--- a/ServiceFabric/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Cloud.xml
+++ b/ServiceFabric/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Cloud.xml
@@ -20,6 +20,6 @@
                                     AzureActiveDirectory="true"
                                     ServerCertThumbprint="0123456789012345678901234567890123456789" />
   -->
-  <ClusterConnectionParameters ConnectionEndpoint="your_sf_dns:19000" />
+  <ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" />
   <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
 </PublishProfile>
\ No newline at end of file