diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Cloud.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Cloud.xml
index 2ab9df11c..66c6ba21b 100644
--- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Cloud.xml
+++ b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Cloud.xml
@@ -20,6 +20,6 @@
                                     AzureActiveDirectory="true"
                                     ServerCertThumbprint="0123456789012345678901234567890123456789" />
   -->
-  <ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" />
+  <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-linux.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="97375E52D92CAFE86BACF0ED4197537A8B45CD95" FindType="FindByThumbprint" FindValue="97375E52D92CAFE86BACF0ED4197537A8B45CD95" StoreLocation="CurrentUser" StoreName="My" />
   <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
 </PublishProfile>
\ No newline at end of file
diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Cloud.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Cloud.xml
index 2ab9df11c..66c6ba21b 100644
--- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Cloud.xml
+++ b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Cloud.xml
@@ -20,6 +20,6 @@
                                     AzureActiveDirectory="true"
                                     ServerCertThumbprint="0123456789012345678901234567890123456789" />
   -->
-  <ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" />
+  <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-linux.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="97375E52D92CAFE86BACF0ED4197537A8B45CD95" FindType="FindByThumbprint" FindValue="97375E52D92CAFE86BACF0ED4197537A8B45CD95" StoreLocation="CurrentUser" StoreName="My" />
   <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
 </PublishProfile>
\ No newline at end of file
diff --git a/ServiceFabric/Linux/eShopOnServiceFabric/PublishProfiles/Cloud.xml b/ServiceFabric/Linux/eShopOnServiceFabric/PublishProfiles/Cloud.xml
index 2ab9df11c..66c6ba21b 100644
--- a/ServiceFabric/Linux/eShopOnServiceFabric/PublishProfiles/Cloud.xml
+++ b/ServiceFabric/Linux/eShopOnServiceFabric/PublishProfiles/Cloud.xml
@@ -20,6 +20,6 @@
                                     AzureActiveDirectory="true"
                                     ServerCertThumbprint="0123456789012345678901234567890123456789" />
   -->
-  <ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" />
+  <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-linux.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="97375E52D92CAFE86BACF0ED4197537A8B45CD95" FindType="FindByThumbprint" FindValue="97375E52D92CAFE86BACF0ED4197537A8B45CD95" StoreLocation="CurrentUser" StoreName="My" />
   <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
 </PublishProfile>
\ No newline at end of file
diff --git a/ServiceFabric/Linux/eShopOnServiceFabricApiGateWays/eShopOnServiceFabricApiGW/PublishProfiles/Cloud.xml b/ServiceFabric/Linux/eShopOnServiceFabricApiGateWays/eShopOnServiceFabricApiGW/PublishProfiles/Cloud.xml
index a88f72851..6d489aa3a 100644
--- a/ServiceFabric/Linux/eShopOnServiceFabricApiGateWays/eShopOnServiceFabricApiGW/PublishProfiles/Cloud.xml
+++ b/ServiceFabric/Linux/eShopOnServiceFabricApiGateWays/eShopOnServiceFabricApiGW/PublishProfiles/Cloud.xml
@@ -20,7 +20,7 @@
                                     AzureActiveDirectory="true"
                                     ServerCertThumbprint="0123456789012345678901234567890123456789" />
   -->
-  <ClusterConnectionParameters ConnectionEndpoint="" />
+  <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-linux.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="97375E52D92CAFE86BACF0ED4197537A8B45CD95" FindType="FindByThumbprint" FindValue="97375E52D92CAFE86BACF0ED4197537A8B45CD95" StoreLocation="CurrentUser" StoreName="My" />
   <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
   <CopyPackageParameters CompressPackage="true" />
 </PublishProfile>
\ No newline at end of file
diff --git a/ServiceFabric/Linux/eShopOnServiceFabricBFF/PublishProfiles/Cloud.xml b/ServiceFabric/Linux/eShopOnServiceFabricBFF/PublishProfiles/Cloud.xml
index f86ad0c20..978fd5e38 100644
--- a/ServiceFabric/Linux/eShopOnServiceFabricBFF/PublishProfiles/Cloud.xml
+++ b/ServiceFabric/Linux/eShopOnServiceFabricBFF/PublishProfiles/Cloud.xml
@@ -6,6 +6,6 @@
        For a local cluster, you would typically not use any parameters.
          For example: <ClusterConnectionParameters />
   -->
