diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/ApplicationManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/ApplicationManifest.xml
index d617d7453..533674d5d 100644
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/ApplicationManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/ApplicationManifest.xml
@@ -5,7 +5,13 @@
                      xmlns:xsd="http://www.w3.org/2001/XMLSchema"
                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Parameters>
-    <Parameter Name="SqlServer_InstanceCount" DefaultValue="1" />
+    <Parameter Name="BasketData_InstanceCount" DefaultValue="-1" />
+    <Parameter Name="MarketingApi_InstanceCount" DefaultValue="-1" />
+    <Parameter Name="MongoDB_InstanceCount" DefaultValue="-1" />
+    <Parameter Name="LocationsApi_InstanceCount" DefaultValue="-1" />
+    <Parameter Name="PaymentApi_InstanceCount" DefaultValue="-1" />
+    <Parameter Name="RabbitMQ_InstanceCount" DefaultValue="-1" />
+    <Parameter Name="SqlServer_InstanceCount" DefaultValue="-1" />
     <Parameter Name="WebStatus_InstanceCount" DefaultValue="-1" />
     <Parameter Name="WebSPA_InstanceCount" DefaultValue="-1" />
     <Parameter Name="WebMVC_InstanceCount" DefaultValue="-1" />
@@ -17,6 +23,60 @@
   <!-- Import the ServiceManifest from the ServicePackage. The ServiceManifestName and ServiceManifestVersion 
        should match the Name and Version attributes of the ServiceManifest element defined in the 
        ServiceManifest.xml file. -->
+  <ServiceManifestImport>
+    <ServiceManifestRef ServiceManifestName="BasketDataPkg" ServiceManifestVersion="1.0.0" />
+    <ConfigOverrides />
+    <Policies>
+      <ContainerHostPolicies CodePackageRef="Code">
+        <PortBinding ContainerPort="6379" EndpointRef="BasketDataTypeEndpoint"/>
+      </ContainerHostPolicies>
+    </Policies>
+  </ServiceManifestImport>
+  <ServiceManifestImport>
+    <ServiceManifestRef ServiceManifestName="MarketingApiPkg" ServiceManifestVersion="1.0.0" />
+    <ConfigOverrides />
+    <Policies>
+    <ContainerHostPolicies CodePackageRef="Code">
+      <PortBinding ContainerPort="5110" EndpointRef="MarketingApiTypeEndpoint"/>
+    </ContainerHostPolicies>
+      </Policies>
+  </ServiceManifestImport>
+  <ServiceManifestImport>
+    <ServiceManifestRef ServiceManifestName="MongoDBPkg" ServiceManifestVersion="1.0.0" />
+    <ConfigOverrides />
+    <Policies>
+    <ContainerHostPolicies CodePackageRef="Code">
+      <PortBinding ContainerPort="27017" EndpointRef="MongoDBTypeEndpoint"/>
+    </ContainerHostPolicies>
+      </Policies>
+  </ServiceManifestImport>
+  <ServiceManifestImport>
+    <ServiceManifestRef ServiceManifestName="LocationsApiPkg" ServiceManifestVersion="1.0.0" />
+    <ConfigOverrides />
+    <Policies>
+      <ContainerHostPolicies CodePackageRef="Code">
+        <PortBinding ContainerPort="5109" EndpointRef="LocationsApiTypeEndpoint"/>
+      </ContainerHostPolicies>
+    </Policies>
+  </ServiceManifestImport>
+  <ServiceManifestImport>
+    <ServiceManifestRef ServiceManifestName="PaymentApiPkg" ServiceManifestVersion="1.0.0" />
+    <ConfigOverrides />
+    <Policies>
+      <ContainerHostPolicies CodePackageRef="Code">
+        <PortBinding ContainerPort="5108" EndpointRef="PaymentApiTypeEndpoint"/>
+      </ContainerHostPolicies>
+    </Policies>
+  </ServiceManifestImport>
+  <ServiceManifestImport>
+    <ServiceManifestRef ServiceManifestName="RabbitMQPkg" ServiceManifestVersion="1.0.0" />
+    <ConfigOverrides />
+    <Policies>
+      <ContainerHostPolicies CodePackageRef="Code">
+        <PortBinding ContainerPort="5672" EndpointRef="RabbitMQTypeEndpoint"/>
+      </ContainerHostPolicies>
+    </Policies>
+  </ServiceManifestImport>
   <ServiceManifestImport>
     <ServiceManifestRef ServiceManifestName="SqlServerPkg" ServiceManifestVersion="1.0.0" />
     <ConfigOverrides />
@@ -95,11 +155,42 @@
          ServiceFabric PowerShell module.
          
          The attribute ServiceTypeName below must match the name defined in the imported ServiceManifest.xml file. -->
