diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/ApplicationManifest.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/ApplicationManifest.xml
index 924a8feed..0e5e8d114 100644
--- a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/ApplicationManifest.xml
+++ b/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/ApplicationManifest.xml
@@ -6,14 +6,7 @@
                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Parameters>
     <Parameter Name="WebSPA_InstanceCount" DefaultValue="-1" />
-    <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 
@@ -23,18 +16,8 @@
     <ServiceManifestRef ServiceManifestName="WebSPAPkg" ServiceManifestVersion="1.0.0" />
     <!-- Override external urls depending on environment -->
     <EnvironmentOverrides CodePackageRef="Code">
-      <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
-      <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
-      <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="PurchaseUrlHC" Value="http://webshoppingapigw/hc"/>
-      <EnvironmentVariable Name="MarketingUrlHC" Value="http://webmarketingapigw/hc"/>
-      <EnvironmentVariable Name="IdentityUrlHC" Value="http://identity.api/hc"/>
-      <EnvironmentVariable Name="UseCustomizationData" Value="True"/>
-      <EnvironmentVariable Name="ApplicationInsights:InstrumentationKey" Value=""/>
-      <EnvironmentVariable Name="OrchestratorType" Value="SF"/>
-      <EnvironmentVariable Name="SignalrHubUrl" Value="http://#{your_sf_dns}#:5202"/>
+      <EnvironmentVariable Name="IdentityUrl" Value="[IdentityUrl]"/>
+      <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 c4c4fd32f..e37022c76 100644
--- a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml
+++ b/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml
@@ -22,26 +22,16 @@
     <EnvironmentVariables>
       <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
       <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
-      <EnvironmentVariable Name="CatalogUrl" Value=""/>
-      <EnvironmentVariable Name="OrderingUrl" Value=""/>
-      <EnvironmentVariable Name="BasketUrl" Value=""/>
-      <EnvironmentVariable Name="MarketingUrl" Value=""/>
-      <EnvironmentVariable Name="PaymentUrl" Value=""/>
-      <EnvironmentVariable Name="OrderingBackgroundUrl" Value=""/>
-      <EnvironmentVariable Name="OrderingSignalrHubUrl" Value=""/>
       <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="OrderingBackgroundUrlHC" Value="http://ordering.backgroundtasks.eshoponservicefabric:5111/hc"/>
-      <EnvironmentVariable Name="OrderingSignalrHubUrlHC" Value="http://ordering.signalrhub.eshoponservicefabric:5112/hc"/>
-      <EnvironmentVariable Name="BasketUrlHC" Value="http://basketapi.eshoponservicefabric:5103/hc"/>
-      <EnvironmentVariable Name="IdentityUrlHC" Value="http://identityapi.eshoponservicefabric:5105/hc"/>
-      <EnvironmentVariable Name="MarketingUrlHC" Value="http://marketingapi.eshoponservicefabric:5110/hc"/>
-      <EnvironmentVariable Name="LocationsUrlHC" Value="http://locationsapi.eshoponservicefabric:5109/hc"/>
-      <EnvironmentVariable Name="PaymentUrlHC" Value="http://paymentapi.eshoponservicefabric:5108/hc"/>
+      <EnvironmentVariable Name="PurchaseUrl" Value="http://#{your_sf_dns}#:5202"/>
+      <EnvironmentVariable Name="MarketingUrl" Value="http://#{your_sf_dns}#:5203"/>
+      <EnvironmentVariable Name="PurchaseUrlHC" Value="http://webshoppingapigw/hc"/>
+      <EnvironmentVariable Name="MarketingUrlHC" Value="http://webmarketingapigw/hc"/>
+      <EnvironmentVariable Name="IdentityUrlHC" Value="http://identity.api/hc"/>
       <EnvironmentVariable Name="UseCustomizationData" Value="True"/>
       <EnvironmentVariable Name="ApplicationInsights:InstrumentationKey" Value=""/>
       <EnvironmentVariable Name="OrchestratorType" Value="SF"/>
+      <EnvironmentVariable Name="SignalrHubUrl" Value="http://#{your_sf_dns}#:5202"/>
     </EnvironmentVariables>
   </CodePackage>
 
diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml
index 378a56642..1e3f91ebb 100644
--- a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml
+++ b/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml
@@ -41,7 +41,7 @@
       <EnvironmentVariable Name="HealthChecks-UI__HealthChecks__9__Name" Value="Ordering HTTP Check"/>
       <EnvironmentVariable Name="HealthChecks-UI__HealthChecks__9__Uri" Value="http://ordering.api/hc"/>
       <EnvironmentVariable Name="HealthChecks-UI__HealthChecks__10__Name" Value="Ordering HTTP Background Check"/>
-      <EnvironmentVariable Name="HealthChecks-UI__HealthChecks__10__Uri" Value="http://ordering.backgroundtasks/hc"/>
+      <EnvironmentVariable Name="HealthChecks-UI__HealthChecks__10__Uri" Value="http://ordering.background/hc"/>
       <EnvironmentVariable Name="HealthChecks-UI__HealthChecks__11__Name" Value="Basket HTTP Check"/>
       <EnvironmentVariable Name="HealthChecks-UI__HealthChecks__11__Uri" Value="http://basket.api/hc"/>
       <EnvironmentVariable Name="HealthChecks-UI__HealthChecks__12__Name" Value="Catalog HTTP Check"/>
@@ -56,7 +56,7 @@
       <EnvironmentVariable Name="HealthChecks-UI__HealthChecks__16__Uri" Value="http://payment.api/hc"/>
       <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.backgroundtasks/hc"/>
+      <EnvironmentVariable Name="OrderingBackgroundTasksUrl" Value="http://ordering.background/hc"/>
       <EnvironmentVariable Name="ApplicationInsights:InstrumentationKey" Value=""/>
       <EnvironmentVariable Name="OrchestratorType" Value="SF"/>
     </EnvironmentVariables>