-  <ClusterConnectionParameters ConnectionEndpoint="eshopsflin.westeurope.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="31CF80FDFB8F64D379E3DCF9185032581B8FC080" FindType="FindByThumbprint" FindValue="31CF80FDFB8F64D379E3DCF9185032581B8FC080" StoreLocation="CurrentUser" StoreName="My" />
+  <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-linux.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="97375E52D92CAFE86BACF0ED4197537A8B45CD95" FindType="FindByThumbprint" FindValue="97375E52D92CAFE86BACF0ED4197537A8B45CD95" StoreLocation="CurrentUser" StoreName="My" />
   <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
 </PublishProfile>
\ No newline at end of file
diff --git a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Cloud.xml b/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Cloud.xml
index 2ab9df11c..66c6ba21b 100644
--- a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Cloud.xml
+++ b/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Cloud.xml
@@ -20,6 +20,6 @@
                                     AzureActiveDirectory="true"
                                     ServerCertThumbprint="0123456789012345678901234567890123456789" />
   -->
-  <ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" />
+  <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-linux.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="97375E52D92CAFE86BACF0ED4197537A8B45CD95" FindType="FindByThumbprint" FindValue="97375E52D92CAFE86BACF0ED4197537A8B45CD95" StoreLocation="CurrentUser" StoreName="My" />
   <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
 </PublishProfile>
\ No newline at end of file
diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml
index 5cb2dd65c..642f51096 100644
--- a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml
+++ b/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml
@@ -30,7 +30,7 @@
       <EnvironmentVariable Name="PurchaseUrlHC" Value="http://webshoppingapigw/hc"/>
       <EnvironmentVariable Name="MarketingUrlHC" Value="http://webmarketingapigw/hc "/>
       <EnvironmentVariable Name="UseCustomizationData" Value="True"/>
-      <EnvironmentVariable Name="ApplicationInsights:InstrumentationKey" Value=""/>
+      <EnvironmentVariable Name="ApplicationInsights__InstrumentationKey" Value=""/>
       <EnvironmentVariable Name="OrchestratorType" Value="SF"/>
       <EnvironmentVariable Name="UseLoadTest" Value="False"/>
     </EnvironmentVariables>
diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Cloud.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Cloud.xml
index 2ab9df11c..66c6ba21b 100644
--- a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Cloud.xml
+++ b/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Cloud.xml
@@ -20,6 +20,6 @@
                                     AzureActiveDirectory="true"
                                     ServerCertThumbprint="0123456789012345678901234567890123456789" />
   -->
-  <ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" />
+  <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-linux.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="97375E52D92CAFE86BACF0ED4197537A8B45CD95" FindType="FindByThumbprint" FindValue="97375E52D92CAFE86BACF0ED4197537A8B45CD95" StoreLocation="CurrentUser" StoreName="My" />
   <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
 </PublishProfile>
\ No newline at end of file
diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/ApplicationManifest.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/ApplicationManifest.xml
index 259305073..e1d826921 100644
--- a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/ApplicationManifest.xml
+++ b/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/ApplicationManifest.xml
@@ -6,17 +6,12 @@
                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Parameters>
     <Parameter Name="WebSPA_InstanceCount" DefaultValue="-1" />
+    <Parameter Name="MarketingUrl" DefaultValue="" />
     <Parameter Name="IdentityUrl" DefaultValue="" />
     <Parameter Name="InstrumentationKey" DefaultValue="" />
     <Parameter Name="CatalogUrl" DefaultValue="" />
     <Parameter Name="OrderingUrl" DefaultValue="" />
     <Parameter Name="BasketUrl" DefaultValue="" />
-    <Parameter Name="MarketingUrl" DefaultValue="" />
-    <Parameter Name="IdentityUrl" DefaultValue="" />
-    <Parameter Name="OrderingBackgroundUrl" DefaultValue=""/>
-    <Parameter Name="OrderingSignalrHubUrl" DefaultValue=""/>
-    <Parameter Name="PaymentUrl" DefaultValue=""/>
-    <Parameter Name="InstrumentationKey" DefaultValue="" />
   </Parameters>
   <!-- Import the ServiceManifest from the ServicePackage. The ServiceManifestName and ServiceManifestVersion 
        should match the Name and Version attributes of the ServiceManifest element defined in the 
@@ -25,16 +20,12 @@
     <ServiceManifestRef ServiceManifestName="WebSPAPkg" ServiceManifestVersion="1.0.0" />
     <!-- Override external urls depending on environment -->
     <EnvironmentOverrides CodePackageRef="Code">
+      <EnvironmentVariable Name="MarketingUrl" Value="[MarketingUrl]"/>
       <EnvironmentVariable Name="IdentityUrl" Value="[IdentityUrl]"/>