+    <Service Name="BasketData" ServiceDnsName="basketdata.eshoponservicefabric" ServicePackageActivationMode="ExclusiveProcess">
+      <StatelessService ServiceTypeName="BasketDataType" InstanceCount="[BasketData_InstanceCount]">
+        <SingletonPartition />
+      </StatelessService>
+    </Service>
+    <Service Name="MarketingApi" ServiceDnsName="marketingapi.eshoponservicefabric" ServicePackageActivationMode="ExclusiveProcess">
+      <StatelessService ServiceTypeName="MarketingApiType" InstanceCount="[MarketingApi_InstanceCount]">
+        <SingletonPartition />
+      </StatelessService>
+    </Service>
+    <Service Name="MongoDB" ServiceDnsName="mongodb.eshoponservicefabric" ServicePackageActivationMode="ExclusiveProcess">
+      <StatelessService ServiceTypeName="MongoDBType" InstanceCount="[MongoDB_InstanceCount]">
+        <SingletonPartition />
+      </StatelessService>
+    </Service>
+    <Service Name="LocationsApi" ServiceDnsName="locationsapi.eshoponservicefabric" ServicePackageActivationMode="ExclusiveProcess">
+      <StatelessService ServiceTypeName="LocationsApiType" InstanceCount="[LocationsApi_InstanceCount]">
+        <SingletonPartition />
+      </StatelessService>
+    </Service>
+    <Service Name="PaymentApi" ServiceDnsName="paymentapi.eshoponservicefabric" ServicePackageActivationMode="ExclusiveProcess">
+      <StatelessService ServiceTypeName="PaymentApiType" InstanceCount="[PaymentApi_InstanceCount]">
+        <SingletonPartition />
+      </StatelessService>
+    </Service>
+    <Service Name="RabbitMQ" ServiceDnsName="rabbitmq.eshoponservicefabric" ServicePackageActivationMode="ExclusiveProcess">
+      <StatelessService ServiceTypeName="RabbitMQType" InstanceCount="[RabbitMQ_InstanceCount]">
+        <SingletonPartition />
+      </StatelessService>
+    </Service>
     <Service Name="SqlServer" ServiceDnsName="sqlserver.eshoponservicefabric" ServicePackageActivationMode="ExclusiveProcess">
       <StatelessService ServiceTypeName="SqlServerType" InstanceCount="[SqlServer_InstanceCount]">
         <SingletonPartition />
       </StatelessService>
     </Service>
+   
     <Service Name="WebStatus" ServiceDnsName="webstatus.eshoponservicefabric" ServicePackageActivationMode="ExclusiveProcess">
       <StatelessService ServiceTypeName="WebStatusType" InstanceCount="[WebStatus_InstanceCount]">
         <SingletonPartition />
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/ServiceManifest.xml
index c66853133..df7b0cda9 100644
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/ServiceManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/ServiceManifest.xml
@@ -22,10 +22,13 @@
     <EnvironmentVariables>
       <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
       <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
-      <EnvironmentVariable Name="ConnectionString" Value=""/>
-      <EnvironmentVariable Name="identityUrl" Value=""/>
-      <EnvironmentVariable Name="EventBusConnection" Value=""/>
-      <!--<EnvironmentVariable Name="AzureServiceBusEnabled" Value=""/>-->
+      <EnvironmentVariable Name="ConnectionString" Value="basketdata.eshoponservicefabric"/>
+      <EnvironmentVariable Name="identityUrl" Value="http://identityapi.eshoponservicefabric:5105"/>
+      <EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_servicefabric_dns:19081/eShopOnServiceFabric/IdentityApi"/>
+      <EnvironmentVariable Name="EventBusConnection" Value="rabbitmq.eshoponservicefabric"/>
+      <EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>
+      <EnvironmentVariable Name="EventBusUserName" Value="admin"/>
+      <EnvironmentVariable Name="EventBusPassword" Value="password"/>
     </EnvironmentVariables>
   </CodePackage>
 
@@ -41,4 +44,4 @@
       <Endpoint Name="BasketApiTypeEndpoint" Port="5103" UriScheme="http" />
     </Endpoints>
   </Resources>
