diff --git a/docker-compose.yml b/docker-compose.yml
index 094f16c94..c9679fde6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -77,35 +77,27 @@ services:
   catalog.api:
     image: eshop/catalog.api
     environment:
-      - ConnectionString=Server=catalog.data;Database=CatalogDB;User Id=sa;Password=Pass@word
+      - ConnectionString=Server=business.data;Database=CatalogDB;User Id=sa;Password=Pass@word
     ports:
       - "5101:80"
     depends_on:
-      - catalog.data
-
-  catalog.data:
-    image: microsoft/mssql-server-linux
-    environment:
-      - SA_PASSWORD=Pass@word
-      - ACCEPT_EULA=Y
-    ports:
-      - "5434:1433"
+      - business.data
 
   ordering.api:
     image: eshop/ordering.api
     environment:
-      - ConnectionString=Server=ordering.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
+      - ConnectionString=Server=business.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word
       - identityUrl=http://identity.service:5105    #local
       #- identityUrl=http://104.40.62.65:5105       #remote
     ports:
       - "5102:5102"
     depends_on:
-      - ordering.data
+      - business.data
 
-  ordering.data:
+  business.data:
     image: microsoft/mssql-server-linux
     environment:
       - SA_PASSWORD=Pass@word
       - ACCEPT_EULA=Y
     ports:
-      - "5432:1433"
+      - "5434:1433"
diff --git a/src/Services/Basket/Basket.API/Program.cs b/src/Services/Basket/Basket.API/Program.cs
index f62aab4d5..a3ac96b49 100644
--- a/src/Services/Basket/Basket.API/Program.cs
+++ b/src/Services/Basket/Basket.API/Program.cs
@@ -15,7 +15,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
             var host = new WebHostBuilder()
                 .UseKestrel()
                 .UseContentRoot(Directory.GetCurrentDirectory())
-                .UseUrls("http://0.0.0.0:5003")
+                .UseUrls("http://0.0.0.0:5103")
                 .UseIISIntegration()
                 .UseStartup<Startup>()
                 .Build();
diff --git a/src/Services/Catalog/Catalog.API/settings.json b/src/Services/Catalog/Catalog.API/settings.json
index bac26f3b5..d3a58585d 100644
--- a/src/Services/Catalog/Catalog.API/settings.json
+++ b/src/Services/Catalog/Catalog.API/settings.json
@@ -1,5 +1,5 @@
 {
-  "ConnectionString": "Server=tcp:127.0.0.1,5433;Initial Catalog=CatalogDB;User Id=sa;Password=Pass@word",
+  "ConnectionString": "Server=tcp:127.0.0.1,5434;Initial Catalog=CatalogDB;User Id=sa;Password=Pass@word",
   "Logging": {
     "IncludeScopes": false,
     "LogLevel": {
diff --git a/src/Services/Identity/eShopOnContainers.Identity/Program.cs b/src/Services/Identity/eShopOnContainers.Identity/Program.cs
index bde2bd63d..48531ae65 100644
--- a/src/Services/Identity/eShopOnContainers.Identity/Program.cs
+++ b/src/Services/Identity/eShopOnContainers.Identity/Program.cs
@@ -13,7 +13,7 @@ namespace eShopOnContainers.Identity
         {
             var host = new WebHostBuilder()
                 .UseKestrel()
-                .UseUrls("http://0.0.0.0:5000")
+                .UseUrls("http://0.0.0.0:5105")
                 .UseContentRoot(Directory.GetCurrentDirectory())
                 .UseIISIntegration()
                 .UseStartup<Startup>()
diff --git a/src/Services/Ordering/Ordering.API/settings.json b/src/Services/Ordering/Ordering.API/settings.json
index 3603d2012..eb9bb0cc6 100644
--- a/src/Services/Ordering/Ordering.API/settings.json
+++ b/src/Services/Ordering/Ordering.API/settings.json
@@ -1,4 +1,4 @@
 {
-  "ConnectionString": "Server=tcp:127.0.0.1,5432;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;",
+  "ConnectionString": "Server=tcp:127.0.0.1,5434;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;",
   "IdentityUrl": "http://localhost:5105"
 }