-      <EnvironmentVariable Name="ApplicationInsights__InstrumentationKey" Value="[InstrumentationKey]"/>
       <EnvironmentVariable Name="CatalogUrl" Value="[CatalogUrl]"/>
-      <EnvironmentVariable Name="PaymentUrl" Value="[PaymentUrl]"/>
       <EnvironmentVariable Name="OrderingUrl" Value="[OrderingUrl]"/>
       <EnvironmentVariable Name="BasketUrl" Value="[BasketUrl]"/>
-      <EnvironmentVariable Name="MarketingUrl" Value="[MarketingUrl]"/>
-      <EnvironmentVariable Name="IdentityUrl" Value="[IdentityUrl]"/>
-      <EnvironmentVariable Name="OrderingBackgroundUrl" Value="[OrderingBackgroundUrl]"/>
-      <EnvironmentVariable Name="OrderingSignalrHubUrl" Value="[OrderingSignalrHubUrl]"/>
+      <EnvironmentVariable Name="ApplicationInsights:InstrumentationKey" Value="[InstrumentationKey]"/>
     </EnvironmentOverrides>
     <Policies>
       <ContainerHostPolicies CodePackageRef="Code">
diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml
index e37022c76..a3714495d 100644
--- a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml
+++ b/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml
@@ -25,6 +25,9 @@
       <EnvironmentVariable Name="IdentityUrl" Value="http://#{your_sf_dns}#:5105"/>
       <EnvironmentVariable Name="PurchaseUrl" Value="http://#{your_sf_dns}#:5202"/>
       <EnvironmentVariable Name="MarketingUrl" Value="http://#{your_sf_dns}#:5203"/>
+      <EnvironmentVariable Name="CatalogUrl" Value="http://#{your_sf_dns}#:5101" />
+      <EnvironmentVariable Name="OrderingUrl" Value="http://#{your_sf_dns}#:5102" />
+      <EnvironmentVariable Name="BasketUrl" Value="http://#{your_sf_dns}#:5103" />
       <EnvironmentVariable Name="PurchaseUrlHC" Value="http://webshoppingapigw/hc"/>
       <EnvironmentVariable Name="MarketingUrlHC" Value="http://webmarketingapigw/hc"/>
       <EnvironmentVariable Name="IdentityUrlHC" Value="http://identity.api/hc"/>
diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Cloud.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Cloud.xml
index 2ab9df11c..66c6ba21b 100644
--- a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Cloud.xml
+++ b/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Cloud.xml
@@ -20,6 +20,6 @@
                                     AzureActiveDirectory="true"
                                     ServerCertThumbprint="0123456789012345678901234567890123456789" />
   -->
-  <ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" />
+  <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-linux.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="97375E52D92CAFE86BACF0ED4197537A8B45CD95" FindType="FindByThumbprint" FindValue="97375E52D92CAFE86BACF0ED4197537A8B45CD95" StoreLocation="CurrentUser" StoreName="My" />
   <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
 </PublishProfile>
\ No newline at end of file
diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml
index 1e3f91ebb..dbe7cb5eb 100644
--- a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml
+++ b/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml
@@ -57,7 +57,7 @@
       <EnvironmentVariable Name="HealthChecks-UI__HealthChecks__17__Name" Value="Ordering SignalRHub HTTP Check"/>
       <EnvironmentVariable Name="HealthChecks-UI__HealthChecks__17__Uri" Value="http://ordering.signalrhub/hc"/>
       <EnvironmentVariable Name="OrderingBackgroundTasksUrl" Value="http://ordering.background/hc"/>
-      <EnvironmentVariable Name="ApplicationInsights:InstrumentationKey" Value=""/>
+      <EnvironmentVariable Name="ApplicationInsights__InstrumentationKey" Value=""/>
       <EnvironmentVariable Name="OrchestratorType" Value="SF"/>
     </EnvironmentVariables>
   </CodePackage>
diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Cloud.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Cloud.xml
index 2ab9df11c..66c6ba21b 100644
--- a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Cloud.xml
+++ b/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Cloud.xml
@@ -20,6 +20,6 @@
                                     AzureActiveDirectory="true"
                                     ServerCertThumbprint="0123456789012345678901234567890123456789" />
   -->
-  <ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" />
+  <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-linux.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="97375E52D92CAFE86BACF0ED4197537A8B45CD95" FindType="FindByThumbprint" FindValue="97375E52D92CAFE86BACF0ED4197537A8B45CD95" StoreLocation="CurrentUser" StoreName="My" />
   <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
 </PublishProfile>
\ No newline at end of file