-</ServiceManifest>
\ No newline at end of file
+</ServiceManifest>
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/BasketDataPkg/Config/Settings.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/BasketDataPkg/Config/Settings.xml
new file mode 100644
index 000000000..ad84ffd8a
--- /dev/null
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/BasketDataPkg/Config/Settings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Settings xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schemas.microsoft.com/2011/01/fabric">
+  <!-- Add your custom configuration sections and parameters here -->
+  <!--
+  <Section Name="MyConfigSection">
+    <Parameter Name="MyParameter" Value="Value1" />
+  </Section>
+  -->
+</Settings>
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/BasketDataPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/BasketDataPkg/ServiceManifest.xml
new file mode 100644
index 000000000..ea9deb355
--- /dev/null
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/BasketDataPkg/ServiceManifest.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ServiceManifest Name="BasketDataPkg"
+                 Version="1.0.0"
+                 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">
+  <ServiceTypes>
+    <!-- This is the name of your ServiceType.
+         The UseImplicitHost attribute indicates this is a guest service. -->
+    <StatelessServiceType ServiceTypeName="BasketDataType" UseImplicitHost="true" />
+  </ServiceTypes>
+
+  <!-- Code package is your service executable. -->
+  <CodePackage Name="Code" Version="1.0.0">
+    <EntryPoint>
+      <!-- Follow this link for more information about deploying Windows containers to Service Fabric: https://aka.ms/sfguestcontainers -->
+      <ContainerHost>
+        <ImageName>redis:nanoserver</ImageName>
+      </ContainerHost>
+    </EntryPoint>
+    <!-- Pass environment variables to your container: -->
+    <!--
+    <EnvironmentVariables>
+      <EnvironmentVariable Name="VariableName" Value="VariableValue"/>
+    </EnvironmentVariables>
+    -->
+  </CodePackage>
+
+  <!-- Config package is the contents of the Config directoy under PackageRoot that contains an 
+       independently-updateable and versioned set of custom configuration settings for your service. -->
+  <ConfigPackage Name="Config" Version="1.0.0" />
+
+  <Resources>
+    <Endpoints>
+      <!-- This endpoint is used by the communication listener to obtain the port on which to 
+           listen. Please note that if your service is partitioned, this port is shared with 
+           replicas of different partitions that are placed in your code. -->
+      <Endpoint Name="BasketDataTypeEndpoint" Protocol="tcp" Port="6379"/>
+    </Endpoints>
+  </Resources>
+</ServiceManifest>
\ No newline at end of file
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/CatalogApiPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/CatalogApiPkg/ServiceManifest.xml
index 6b9853f8a..2036ae14d 100644
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/CatalogApiPkg/ServiceManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/CatalogApiPkg/ServiceManifest.xml
@@ -22,10 +22,16 @@
     <EnvironmentVariables>
       <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
       <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
-      <EnvironmentVariable Name="ConnectionString" Value=""/>
-      <EnvironmentVariable Name="ExternalCatalogBaseUrl" Value=""/>
-      <EnvironmentVariable Name="EventBusConnection" Value=""/>
-      <!--<EnvironmentVariable Name="AzureServiceBusEnabled" Value=""/>-->
+      <EnvironmentVariable Name="ConnectionString" Value="Data Source=sqlserver.eshoponservicefabric,5433;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word"/>
+      <EnvironmentVariable Name="PicBaseUrl" Value="http://your_servicefabric_dns:19081/eShopOnServiceFabric/CatalogApi/api/v1/catalog/items/[0]/pic/"/>
+      <EnvironmentVariable Name="AzureStorageAccountName" Value=""/>
+      <EnvironmentVariable Name="AzureStorageAccountKey" Value=""/>
+      <EnvironmentVariable Name="UseCustomizationData" Value="True"/>
+      <EnvironmentVariable Name="AzureStorageEnabled" Value="False"/>
+      <EnvironmentVariable Name="EventBusConnection" Value="rabbitmq.eshoponservicefabric"/>
+      <EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>
+      <EnvironmentVariable Name="EventBusUserName" Value="admin"/>
+      <EnvironmentVariable Name="EventBusPassword" Value="password"/>
     </EnvironmentVariables>
   </CodePackage>
 
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/IdentityApiPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/IdentityApiPkg/ServiceManifest.xml
index f56e36e80..ae0a51b29 100644
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/IdentityApiPkg/ServiceManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/IdentityApiPkg/ServiceManifest.xml
@@ -22,10 +22,15 @@
     <EnvironmentVariables>
       <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
       <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
-      <EnvironmentVariable Name="SpaClient" Value=""/>
-      <EnvironmentVariable Name="ConnectionStrings" Value=""/>
-      <EnvironmentVariable Name="MvcClient" Value=""/>
-      <EnvironmentVariable Name="XamarinCallback" Value=""/>
+      <EnvironmentVariable Name="SpaClient" Value="http://your_servicefabric_dns:19081/eShopOnServiceFabric/WebSPA"/>
+      <EnvironmentVariable Name="XamarinCallback" Value="http://your_servicefabric_dns:19081/eShopOnServiceFabric/IdentityApi/xamarincallback"/>      
+      <EnvironmentVariable Name="ConnectionStrings__DefaultConnection" Value="Data Source=sqlserver.eshoponservicefabric,5433;Database=Microsoft.eShopOnContainers.Services.IdentityDb;User Id=sa;Password=Pass@word"/>
+      <EnvironmentVariable Name="MvcClient" Value="http://your_servicefabric_dns:19081/eShopOnServiceFabric/WebMVC"/>
+      <EnvironmentVariable Name="LocationApiClient" Value=""/>
+      <EnvironmentVariable Name="MarketingApiClient" Value=""/>
+      <EnvironmentVariable Name="BasketApiClient" Value=""/>
+      <EnvironmentVariable Name="OrderingApiClient" Value=""/>
+      <EnvironmentVariable Name="UseCustomizationData" Value="True"/>
     </EnvironmentVariables>
   </CodePackage>
 
@@ -38,7 +43,7 @@
       <!-- This endpoint is used by the communication listener to obtain the port on which to 
            listen. Please note that if your service is partitioned, this port is shared with 
            replicas of different partitions that are placed in your code. -->
-      <Endpoint Name="IdentityApiTypeEndpoint" Port="5105" UriScheme="http" />
+      <Endpoint Name="IdentityApiTypeEndpoint" Port="5105" UriScheme="http" Protocol="http" Type="Input" PathSuffix="eShopOnServiceFabric/IdentityApi"/>
     </Endpoints>
   </Resources>
 </ServiceManifest>
\ No newline at end of file
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/Config/Settings.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/Config/Settings.xml
new file mode 100644
index 000000000..ad84ffd8a
--- /dev/null
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/Config/Settings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Settings xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schemas.microsoft.com/2011/01/fabric">
+  <!-- Add your custom configuration sections and parameters here -->
+  <!--
+  <Section Name="MyConfigSection">
+    <Parameter Name="MyParameter" Value="Value1" />
+  </Section>
+  -->
+</Settings>
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/ServiceManifest.xml
new file mode 100644
index 000000000..f93ea0c1e
--- /dev/null
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/ServiceManifest.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ServiceManifest Name="LocationsApiPkg"
+                 Version="1.0.0"
+                 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">
+  <ServiceTypes>
+    <!-- This is the name of your ServiceType.
+         The UseImplicitHost attribute indicates this is a guest service. -->
+    <StatelessServiceType ServiceTypeName="LocationsApiType" UseImplicitHost="true" />
+  </ServiceTypes>
+
+  <!-- Code package is your service executable. -->
+  <CodePackage Name="Code" Version="1.0.0">
+    <EntryPoint>
+      <!-- Follow this link for more information about deploying Windows containers to Service Fabric: https://aka.ms/sfguestcontainers -->
+      <ContainerHost>
+        <ImageName>eshop/locations.api-win</ImageName>
+      </ContainerHost>
+    </EntryPoint>
+    <!-- Pass environment variables to your container: -->
+    <EnvironmentVariables>
+      <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
+      <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
+      <EnvironmentVariable Name="ConnectionString" Value="mongodb://mongodb.eshoponservicefabric"/>
+      <EnvironmentVariable Name="Database" Value="LocationsDb"/>
+      <EnvironmentVariable Name="identityUrl" Value="http://identityapi.eshoponservicefabric:5105"/>
+      <EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_servicefabric_dns:19081/eShopOnServiceFabric/IdentityApi"/>
+      <EnvironmentVariable Name="EventBusConnection" Value="rabbitmq.eshoponservicefabric"/>
+      <EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>      
+      <EnvironmentVariable Name="EventBusUserName" Value="admin"/>
+      <EnvironmentVariable Name="EventBusPassword" Value="password"/>
+    </EnvironmentVariables>
+  </CodePackage>
+
+  <!-- Config package is the contents of the Config directoy under PackageRoot that contains an 
+       independently-updateable and versioned set of custom configuration settings for your service. -->
+  <ConfigPackage Name="Config" Version="1.0.0" />
+
+  <Resources>
+    <Endpoints>
+      <!-- This endpoint is used by the communication listener to obtain the port on which to 
+           listen. Please note that if your service is partitioned, this port is shared with 
+           replicas of different partitions that are placed in your code. -->
+      <Endpoint Name="LocationsApiTypeEndpoint" Port="5109"/>
+    </Endpoints>
+  </Resources>
+</ServiceManifest>
\ No newline at end of file
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/Config/Settings.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/Config/Settings.xml
new file mode 100644
index 000000000..ad84ffd8a
--- /dev/null
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/Config/Settings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Settings xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schemas.microsoft.com/2011/01/fabric">
+  <!-- Add your custom configuration sections and parameters here -->
+  <!--
+  <Section Name="MyConfigSection">
+    <Parameter Name="MyParameter" Value="Value1" />
+  </Section>
+  -->
+</Settings>
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/ServiceManifest.xml
new file mode 100644
index 000000000..b9677f96b
--- /dev/null
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/ServiceManifest.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ServiceManifest Name="MarketingApiPkg"
+                 Version="1.0.0"
+                 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">
+  <ServiceTypes>
+    <!-- This is the name of your ServiceType.
+         The UseImplicitHost attribute indicates this is a guest service. -->
+    <StatelessServiceType ServiceTypeName="MarketingApiType" UseImplicitHost="true" />
+  </ServiceTypes>
+
+  <!-- Code package is your service executable. -->
+  <CodePackage Name="Code" Version="1.0.0">
+    <EntryPoint>
+      <!-- Follow this link for more information about deploying Windows containers to Service Fabric: https://aka.ms/sfguestcontainers -->
+      <ContainerHost>
+        <ImageName>eshop/marketing.api-win</ImageName>
+      </ContainerHost>
+    </EntryPoint>
+    <!-- Pass environment variables to your container: -->
+    <EnvironmentVariables>
+      <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
+      <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
+      <EnvironmentVariable Name="ConnectionString" Value="Data Source=sqlserver.eshoponservicefabric,5433;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word"/>
+      <EnvironmentVariable Name="identityUrl" Value="http://identityapi.eshoponservicefabric"/>
+      <EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_servicefabric_dns:19081/eShopOnServiceFabric/IdentityApi"/>
+      <EnvironmentVariable Name="EventBusConnection" Value="rabbitmq.eshoponservicefabric"/>
+      <EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>
+      <EnvironmentVariable Name="CampaignDetailFunctionUri" Value=""/>
+      <EnvironmentVariable Name="PicBaseUrl" Value="http://marketingapi.eshoponservicefabric:5110/api/v1/campaigns/[0]/pic/"/>
+      <EnvironmentVariable Name="AzureStorageAccountName" Value=""/>
+      <EnvironmentVariable Name="AzureStorageAccountKey" Value=""/>
+      <EnvironmentVariable Name="AzureStorageEnabled" Value="False"/>
+      <EnvironmentVariable Name="EventBusUserName" Value="admin"/>
+      <EnvironmentVariable Name="EventBusPassword" Value="password"/>
+    </EnvironmentVariables>
+  </CodePackage>
+
+  <!-- Config package is the contents of the Config directoy under PackageRoot that contains an 
+       independently-updateable and versioned set of custom configuration settings for your service. -->
+  <ConfigPackage Name="Config" Version="1.0.0" />
+
+  <Resources>
+    <Endpoints>
+      <!-- This endpoint is used by the communication listener to obtain the port on which to 
+           listen. Please note that if your service is partitioned, this port is shared with 
+           replicas of different partitions that are placed in your code. -->
+      <Endpoint Name="MarketingApiTypeEndpoint" Port="5110"/>
+    </Endpoints>
+  </Resources>
+</ServiceManifest>
\ No newline at end of file
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/MongoDBPkg/Config/Settings.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/MongoDBPkg/Config/Settings.xml
new file mode 100644
index 000000000..ad84ffd8a
--- /dev/null
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/MongoDBPkg/Config/Settings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Settings xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schemas.microsoft.com/2011/01/fabric">
+  <!-- Add your custom configuration sections and parameters here -->
+  <!--
+  <Section Name="MyConfigSection">
+    <Parameter Name="MyParameter" Value="Value1" />
+  </Section>
+  -->
+</Settings>
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/MongoDBPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/MongoDBPkg/ServiceManifest.xml
new file mode 100644
index 000000000..aba3ba1ec
--- /dev/null
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/MongoDBPkg/ServiceManifest.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ServiceManifest Name="MongoDBPkg"
+                 Version="1.0.0"
+                 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">
+  <ServiceTypes>
+    <!-- This is the name of your ServiceType.
+         The UseImplicitHost attribute indicates this is a guest service. -->
+    <StatelessServiceType ServiceTypeName="MongoDBType" UseImplicitHost="true" />
+  </ServiceTypes>
+
+  <!-- Code package is your service executable. -->
+  <CodePackage Name="Code" Version="1.0.0">
+    <EntryPoint>
+      <!-- Follow this link for more information about deploying Windows containers to Service Fabric: https://aka.ms/sfguestcontainers -->
+      <ContainerHost>
+        <ImageName>mongo:windowsservercore</ImageName>
+      </ContainerHost>
+    </EntryPoint>
+    <!-- Pass environment variables to your container: -->
+    <!--
+    <EnvironmentVariables>
+      <EnvironmentVariable Name="VariableName" Value="VariableValue"/>
+    </EnvironmentVariables>
+    -->
+  </CodePackage>
+
+  <!-- Config package is the contents of the Config directoy under PackageRoot that contains an 
+       independently-updateable and versioned set of custom configuration settings for your service. -->
+  <ConfigPackage Name="Config" Version="1.0.0" />
+
+  <Resources>
+    <Endpoints>
+      <!-- This endpoint is used by the communication listener to obtain the port on which to 
+           listen. Please note that if your service is partitioned, this port is shared with 
+           replicas of different partitions that are placed in your code. -->
+      <Endpoint Name="MongoDBTypeEndpoint" Protocol="tcp" Port="27017" />
+    </Endpoints>
+  </Resources>
+</ServiceManifest>
\ No newline at end of file
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/OrderingApiPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/OrderingApiPkg/ServiceManifest.xml
index cd6ab22a3..7488b7473 100644
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/OrderingApiPkg/ServiceManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/OrderingApiPkg/ServiceManifest.xml
@@ -22,9 +22,16 @@
     <EnvironmentVariables>
       <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
       <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
-      <EnvironmentVariable Name="ConnectionString" Value=""/>
-      <EnvironmentVariable Name="identityUrl" Value=""/>
-      <EnvironmentVariable Name="EventBusConnection" Value=""/>
+      <EnvironmentVariable Name="ConnectionString" Value="Data Source=sqlserver.eshoponservicefabric,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word"/>
+      <EnvironmentVariable Name="identityUrl" Value="http://identityapi.eshoponservicefabric:5105"/>
+      <EnvironmentVariable Name="IdentityUrlExternal" Value="http://your_servicefabric_dns:19081/eShopOnServiceFabric/IdentityApi"/>
+      <EnvironmentVariable Name="EventBusConnection" Value="rabbitmq.eshoponservicefabric"/>
+      <EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>
+      <EnvironmentVariable Name="UseCustomizationData" Value="True"/>
+      <EnvironmentVariable Name="GracePeriodTime" Value="1"/>
+      <EnvironmentVariable Name="CheckUpdateTime" Value="30000"/>
+      <EnvironmentVariable Name="EventBusUserName" Value="admin"/>
+      <EnvironmentVariable Name="EventBusPassword" Value="password"/>
     </EnvironmentVariables>
   </CodePackage>
 
@@ -37,7 +44,7 @@
       <!-- This endpoint is used by the communication listener to obtain the port on which to 
            listen. Please note that if your service is partitioned, this port is shared with 
            replicas of different partitions that are placed in your code. -->
-      <Endpoint Name="OrderingApiTypeEndpoint" Port="5102" UriScheme="http" />
+      <Endpoint Name="OrderingApiTypeEndpoint" Port="80" UriScheme="http" />
     </Endpoints>
   </Resources>
 </ServiceManifest>
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/PaymentApiPkg/Config/Settings.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/PaymentApiPkg/Config/Settings.xml
new file mode 100644
index 000000000..ad84ffd8a
--- /dev/null
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/PaymentApiPkg/Config/Settings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Settings xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schemas.microsoft.com/2011/01/fabric">
+  <!-- Add your custom configuration sections and parameters here -->
+  <!--
+  <Section Name="MyConfigSection">
+    <Parameter Name="MyParameter" Value="Value1" />
+  </Section>
+  -->
+</Settings>
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/PaymentApiPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/PaymentApiPkg/ServiceManifest.xml
new file mode 100644
index 000000000..dbf0e4d81
--- /dev/null
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/PaymentApiPkg/ServiceManifest.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ServiceManifest Name="PaymentApiPkg"
+                 Version="1.0.0"
+                 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">
+  <ServiceTypes>
+    <!-- This is the name of your ServiceType.
+         The UseImplicitHost attribute indicates this is a guest service. -->
+    <StatelessServiceType ServiceTypeName="PaymentApiType" UseImplicitHost="true" />
+  </ServiceTypes>
+
+  <!-- Code package is your service executable. -->
+  <CodePackage Name="Code" Version="1.0.0">
+    <EntryPoint>
+      <!-- Follow this link for more information about deploying Windows containers to Service Fabric: https://aka.ms/sfguestcontainers -->
+      <ContainerHost>
+        <ImageName>eshop/payment.api-win</ImageName>
+      </ContainerHost>
+    </EntryPoint>
+    <!-- Pass environment variables to your container: -->
+    <EnvironmentVariables>
+      <EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="Development"/>
+      <EnvironmentVariable Name="ASPNETCORE_URLS" Value="http://0.0.0.0:80"/>
+      <EnvironmentVariable Name="EventBusConnection" Value="rabbitmq.eshoponservicefabric"/>
+      <EnvironmentVariable Name="AzureServiceBusEnabled" Value="False"/>      
+      <EnvironmentVariable Name="EventBusUserName" Value="admin"/>
+      <EnvironmentVariable Name="EventBusPassword" Value="password"/>
+    </EnvironmentVariables>
+  </CodePackage>
+
+  <!-- Config package is the contents of the Config directoy under PackageRoot that contains an 
+       independently-updateable and versioned set of custom configuration settings for your service. -->
+  <ConfigPackage Name="Config" Version="1.0.0" />
+
+  <Resources>
+    <Endpoints>
+      <!-- This endpoint is used by the communication listener to obtain the port on which to 
+           listen. Please note that if your service is partitioned, this port is shared with 
+           replicas of different partitions that are placed in your code. -->
+      <Endpoint Name="PaymentApiTypeEndpoint" Port="5108" />
+    </Endpoints>
+  </Resources>
+</ServiceManifest>
\ No newline at end of file
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/RabbitMQPkg/Config/Settings.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/RabbitMQPkg/Config/Settings.xml
new file mode 100644
index 000000000..ad84ffd8a
--- /dev/null
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/RabbitMQPkg/Config/Settings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Settings xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schemas.microsoft.com/2011/01/fabric">
+  <!-- Add your custom configuration sections and parameters here -->
+  <!--
+  <Section Name="MyConfigSection">
+    <Parameter Name="MyParameter" Value="Value1" />
+  </Section>
+  -->
+</Settings>
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/RabbitMQPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/RabbitMQPkg/ServiceManifest.xml
new file mode 100644
index 000000000..0edd5b431
--- /dev/null
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/RabbitMQPkg/ServiceManifest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ServiceManifest Name="RabbitMQPkg"
+                 Version="1.0.0"
+                 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">
+  <ServiceTypes>
+    <!-- This is the name of your ServiceType.
+         The UseImplicitHost attribute indicates this is a guest service. -->
+    <StatelessServiceType ServiceTypeName="RabbitMQType" UseImplicitHost="true" />
+  </ServiceTypes>
+
+  <!-- Code package is your service executable. -->
+  <CodePackage Name="Code" Version="1.0.0">
+    <EntryPoint>
+      <!-- Follow this link for more information about deploying Windows containers to Service Fabric: https://aka.ms/sfguestcontainers -->
+      <ContainerHost>
+        <ImageName>spring2/rabbitmq</ImageName>
+      </ContainerHost>
+    </EntryPoint>
+    <!-- Pass environment variables to your container: -->
+
+    <EnvironmentVariables>
+    </EnvironmentVariables>
+
+  </CodePackage>
+
+  <!-- Config package is the contents of the Config directoy under PackageRoot that contains an 
+       independently-updateable and versioned set of custom configuration settings for your service. -->
+  <ConfigPackage Name="Config" Version="1.0.0" />
+
+  <Resources>
+    <Endpoints>
+      <!-- This endpoint is used by the communication listener to obtain the port on which to 
+           listen. Please note that if your service is partitioned, this port is shared with 
+           replicas of different partitions that are placed in your code. -->
+      <Endpoint Name="RabbitMQTypeEndpoint" Protocol="tcp" Port="5672"/>
+    </Endpoints>
+  </Resources>
+</ServiceManifest>
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/SqlServerPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/SqlServerPkg/ServiceManifest.xml
index 27b25bcbf..676cf7b6d 100644
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/SqlServerPkg/ServiceManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/SqlServerPkg/ServiceManifest.xml
@@ -15,7 +15,7 @@
     <EntryPoint>
       <!-- Follow this link for more information about deploying Windows containers to Service Fabric: https://aka.ms/sfguestcontainers -->
       <ContainerHost>
-        <ImageName>microsoft/mssql-server-windows</ImageName>
+        <ImageName>microsoft/mssql-server-windows-developer</ImageName>
       </ContainerHost>
     </EntryPoint>
     <!-- Pass environment variables to your container: -->
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml
index f60a71d19..7c8a341ed 100644
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml
@@ -22,10 +22,11 @@
     <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="IdentityUrl" Value=""/>
+      <EnvironmentVariable Name="CatalogUrl" Value="http://catalogapi.eshoponservicefabric:5101"/>
+      <EnvironmentVariable Name="OrderingUrl" Value="http://orderingapi.eshoponservicefabric:5102"/>
+      <EnvironmentVariable Name="BasketUrl" Value="http://basketapi.eshoponservicefabric:5103"/>
+      <EnvironmentVariable Name="IdentityUrl" Value="http://your_servicefabric_dns:19081/eShopOnServiceFabric/IdentityApi"/>
+      <EnvironmentVariable Name="MarketingUrl" Value=""/>
     </EnvironmentVariables>
   </CodePackage>
 
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml
index e6267c2ef..942b5207b 100644
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml
@@ -22,11 +22,17 @@
     <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="IdentityUrl" Value=""/>
-      <EnvironmentVariable Name="BasketUrl" Value=""/>
+      <EnvironmentVariable Name="CatalogUrl" Value="http://your_servicefabric_dns:19081/eShopOnServiceFabric/CatalogApi"/>
+      <EnvironmentVariable Name="OrderingUrl" Value="http://your_servicefabric_dns:19081/eShopOnServiceFabric/OrderingApi"/>
+      <EnvironmentVariable Name="IdentityUrl" Value="http://your_servicefabric_dns:19081/eShopOnServiceFabric/IdentityApi"/>
+      <EnvironmentVariable Name="BasketUrl" Value="http://your_servicefabric_dns:19081/eShopOnServiceFabric/BasketApi"/>
       <EnvironmentVariable Name="MarketingUrl" Value=""/>
+      <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"/>
+      <EnvironmentVariable Name="BasketUrlHC" Value="http://basketapi.eshoponservicefabric:5103/hc"/>
+      <EnvironmentVariable Name="MarketingUrlHC" Value="http://marketingapi.eshoponservicefabric:5110/hc"/>
+      <EnvironmentVariable Name="UseCustomizationData" Value="True"/>
     </EnvironmentVariables>
   </CodePackage>
 
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml
index e8ed4dbe5..ebd6b463a 100644
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml
@@ -22,12 +22,14 @@
     <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="IdentityUrl" Value=""/>
-      <EnvironmentVariable Name="mvc" Value=""/>
-      <EnvironmentVariable Name="spa" Value=""/>
+      <EnvironmentVariable Name="CatalogUrl" Value="http://catalogapi.eshoponservicefabric:5101"/>
+      <EnvironmentVariable Name="OrderingUrl" Value="http://orderingapi.eshoponservicefabric:5102"/>
+      <EnvironmentVariable Name="BasketUrl" Value="http://basketapi.eshoponservicefabric:5103"/>
+      <EnvironmentVariable Name="IdentityUrl" Value="http://identityapi.eshoponservicefabric:5105"/>
+      <EnvironmentVariable Name="MarketingUrl" Value="http://marketingapi.eshoponservicefabric:5110"/>
+      <EnvironmentVariable Name="LocationsUrl" Value="http://locationsapi.eshoponservicefabric:5109"/>
+      <EnvironmentVariable Name="mvc" Value="http://webmvc.eshoponservicefabric:5100"/>
+      <EnvironmentVariable Name="spa" Value="http://webspa.eshoponservicefabric:5104"/>
     </EnvironmentVariables>
   </CodePackage>
 
diff --git a/ServiceFabric/eShopOnServiceFabric/ApplicationParameters/Cloud.xml b/ServiceFabric/eShopOnServiceFabric/ApplicationParameters/Cloud.xml
index 12f32c13b..471bd22d9 100644
--- a/ServiceFabric/eShopOnServiceFabric/ApplicationParameters/Cloud.xml
+++ b/ServiceFabric/eShopOnServiceFabric/ApplicationParameters/Cloud.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Application Name="fabric:/eShopOnServiceFabric" 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="BasketData_InstanceCount" Value="-1" />
+    <Parameter Name="MarketingApi_InstanceCount" Value="-1" />
+    <Parameter Name="MongoDB_InstanceCount" Value="-1" />
+    <Parameter Name="LocationsApi_InstanceCount" Value="-1" />
+    <Parameter Name="PaymentApi_InstanceCount" Value="-1" />
+    <Parameter Name="RabbitMQ_InstanceCount" Value="-1" />
+    <Parameter Name="SqlServer_InstanceCount" Value="-1" />
     <Parameter Name="WebStatus_InstanceCount" Value="-1" />
     <Parameter Name="WebSPA_InstanceCount" Value="-1" />
     <Parameter Name="WebMVC_InstanceCount" Value="-1" />
diff --git a/ServiceFabric/eShopOnServiceFabric/eShopOnServiceFabric.sfproj b/ServiceFabric/eShopOnServiceFabric/eShopOnServiceFabric.sfproj
index 4e185ec14..cb52adafc 100644
--- a/ServiceFabric/eShopOnServiceFabric/eShopOnServiceFabric.sfproj
+++ b/ServiceFabric/eShopOnServiceFabric/eShopOnServiceFabric.sfproj
@@ -30,12 +30,26 @@
   <ItemGroup>
     <Content Include="ApplicationPackageRoot\BasketApiPkg\Config\Settings.xml" />
     <Content Include="ApplicationPackageRoot\BasketApiPkg\ServiceManifest.xml" />
+    <Content Include="ApplicationPackageRoot\BasketDataPkg\Config\Settings.xml" />
+    <Content Include="ApplicationPackageRoot\BasketDataPkg\ServiceManifest.xml" />
     <Content Include="ApplicationPackageRoot\CatalogApiPkg\Config\Settings.xml" />
     <Content Include="ApplicationPackageRoot\CatalogApiPkg\ServiceManifest.xml" />
     <Content Include="ApplicationPackageRoot\IdentityApiPkg\Config\Settings.xml" />
     <Content Include="ApplicationPackageRoot\IdentityApiPkg\ServiceManifest.xml" />
+    <Content Include="ApplicationPackageRoot\LocationsApiPkg\Config\Settings.xml" />
+    <Content Include="ApplicationPackageRoot\LocationsApiPkg\ServiceManifest.xml" />
+    <Content Include="ApplicationPackageRoot\MarketingApiPkg\Config\Settings.xml" />
+    <Content Include="ApplicationPackageRoot\MarketingApiPkg\ServiceManifest.xml" />
+    <Content Include="ApplicationPackageRoot\MongoDBPkg\Config\Settings.xml" />
+    <Content Include="ApplicationPackageRoot\MongoDBPkg\ServiceManifest.xml" />
     <Content Include="ApplicationPackageRoot\OrderingApiPkg\Config\Settings.xml" />
     <Content Include="ApplicationPackageRoot\OrderingApiPkg\ServiceManifest.xml" />
+    <Content Include="ApplicationPackageRoot\PaymentApiPkg\Config\Settings.xml" />
+    <Content Include="ApplicationPackageRoot\PaymentApiPkg\ServiceManifest.xml" />
+    <Content Include="ApplicationPackageRoot\RabbitMQPkg\Config\Settings.xml" />
+    <Content Include="ApplicationPackageRoot\RabbitMQPkg\ServiceManifest.xml" />
+    <Content Include="ApplicationPackageRoot\SqlServerPkg\Config\Settings.xml" />
+    <Content Include="ApplicationPackageRoot\SqlServerPkg\ServiceManifest.xml" />
     <Content Include="ApplicationPackageRoot\WebMVCPkg\Config\Settings.xml" />
     <Content Include="ApplicationPackageRoot\WebMVCPkg\ServiceManifest.xml" />
     <Content Include="ApplicationPackageRoot\WebSPAPkg\Config\Settings.xml" />
diff --git a/eShopOnContainers-ServicesAndWebApps.sln b/eShopOnContainers-ServicesAndWebApps.sln
index a8a6e7ace..3d1072c76 100644
--- a/eShopOnContainers-ServicesAndWebApps.sln
+++ b/eShopOnContainers-ServicesAndWebApps.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26730.8
+VisualStudioVersion = 15.0.26730.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{FEA0C318-FFED-4D39-8781-265718CA43DD}"
 EndProject
diff --git a/src/Web/WebMVC/WebMVC.csproj b/src/Web/WebMVC/WebMVC.csproj
index 5e73cdfda..5325dc942 100644
--- a/src/Web/WebMVC/WebMVC.csproj
+++ b/src/Web/WebMVC/WebMVC.csproj
@@ -37,6 +37,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Fabric.MSBuild" Version="1.6.1" />
   </ItemGroup>
 
   <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">