diff --git a/src/ApiGateways/Envoy/config/catalog.proto b/src/ApiGateways/Envoy/config/catalog.proto
deleted file mode 100644
index 5fda69526..000000000
--- a/src/ApiGateways/Envoy/config/catalog.proto
+++ /dev/null
@@ -1,42 +0,0 @@
-syntax = "proto3";
-
-package CatalogApi;
-
-import "google/api/annotations.proto";
-
-message CatalogItemRequest {
-	int32 id = 1;
-}
-
-message CatalogItemResponse {
-	int32 id = 1;
-	string name = 2;
-    string description=3;
-    double price=4;
-    string picture_file_name=5;
-    string picture_uri=6;
-    CatalogType catalog_type=8;
-    CatalogBrand catalog_brand=10;
-    int32 available_stock=11;
-    int32 restock_threshold=12;
-    int32 max_stock_threshold=13;
-    bool on_reorder=14;
-}
-
-message CatalogBrand {
-	int32 id = 1;
-	string name = 2;
-}
-
-message CatalogType {
-	int32 id = 1;
-	string type = 2;
-}
-
-service Catalog {
-  rpc GetItemById (CatalogItemRequest) returns (CatalogItemResponse) {
-	option (google.api.http) = {
-        get: "/api/v1/catalog/items/{id}"
-      };
-  }
-}
\ No newline at end of file
diff --git a/src/ApiGateways/Envoy/config/catalog.proto-descriptor.pb b/src/ApiGateways/Envoy/config/catalog.proto-descriptor.pb
deleted file mode 100644
index 7c94ce9f0..000000000
Binary files a/src/ApiGateways/Envoy/config/catalog.proto-descriptor.pb and /dev/null differ
diff --git a/src/ApiGateways/Envoy/config/envoy.yaml b/src/ApiGateways/Envoy/config/envoy.yaml
index 9e191ace2..de8bd6058 100644
--- a/src/ApiGateways/Envoy/config/envoy.yaml
+++ b/src/ApiGateways/Envoy/config/envoy.yaml
@@ -1,56 +1,80 @@
 admin:
-  access_log_path: /tmp/admin_access.log
+  access_log_path: "/dev/null"
   address:
-    socket_address: { address: 0.0.0.0, port_value: 9901 }
-
+    socket_address:
+      address: 0.0.0.0
+      port_value: 8001
 static_resources:
   listeners:
-  - name: listener1
-    address:
-      socket_address: { address: 0.0.0.0, port_value: 51051 }
+  - address:
+      socket_address:
+        address: 0.0.0.0
+        port_value: 80
     filter_chains:
     - filters:
       - name: envoy.http_connection_manager
-        typed_config:
-          "@type": type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager
-          stat_prefix: grpc_json
-          codec_type: AUTO
+        config:
+          codec_type: auto
+          stat_prefix: ingress_http
           route_config:
-            name: local_route
+            name: eshop_backend_route
             virtual_hosts:
-            - name: local_service
-              domains: ["*"]
+            - name: eshop_backend
+              domains:
+              - "*"
               routes:
-              - match: { prefix: "/" }
-                route: { cluster: grpc, timeout: { seconds: 60 } }
+              - match:
+                  prefix: "/api/v1/c/"
+                route:
+                  prefix_rewrite: "/api/v1/"
+                  cluster: catalog
+              - match:
+                  prefix: "/api/v1/o/"
+                route:
+                  prefix_rewrite: "/api/v1/"
+                  cluster: ordering 
+              - match:
+                  prefix: "/api/v1/b/"
+                route:
+                  prefix_rewrite: "/api/v1/"
+                  cluster: basket
+              - match:
+                  prefix: "/"
+                route:
+                  prefix_rewrite: "/"
+                  cluster: shoppingagg
           http_filters:
-          - name: envoy.grpc_json_transcoder
-            config:
-              proto_descriptor: "/etc/envoy/catalog.proto-descriptor.pb"
-              services: ["CatalogApi.Catalog"]
-              print_options:
-                add_whitespace: true
-                always_print_primitive_fields: true
-                always_print_enums_as_ints: false
-                preserve_proto_field_names: false
-          - name: envoy.router
-
+          - name: envoy.router            
   clusters:
-  - name: grpc
-    connect_timeout: 1.25s
+  - name: shoppingagg
+    connect_timeout: 0.25s
     type: logical_dns
     lb_policy: round_robin
-    dns_lookup_family: V4_ONLY
-    http2_protocol_options: {}
-    load_assignment:
-      cluster_name: grpc
-      endpoints:
-      - lb_endpoints:
-        - endpoint:
-            address:
-              socket_address:
-                # WARNING: "docker.for.mac.localhost" has been deprecated from Docker v18.03.0.
-                # If you're running an older version of Docker, please use "docker.for.mac.localhost" instead.
-                # Reference: https://docs.docker.com/docker-for-mac/release-notes/#docker-community-edition-18030-ce-mac59-2018-03-26
-                address: catalog.api
-                port_value: 81
\ No newline at end of file
+    hosts:
+    - socket_address:
+        address: webshoppingagg
+        port_value: 80
+  - name: catalog
+    connect_timeout: 0.25s
+    type: logical_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: catalog-api
+        port_value: 80
+  - name: basket
+    connect_timeout: 0.25s
+    type: logical_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: basket-api
+        port_value: 80        
+  - name: ordering
+    connect_timeout: 0.25s
+    type: logical_dns
+    lb_policy: round_robin
+    hosts:
+    - socket_address:
+        address: ordering-api
+        port_value: 80
\ No newline at end of file
diff --git a/src/docker-compose-external.override.yml b/src/docker-compose-external.override.yml
deleted file mode 100644
index 4637385a1..000000000
--- a/src/docker-compose-external.override.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-version: '3.4'
-
-services:
-  sql.data:
-    environment:
-      - MSSQL_SA_PASSWORD=Pass@word
-      - ACCEPT_EULA=Y
-      - MSSQL_PID=Developer
-    ports:
-      - "5433:1433"
-  
-  nosql.data:
-    ports:
-      - "27017:27017"
\ No newline at end of file
diff --git a/src/docker-compose-external.yml b/src/docker-compose-external.yml
deleted file mode 100644
index 22fe4ce89..000000000
--- a/src/docker-compose-external.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: '3.4'
-
-services:
-  sql.data:
-    image: microsoft/mssql-server-linux:2017-latest
-
-  basket.data:
-    image: redis
-    ports:
-      - "6379:6379"
-
-  rabbitmq:
-    image: rabbitmq
-    ports:
-      - "5672:5672"
-  
-  nosql.data:
-    image: mongo
diff --git a/src/docker-compose-windows.prod.yml b/src/docker-compose-windows.prod.yml
index 9b9c552cc..e38767a03 100644
--- a/src/docker-compose-windows.prod.yml
+++ b/src/docker-compose-windows.prod.yml
@@ -13,23 +13,23 @@ version: '3.4'
 
 services:
 
-  basket.api:
+  basket-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
       - ConnectionString=${ESHOP_AZURE_REDIS_BASKET_DB:-basket.data}
-      - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
+      - identityUrl=http://identity-api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
       - IdentityUrlExternal=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
       - AzureServiceBusEnabled=False
     ports:
       - "5103:5103"
 
-  catalog.api:
+  catalog-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=${ESHOP_AZURE_CATALOG_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word}
+      - ConnectionString=${ESHOP_AZURE_CATALOG_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word}
       - PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG:-http://localhost:5101/api/v1/catalog/items/[0]/pic/}   #Local: You need to open your local dev-machine firewall at range 5100-5110.  
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
       - AzureStorageAccountName=${ESHOP_AZURE_STORAGE_CATALOG_NAME}
@@ -40,13 +40,13 @@ services:
     ports:
       - "5101:80"
 
-  identity.api:
+  identity-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
       - SpaClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5104
       - XamarinCallback=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105/xamarincallback
-      - ConnectionStrings__DefaultConnection=${ESHOP_AZURE_IDENTITY_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word}       
+      - ConnectionStrings__DefaultConnection=${ESHOP_AZURE_IDENTITY_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word}       
       - MvcClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5100              #Local: You need to open your local dev-machine firewall at range 5100-5110. 
       - LocationApiClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5109
       - MarketingApiClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5110
@@ -56,12 +56,12 @@ services:
     ports:
       - "5105:80"
 
-  ordering.api:
+  ordering-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
-      - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
+      - ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
+      - identityUrl=http://identity-api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
       - IdentityUrlExternal=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
       - UseCustomizationData=True
@@ -73,7 +73,7 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
+      - ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
       - UseCustomizationData=True
       - AzureServiceBusEnabled=False
@@ -89,11 +89,11 @@ services:
       - IdentityUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105              #Local: You need to open your host's firewall at range 5100-5110. 
       - BasketUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5103
       - MarketingUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5110
-      - CatalogUrlHC=http://catalog.api/hc
-      - OrderingUrlHC=http://ordering.api/hc
-      - IdentityUrlHC=http://identity.api/hc     #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.          
-      - BasketUrlHC=http://basket.api/hc
-      - MarketingUrlHC=http://marketing.api/hc
+      - CatalogUrlHC=http://catalog-api/hc
+      - OrderingUrlHC=http://ordering-api/hc
+      - IdentityUrlHC=http://identity-api/hc     #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.          
+      - BasketUrlHC=http://basket-api/hc
+      - MarketingUrlHC=http://marketing-api/hc
       - UseCustomizationData=True         
     ports:
       - "5104:80"
@@ -102,24 +102,24 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - CatalogUrl=http://catalog.api
-      - OrderingUrl=http://ordering.api
+      - CatalogUrl=http://catalog-api
+      - OrderingUrl=http://ordering-api
       - IdentityUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105     #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.          
-      - BasketUrl=http://basket.api
-      - MarketingUrl=http://marketing.api
+      - BasketUrl=http://basket-api
+      - MarketingUrl=http://marketing-api
       - UseCustomizationData=True   #Remote: Use ${ESHOP_EXTERNAL_DNS_NAME_OR_IP} if using external IP or DNS name from browser. 
     ports:
       - "5100:80"
   
-  marketing.api:
+  marketing-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=${ESHOP_AZURE_MARKETING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word}
-      - MongoConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosql.data}
+      - ConnectionString=${ESHOP_AZURE_MARKETING_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word}
+      - MongoConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosqldata}
       - MongoDatabase=MarketingDb
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
-      - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110. 
+      - identityUrl=http://identity-api              #Local: You need to open your local dev-machine firewall at range 5100-5110. 
       - IdentityUrlExternal=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105
       - CampaignDetailFunctionUri=${ESHOP_AZUREFUNC_CAMPAIGN_DETAILS_URI}
       - PicBaseUrl=${ESHOP_AZURE_STORAGE_MARKETING:-http://localhost:5110/api/v1/campaigns/[0]/pic/}
@@ -130,14 +130,14 @@ services:
     ports:
       - "5110:80"
 
-  sql.data:
+  sqldata:
     environment:
       - MSSQL_SA_PASSWORD=Pass@word
       - ACCEPT_EULA=Y
     ports:
       - "5433:1433"
   
-  nosql.data:
+  nosqldata:
     ports:
       - "27017:27017"
 
@@ -145,19 +145,19 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - CatalogUrl=http://catalog.api/hc
-      - OrderingUrl=http://ordering.api/hc
-      - BasketUrl=http://basket.api/hc
-      - IdentityUrl=http://identity.api/hc
-      - LocationsUrl=http://locations.api/hc
-      - MarketingUrl=http://marketing.api/hc
+      - CatalogUrl=http://catalog-api/hc
+      - OrderingUrl=http://ordering-api/hc
+      - BasketUrl=http://basket-api/hc
+      - IdentityUrl=http://identity-api/hc
+      - LocationsUrl=http://locations-api/hc
+      - MarketingUrl=http://marketing-api/hc
       - mvc=http://webmvc/hc
       - spa=http://webspa/hc
       
     ports:
       - "5107:80"
 
-  payment.api:
+  payment-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:5108
@@ -166,13 +166,13 @@ services:
     ports:
       - "5108:80"
 
-  locations.api:
+  locations-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosql.data}
+      - ConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosqldata}
       - Database=LocationsDb
-      - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110. 
+      - identityUrl=http://identity-api              #Local: You need to open your local dev-machine firewall at range 5100-5110. 
       - IdentityUrlExternal=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
       - AzureServiceBusEnabled=False
diff --git a/src/docker-compose.nobuild.yml b/src/docker-compose.nobuild.yml
deleted file mode 100644
index b2ebcf903..000000000
--- a/src/docker-compose.nobuild.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-version: '3.4'
-
-services:
-  basket.api:
-    image: eshop/basket.api
-    depends_on:
-      - basket.data
-      - identity.api
-      - rabbitmq
-
-  catalog.api:
-    image: eshop/catalog.api
-    depends_on:
-      - sql.data
-      - rabbitmq
-
-  identity.api:
-    image: eshop/identity.api
-    depends_on:
-      - sql.data
-
-  ordering.api:
-    image: eshop/ordering.api
-    depends_on:
-      - sql.data
-      - rabbitmq
-
-  marketing.api:
-    image: eshop/marketing.api   
-    depends_on:
-      - sql.data
-      - nosql.data
-      - identity.api
-      - rabbitmq      
-
-  webspa:
-    image: eshop/webspa
-    depends_on:
-      - catalog.api
-      - ordering.api
-      - identity.api
-      - basket.api
-      - marketing.api
-
-  webmvc:
-    image: eshop/webmvc  
-    depends_on:
-      - catalog.api
-      - ordering.api
-      - identity.api
-      - basket.api
-      - marketing.api
-
-  webstatus:
-    image: eshop/webstatus
-    
-  payment.api:
-    image: eshop/payment.api
-    depends_on:
-      - rabbitmq         
-
-  locations.api:
-    image: eshop/locations.api
-    depends_on:
-      - nosql.data
-      - rabbitmq
-
-  sql.data:
-    image: microsoft/mssql-server-linux:2017-latest
-  
-  nosql.data:
-    image: mongo
-  
-  basket.data:
-    image: redis
-    ports:
-      - "6379:6379"
-
-  rabbitmq:
-    image: rabbitmq:3-management
-    ports:
-      - "5672:5672"
-
diff --git a/src/docker-compose.override.windows.yml b/src/docker-compose.override.windows.yml
index dcaac7c45..89b26092a 100644
--- a/src/docker-compose.override.windows.yml
+++ b/src/docker-compose.override.windows.yml
@@ -22,37 +22,37 @@ version: '3.4'
 # docker-compose -f docker-compose-windows.yml -f docker-compose.override.yml -f docker-compose.override.windows.yml up
 
 services:      
-  basket.api:
+  basket-api:
     environment:
       - EventBusUserName=admin
       - EventBusPassword=password
 
-  catalog.api:
+  catalog-api:
     environment:
       - EventBusUserName=admin
       - EventBusPassword=password
 
-  ordering.api:
+  ordering-api:
     environment:
       - EventBusUserName=admin
       - EventBusPassword=password
 
-  ordering.backgroundtasks:
+  ordering-backgroundtasks:
     environment:
       - EventBusUserName=admin
       - EventBusPassword=password
 
-  payment.api:
+  payment-api:
     environment:
       - EventBusUserName=admin
       - EventBusPassword=password
 
-  locations.api:
+  locations-api:
     environment:
       - EventBusUserName=admin
       - EventBusPassword=password
 
-  ordering.signalrhub:
+  ordering-signalrhub:
     environment:
       - EventBusUserName=admin
       - EventBusPassword=password
diff --git a/src/docker-compose.override.yml b/src/docker-compose.override.yml
index fe9d89ca1..39921107a 100644
--- a/src/docker-compose.override.yml
+++ b/src/docker-compose.override.yml
@@ -13,18 +13,18 @@ services:
     ports:
       - "5340:80"
 
-  sql.data:
+  sqldata:
     environment:
       - SA_PASSWORD=Pass@word
       - ACCEPT_EULA=Y
     ports:
       - "5433:1433"    
 
-  nosql.data:
+  nosqldata:
     ports:
       - "27017:27017"  
 
-  basket.data:
+  basketdata:
     ports:
       - "6379:6379"    
 
@@ -33,13 +33,13 @@ services:
       - "15672:15672"  
       - "5672:5672"    
 
-  identity.api:
+  identity-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
       - SpaClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5104
       - XamarinCallback=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105/xamarincallback      
-      - ConnectionString=${ESHOP_AZURE_IDENTITY_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word} 
+      - ConnectionString=${ESHOP_AZURE_IDENTITY_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word} 
       - MvcClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5100             
       - LocationApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5109
       - MarketingApiClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5110
@@ -55,12 +55,12 @@ services:
     ports:
       - "5105:80"   
 
-  basket.api:
+  basket-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=${ESHOP_AZURE_REDIS_BASKET_DB:-basket.data}
-      - identityUrl=http://identity.api              
+      - ConnectionString=${ESHOP_AZURE_REDIS_BASKET_DB:-basketdata}
+      - identityUrl=http://identity-api              
       - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
       - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
@@ -74,10 +74,10 @@ services:
       - "5103:80"  
       - "5580:5001"  
 
-  catalog.api:
+  catalog-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - ConnectionString=${ESHOP_AZURE_CATALOG_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word}
+      - ConnectionString=${ESHOP_AZURE_CATALOG_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word}
       - PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG_URL:-http://localhost:5202/api/v1/c/catalog/items/[0]/pic/}   #Local: You need to open your local dev-machine firewall at range 5100-5110.  
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
       - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
@@ -95,12 +95,12 @@ services:
       - "5101:80"
       - "9101:81"
 
-  ordering.api:
+  ordering-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
-      - identityUrl=http://identity.api              
+      - ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
+      - identityUrl=http://identity-api              
       - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
       - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
@@ -112,16 +112,16 @@ services:
       - OrchestratorType=${ORCHESTRATOR_TYPE}
       - UseLoadTest=${USE_LOADTEST:-False}
       - Serilog__MinimumLevel__Override__Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ=Verbose
-      - Serilog__MinimumLevel__Override__Ordering.API=Verbose
+      - Serilog__MinimumLevel__Override__ordering-api=Verbose
     ports:
       - "5102:80" 
       - "5581:5001"  
       
-  ordering.backgroundtasks:
+  ordering-backgroundtasks:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
+      - ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
       - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
       - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}          
@@ -136,17 +136,17 @@ services:
     ports:
       - "5111:80"
 
-  marketing.api:
+  marketing-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=${ESHOP_AZURE_MARKETING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word}
-      - MongoConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosql.data}
+      - ConnectionString=${ESHOP_AZURE_MARKETING_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word}
+      - MongoConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosqldata}
       - MongoDatabase=MarketingDb
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
       - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
       - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}          
-      - identityUrl=http://identity.api              
+      - identityUrl=http://identity-api              
       - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
       - CampaignDetailFunctionUri=${ESHOP_AZUREFUNC_CAMPAIGN_DETAILS_URI}
       - PicBaseUrl=${ESHOP_AZURE_STORAGE_MARKETING_URL:-http://localhost:5110/api/v1/campaigns/[0]/pic/}
@@ -160,7 +160,7 @@ services:
     ports:
       - "5110:80"   
 
-  payment.api:
+  payment-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
@@ -170,18 +170,18 @@ services:
       - AzureServiceBusEnabled=False
       - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
       - OrchestratorType=${ORCHESTRATOR_TYPE}
-      - Serilog__MinimumLevel__Override__Payment.API.IntegrationEvents.EventHandling=Verbose
+      - Serilog__MinimumLevel__Override__payment-api.IntegrationEvents.EventHandling=Verbose
       - Serilog__MinimumLevel__Override__Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ=Verbose
     ports:
       - "5108:80"   
 
-  locations.api:
+  locations-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosql.data}
+      - ConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosqldata}
       - Database=LocationsDb
-      - identityUrl=http://identity.api
+      - identityUrl=http://identity-api
       - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
       - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
@@ -193,15 +193,15 @@ services:
     ports:
       - "5109:80"   
 
-  webhooks.api:
+  webhooks-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=${ESHOP_AZURE_WEBHOOKS_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.WebhooksDb;User Id=sa;Password=Pass@word}
+      - ConnectionString=${ESHOP_AZURE_WEBHOOKS_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.WebhooksDb;User Id=sa;Password=Pass@word}
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
       - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
       - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}    
-      - IdentityUrl=http://identity.api  
+      - IdentityUrl=http://identity-api  
       - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
     ports:
       - "5113:80"   
@@ -209,18 +209,18 @@ services:
   mobileshoppingapigw:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - IdentityUrl=http://identity.api   
-      - urls__basket=http://basket.api
-      - urls__catalog=http://catalog.api
-      - urls__orders=http://ordering.api
-      - urls__identity=http://identity.api
-      - CatalogUrlHC=http://catalog.api/hc
-      - OrderingUrlHC=http://ordering.api/hc
-      - IdentityUrlHC=http://identity.api/hc             
-      - BasketUrlHC=http://basket.api/hc
-      - MarketingUrlHC=http://marketing.api/hc
-      - PaymentUrlHC=http://payment.api/hc
-      - LocationUrlHC=http://locations.api/hc
+      - IdentityUrl=http://identity-api   
+      - urls__basket=http://basket-api
+      - urls__catalog=http://catalog-api
+      - urls__orders=http://ordering-api
+      - urls__identity=http://identity-api
+      - CatalogUrlHC=http://catalog-api/hc
+      - OrderingUrlHC=http://ordering-api/hc
+      - IdentityUrlHC=http://identity-api/hc             
+      - BasketUrlHC=http://basket-api/hc
+      - MarketingUrlHC=http://marketing-api/hc
+      - PaymentUrlHC=http://payment-api/hc
+      - LocationUrlHC=http://locations-api/hc
       - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
     ports:
       - "5200:80"   
@@ -230,14 +230,14 @@ services:
   mobilemarketingapigw:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - IdentityUrl=http://identity.api   
-      - CatalogUrlHC=http://catalog.api/hc
-      - OrderingUrlHC=http://ordering.api/hc
-      - IdentityUrlHC=http://identity.api/hc             
-      - BasketUrlHC=http://basket.api/hc
-      - MarketingUrlHC=http://marketing.api/hc
-      - PaymentUrlHC=http://payment.api/hc
-      - LocationUrlHC=http://locations.api/hc
+      - IdentityUrl=http://identity-api   
+      - CatalogUrlHC=http://catalog-api/hc
+      - OrderingUrlHC=http://ordering-api/hc
+      - IdentityUrlHC=http://identity-api/hc             
+      - BasketUrlHC=http://basket-api/hc
+      - MarketingUrlHC=http://marketing-api/hc
+      - PaymentUrlHC=http://payment-api/hc
+      - LocationUrlHC=http://locations-api/hc
       - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
     ports:
       - "5201:80"   
@@ -247,54 +247,56 @@ services:
   webshoppingapigw:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - IdentityUrl=http://identity.api   
-      - CatalogUrlHC=http://catalog.api/hc
-      - OrderingUrlHC=http://ordering.api/hc
-      - IdentityUrlHC=http://identity.api/hc             
-      - BasketUrlHC=http://basket.api/hc
-      - MarketingUrlHC=http://marketing.api/hc
-      - PaymentUrlHC=http://payment.api/hc
-      - LocationUrlHC=http://locations.api/hc
+      - IdentityUrl=http://identity-api   
+      - CatalogUrlHC=http://catalog-api/hc
+      - OrderingUrlHC=http://ordering-api/hc
+      - IdentityUrlHC=http://identity-api/hc             
+      - BasketUrlHC=http://basket-api/hc
+      - MarketingUrlHC=http://marketing-api/hc
+      - PaymentUrlHC=http://payment-api/hc
+      - LocationUrlHC=http://locations-api/hc
       - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
-    ports:
-      - "5202:80"   
     volumes:
-      - ./ApiGateways/Web.Bff.Shopping/apigw:${ESHOP_OCELOT_VOLUME_SPEC:-/app/configuration}
+      - ./ApiGateways/Envoy/config:/etc/envoy      
+    ports:
+    - "5202:80"
+    - "15202:8001"
 
   webmarketingapigw:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - IdentityUrl=http://identity.api   
-      - CatalogUrlHC=http://catalog.api/hc
-      - OrderingUrlHC=http://ordering.api/hc
-      - IdentityUrlHC=http://identity.api/hc             
-      - BasketUrlHC=http://basket.api/hc
-      - MarketingUrlHC=http://marketing.api/hc
-      - PaymentUrlHC=http://payment.api/hc
-      - LocationUrlHC=http://locations.api/hc
+      - IdentityUrl=http://identity-api   
+      - CatalogUrlHC=http://catalog-api/hc
+      - OrderingUrlHC=http://ordering-api/hc
+      - IdentityUrlHC=http://identity-api/hc             
+      - BasketUrlHC=http://basket-api/hc
+      - MarketingUrlHC=http://marketing-api/hc
+      - PaymentUrlHC=http://payment-api/hc
+      - LocationUrlHC=http://locations-api/hc
       - IdentityUrlExternal=http://10.0.75.1:5105
-    ports:
-      - "5203:80"   
     volumes:
-      - ./ApiGateways/Web.Bff.Marketing/apigw:${ESHOP_OCELOT_VOLUME_SPEC:-/app/configuration}
+      - ./ApiGateways/Envoy/config:/etc/envoy      
+    ports:
+    - "5203:80"
+    - "15203:8001"
 
   mobileshoppingagg:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - urls__basket=http://basket.api
-      - urls__catalog=http://catalog.api
-      - urls__orders=http://ordering.api
-      - urls__identity=http://identity.api
+      - urls__basket=http://basket-api
+      - urls__catalog=http://catalog-api
+      - urls__orders=http://ordering-api
+      - urls__identity=http://identity-api
       - urls__grpcBasket=http://10.0.75.1:5580
       - urls__grpcCatalog=http://10.0.75.1:9101
       - urls__grpcOrdering=http://10.0.75.1:5581
-      - CatalogUrlHC=http://catalog.api/hc
-      - OrderingUrlHC=http://ordering.api/hc
-      - IdentityUrlHC=http://identity.api/hc             
-      - BasketUrlHC=http://basket.api/hc
-      - MarketingUrlHC=http://marketing.api/hc
-      - PaymentUrlHC=http://payment.api/hc
-      - LocationUrlHC=http://locations.api/hc
+      - CatalogUrlHC=http://catalog-api/hc
+      - OrderingUrlHC=http://ordering-api/hc
+      - IdentityUrlHC=http://identity-api/hc             
+      - BasketUrlHC=http://basket-api/hc
+      - MarketingUrlHC=http://marketing-api/hc
+      - PaymentUrlHC=http://payment-api/hc
+      - LocationUrlHC=http://locations-api/hc
       - IdentityUrlExternal=http://10.0.75.1:5105
     ports:
       - "5120:80"   
@@ -302,25 +304,25 @@ services:
   webshoppingagg:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - urls__basket=http://basket.api
-      - urls__catalog=http://catalog.api
-      - urls__orders=http://ordering.api
-      - urls__identity=http://identity.api
+      - urls__basket=http://basket-api
+      - urls__catalog=http://catalog-api
+      - urls__orders=http://ordering-api
+      - urls__identity=http://identity-api
       - urls__grpcBasket=http://10.0.75.1:5580
       - urls__grpcCatalog=http://10.0.75.1:9101
       - urls__grpcOrdering=http://10.0.75.1:5581
-      - CatalogUrlHC=http://catalog.api/hc
-      - OrderingUrlHC=http://ordering.api/hc
-      - IdentityUrlHC=http://identity.api/hc             
-      - BasketUrlHC=http://basket.api/hc
-      - MarketingUrlHC=http://marketing.api/hc
-      - PaymentUrlHC=http://payment.api/hc
-      - LocationUrlHC=http://locations.api/hc
+      - CatalogUrlHC=http://catalog-api/hc
+      - OrderingUrlHC=http://ordering-api/hc
+      - IdentityUrlHC=http://identity-api/hc             
+      - BasketUrlHC=http://basket-api/hc
+      - MarketingUrlHC=http://marketing-api/hc
+      - PaymentUrlHC=http://payment-api/hc
+      - LocationUrlHC=http://locations-api/hc
       - IdentityUrlExternal=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105
     ports:
       - "5121:80"   
 
-  ordering.signalrhub:
+  ordering-signalrhub:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
@@ -330,7 +332,7 @@ services:
       - AzureServiceBusEnabled=False
       - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
       - OrchestratorType=${ORCHESTRATOR_TYPE}
-      - identityUrl=http://identity.api  
+      - identityUrl=http://identity-api  
     ports:
       - "5112:80"
 
@@ -355,23 +357,23 @@ services:
       - HealthChecks-UI__HealthChecks__7__Name=Web Marketing API GW HTTP Check
       - HealthChecks-UI__HealthChecks__7__Uri=http://webmarketingapigw/hc
       - HealthChecks-UI__HealthChecks__8__Name=Ordering HTTP Check
-      - HealthChecks-UI__HealthChecks__8__Uri=http://ordering.api/hc
+      - HealthChecks-UI__HealthChecks__8__Uri=http://ordering-api/hc
       - HealthChecks-UI__HealthChecks__9__Name=Basket HTTP Check
-      - HealthChecks-UI__HealthChecks__9__Uri=http://basket.api/hc
+      - HealthChecks-UI__HealthChecks__9__Uri=http://basket-api/hc
       - HealthChecks-UI__HealthChecks__10__Name=Catalog HTTP Check
-      - HealthChecks-UI__HealthChecks__10__Uri=http://catalog.api/hc
+      - HealthChecks-UI__HealthChecks__10__Uri=http://catalog-api/hc
       - HealthChecks-UI__HealthChecks__11__Name=Identity HTTP Check
-      - HealthChecks-UI__HealthChecks__11__Uri=http://identity.api/hc
+      - HealthChecks-UI__HealthChecks__11__Uri=http://identity-api/hc
       - HealthChecks-UI__HealthChecks__12__Name=Marketing HTTP Check
-      - HealthChecks-UI__HealthChecks__12__Uri=http://marketing.api/hc
+      - HealthChecks-UI__HealthChecks__12__Uri=http://marketing-api/hc
       - HealthChecks-UI__HealthChecks__13__Name=Locations HTTP Check
-      - HealthChecks-UI__HealthChecks__13__Uri=http://locations.api/hc
+      - HealthChecks-UI__HealthChecks__13__Uri=http://locations-api/hc
       - HealthChecks-UI__HealthChecks__14__Name=Payments HTTP Check
-      - HealthChecks-UI__HealthChecks__14__Uri=http://payment.api/hc
+      - HealthChecks-UI__HealthChecks__14__Uri=http://payment-api/hc
       - HealthChecks-UI__HealthChecks__15__Name=Ordering SignalRHub HTTP Check
-      - HealthChecks-UI__HealthChecks__15__Uri=http://ordering.signalrhub/hc    
+      - HealthChecks-UI__HealthChecks__15__Uri=http://ordering-signalrhub/hc    
       - HealthChecks-UI__HealthChecks__16__Name=Ordering HTTP Background Check
-      - HealthChecks-UI__HealthChecks__16__Uri=http://ordering.backgroundtasks/hc      
+      - HealthChecks-UI__HealthChecks__16__Uri=http://ordering-backgroundtasks/hc      
       - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
       - OrchestratorType=${ORCHESTRATOR_TYPE}
     ports:
@@ -386,7 +388,7 @@ services:
       - MarketingUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5203   
       - PurchaseUrlHC=http://webshoppingapigw/hc
       - MarketingUrlHC=http://webmarketingapigw/hc
-      - IdentityUrlHC=http://identity.api/hc
+      - IdentityUrlHC=http://identity-api/hc
       - UseCustomizationData=True
       - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
       - OrchestratorType=${ORCHESTRATOR_TYPE}
@@ -402,7 +404,7 @@ services:
       - IdentityUrl=http://10.0.75.1:5105  
       - MarketingUrl=http://webmarketingapigw                                                          
       - SignalrHubUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5202
-      - IdentityUrlHC=http://identity.api/hc
+      - IdentityUrlHC=http://identity-api/hc
       - PurchaseUrlHC=http://webshoppingapigw/hc
       - MarketingUrlHC=http://webmarketingapigw/hc 
       - UseCustomizationData=True
@@ -412,19 +414,14 @@ services:
     ports:
       - "5100:80"
 
-  webhooks.client:
+  webhooks-client:
     environment:
       - ASPNETCORE_URLS=http://0.0.0.0:80
       - Token=6168DB8D-DC58-4094-AF24-483278923590      # Webhooks are registered with this token (any value is valid) but the client won't check it
       - IdentityUrl=http://10.0.75.1:5105
       - CallBackUrl=http://localhost:5114
-      - WebhooksUrl=http://webhooks.api
-      - SelfUrl=http://webhooks.client/
+      - WebhooksUrl=http://webhooks-api
+      - SelfUrl=http://webhooks-client/
     ports:
       - "5114:80"
 
-  envoy:
-    volumes:
-      - ./ApiGateways/Envoy/config:/etc/envoy      
-    ports:
-    - "51051:51051"
\ No newline at end of file
diff --git a/src/docker-compose.prod.yml b/src/docker-compose.prod.yml
index de88fd718..7548a4154 100644
--- a/src/docker-compose.prod.yml
+++ b/src/docker-compose.prod.yml
@@ -15,12 +15,12 @@ version: '3.4'
 
 services:
       
-  basket.api:
+  basket-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
       - ConnectionString=${ESHOP_AZURE_REDIS_BASKET_DB:-basket.data}
-      - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
+      - identityUrl=http://identity-api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
       - IdentityUrlExternal=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
       - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
@@ -33,11 +33,11 @@ services:
     ports:
       - "80"   # The API Gateway redirects and access through the internal port (80). 
 
-  catalog.api:
+  catalog-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=${ESHOP_AZURE_CATALOG_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word}
+      - ConnectionString=${ESHOP_AZURE_CATALOG_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word}
       - PicBaseUrl=${ESHOP_AZURE_STORAGE_CATALOG_URL:-http://localhost:5101/api/v1/catalog/items/[0]/pic/}   #Local: You need to open your local dev-machine firewall at range 5100-5110.  
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
       - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
@@ -52,13 +52,13 @@ services:
     ports:
       - "80"   # The API Gateway redirects and access through the internal port (80). 
 
-  identity.api:
+  identity-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
       - SpaClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5104
       - XamarinCallback=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105/xamarincallback      #localhost do not work for UWP login, so we have to use "external" IP always
-      - ConnectionString=${ESHOP_AZURE_IDENTITY_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word} 
+      - ConnectionString=${ESHOP_AZURE_IDENTITY_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word} 
       - MvcClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5100              #Local: You need to open your local dev-machine firewall at range 5100-5110. 
       - LocationApiClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5109
       - MarketingApiClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5110
@@ -72,12 +72,12 @@ services:
     ports:
       - "5105:80"   
 
-  ordering.api:
+  ordering-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
-      - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
+      - ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
+      - identityUrl=http://identity-api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
       - IdentityUrlExternal=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
       - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
@@ -95,7 +95,7 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
+      - ConnectionString=${ESHOP_AZURE_ORDERING_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word}
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
       - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
       - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}          
@@ -109,17 +109,17 @@ services:
     ports:
       - "5111:80"
 
-  marketing.api:
+  marketing-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=${ESHOP_AZURE_MARKETING_DB:-Server=sql.data;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word}
-      - MongoConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosql.data}
+      - ConnectionString=${ESHOP_AZURE_MARKETING_DB:-Server=sqldata;Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word}
+      - MongoConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosqldata}
       - MongoDatabase=MarketingDb
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
       - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
       - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}          
-      - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
+      - identityUrl=http://identity-api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
       - IdentityUrlExternal=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105
       - CampaignDetailFunctionUri=${ESHOP_AZUREFUNC_CAMPAIGN_DETAILS_URI}
       - PicBaseUrl=${ESHOP_AZURE_STORAGE_MARKETING_URL:-http://localhost:5110/api/v1/campaigns/[0]/pic/}
@@ -140,12 +140,12 @@ services:
       - IdentityUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105              #Local: You need to open your local dev-machine firewall at range 5100-5105.  at range 5100-5105. 
       - PurchaseUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5202
       - MarketingUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5203      
-      - CatalogUrlHC=http://catalog.api/hc
-      - OrderingUrlHC=http://ordering.api/hc
-      - IdentityUrlHC=http://identity.api/hc     #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.          
-      - BasketUrlHC=http://basket.api/hc
-      - MarketingUrlHC=http://marketing.api/hc
-      - PaymentUrlHC=http://payment.api/hc
+      - CatalogUrlHC=http://catalog-api/hc
+      - OrderingUrlHC=http://ordering-api/hc
+      - IdentityUrlHC=http://identity-api/hc     #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.          
+      - BasketUrlHC=http://basket-api/hc
+      - MarketingUrlHC=http://marketing-api/hc
+      - PaymentUrlHC=http://payment-api/hc
       - UseCustomizationData=True
       - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
       - OrchestratorType=${ORCHESTRATOR_TYPE}
@@ -159,12 +159,12 @@ services:
       - PurchaseUrl=http://webshoppingapigw
       - IdentityUrl=http://10.0.75.1:5105  # Local Mac: Use http://docker.for.mac.localhost:5105 || Local Windows:  Use 10.0.75.1 in a "Docker for Windows" environment, if using "localhost" from browser. || #Remote access: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP} if using external IP or DNS name from browser.
       - MarketingUrl=http://webmarketingapigw                                                    
-      - CatalogUrlHC=http://catalog.api/hc
-      - OrderingUrlHC=http://ordering.api/hc
-      - IdentityUrlHC=http://identity.api/hc     #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.          
-      - BasketUrlHC=http://basket.api/hc
-      - MarketingUrlHC=http://marketing.api/hc
-      - PaymentUrlHC=http://payment.api/hc
+      - CatalogUrlHC=http://catalog-api/hc
+      - OrderingUrlHC=http://ordering-api/hc
+      - IdentityUrlHC=http://identity-api/hc     #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.          
+      - BasketUrlHC=http://basket-api/hc
+      - MarketingUrlHC=http://marketing-api/hc
+      - PaymentUrlHC=http://payment-api/hc
       - UseCustomizationData=True
       - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
       - OrchestratorType=${ORCHESTRATOR_TYPE}
@@ -176,13 +176,13 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - CatalogUrl=http://catalog.api/hc
-      - OrderingUrl=http://ordering.api/hc
-      - BasketUrl=http://basket.api/hc
-      - IdentityUrl=http://identity.api/hc
-      - LocationsUrl=http://locations.api/hc
-      - MarketingUrl=http://marketing.api/hc
-      - PaymentUrl=http://payment.api/hc
+      - CatalogUrl=http://catalog-api/hc
+      - OrderingUrl=http://ordering-api/hc
+      - BasketUrl=http://basket-api/hc
+      - IdentityUrl=http://identity-api/hc
+      - LocationsUrl=http://locations-api/hc
+      - MarketingUrl=http://marketing-api/hc
+      - PaymentUrl=http://payment-api/hc
       - mvc=http://webmvc/hc
       - spa=http://webspa/hc
       - ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
@@ -190,7 +190,7 @@ services:
     ports:
       - "5107:80"
 
-  payment.api:
+  payment-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
@@ -203,13 +203,13 @@ services:
     ports:
       - "80"   # The API Gateway redirects and access through the internal port (80).
 
-  locations.api:
+  locations-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - ConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosql.data}
+      - ConnectionString=${ESHOP_AZURE_COSMOSDB:-mongodb://nosqldata}
       - Database=LocationsDb
-      - identityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110. 
+      - identityUrl=http://identity-api              #Local: You need to open your local dev-machine firewall at range 5100-5110. 
       - IdentityUrlExternal=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
       - EventBusUserName=${ESHOP_SERVICE_BUS_USERNAME}
@@ -221,14 +221,14 @@ services:
     ports:
       - "80"   # The API Gateway redirects and access through the internal port (80).
 
-  sql.data:
+  sqldata:
     environment:
       - SA_PASSWORD=Pass@word
       - ACCEPT_EULA=Y
     ports:
       - "5433:1433"    # Important: In a production environment your should remove the external port
 
-  nosql.data:
+  nosqldata:
     ports:
       - "27017:27017"  # Important: In a production environment your should remove the external port
 
@@ -244,7 +244,7 @@ services:
   mobileshoppingapigw:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - IdentityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
+      - IdentityUrl=http://identity-api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
     ports:
       - "5200:80"   # Important: In a production environment your should remove the external port (5200) kept here for microservice debugging purposes. 
                     # The API Gateway redirects and access through the internal port (80).
@@ -254,7 +254,7 @@ services:
   mobilemarketingapigw:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - IdentityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
+      - IdentityUrl=http://identity-api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
     ports:
       - "5201:80"   # Important: In a production environment your should remove the external port (5201) kept here for microservice debugging purposes. 
                     # The API Gateway redirects and access through the internal port (80).
@@ -264,7 +264,7 @@ services:
   webshoppingapigw:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - IdentityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
+      - IdentityUrl=http://identity-api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
     ports:
       - "5202:80"   # Important: In a production environment your should remove the external port (5202) kept here for microservice debugging purposes. 
                     # The API Gateway redirects and access through the internal port (80).
@@ -274,7 +274,7 @@ services:
   webmarketingapigw:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - IdentityUrl=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
+      - IdentityUrl=http://identity-api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
     ports:
       - "5203:80"   # Important: In a production environment your should remove the external port (5203) kept here for microservice debugging purposes. 
                     # The API Gateway redirects and access through the internal port (80).
@@ -284,10 +284,10 @@ services:
   mobileshoppingagg:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - urls__basket=http://basket.api
-      - urls__catalog=http://catalog.api
-      - urls__orders=http://ordering.api
-      - urls__identity=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
+      - urls__basket=http://basket-api
+      - urls__catalog=http://catalog-api
+      - urls__orders=http://ordering-api
+      - urls__identity=http://identity-api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
     ports:
       - "80"   # Important: In a production environment your should remove the external port (5120) kept here for microservice debugging purposes. 
                     # The API Gateway redirects and access through the internal port (80).
@@ -295,10 +295,10 @@ services:
   webshoppingagg:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-      - urls__basket=http://basket.api
-      - urls__catalog=http://catalog.api
-      - urls__orders=http://ordering.api
-      - urls__identity=http://identity.api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
+      - urls__basket=http://basket-api
+      - urls__catalog=http://catalog-api
+      - urls__orders=http://ordering-api
+      - urls__identity=http://identity-api              #Local: You need to open your local dev-machine firewall at range 5100-5110.
     ports:
       - "80"   # Important: In a production environment your should remove the external port (5121) kept here for microservice debugging purposes. 
                     # The API Gateway redirects and access through the internal port (80).
diff --git a/src/docker-compose.windows.yml b/src/docker-compose.windows.yml
index afc7e4e91..f57efc0f4 100644
--- a/src/docker-compose.windows.yml
+++ b/src/docker-compose.windows.yml
@@ -5,10 +5,10 @@
 version: '3.4'
 
 services:
-  sql.data:
+  sqldata:
     image: microsoft/mssql-server-windows-developer
 
-  nosql.data:
+  nosqldata:
     image: mongo:windowsservercore
 
   basket.data:
@@ -17,7 +17,7 @@ services:
   rabbitmq:
     image: spring2/rabbitmq
 
-  identity.api:
+  identity-api:
     build:
       args:
         NODE_IMAGE: stefanscherer/node-windows:8.11
diff --git a/src/docker-compose.yml b/src/docker-compose.yml
index 7322fe63a..59520672c 100644
--- a/src/docker-compose.yml
+++ b/src/docker-compose.yml
@@ -5,75 +5,75 @@ services:
   seq:
     image: datalust/seq:latest
 
-  sql.data:
+  sqldata:
     image: microsoft/mssql-server-linux:2017-latest
 
-  nosql.data:
+  nosqldata:
     image: mongo
 
-  basket.data:
+  basketdata:
     image: redis:alpine
 
   rabbitmq:
     image: rabbitmq:3-management-alpine
 
-  identity.api:
+  identity-api:
     image: ${REGISTRY:-eshop}/identity.api:${PLATFORM:-linux}-${TAG:-latest}
     build:
       context: .
       dockerfile: Services/Identity/Identity.API/Dockerfile    
     depends_on:
-      - sql.data
+      - sqldata
 
-  basket.api:
+  basket-api:
     image: ${REGISTRY:-eshop}/basket.api:${PLATFORM:-linux}-${TAG:-latest}
     build:
       context: .
       dockerfile: Services/Basket/Basket.API/Dockerfile    
     depends_on:
-      - basket.data
-      - identity.api
+      - basketdata
+      - identity-api
       - rabbitmq
 
-  catalog.api:
+  catalog-api:
     image: ${REGISTRY:-eshop}/catalog.api:${PLATFORM:-linux}-${TAG:-latest}
     build:
       context: .
       dockerfile: Services/Catalog/Catalog.API/Dockerfile
     depends_on:
-      - sql.data
+      - sqldata
       - rabbitmq
 
-  ordering.api:
+  ordering-api:
     image: ${REGISTRY:-eshop}/ordering.api:${PLATFORM:-linux}-${TAG:-latest}
     build:
       context: .
       dockerfile: Services/Ordering/Ordering.API/Dockerfile    
     depends_on:
-      - sql.data
+      - sqldata
       - rabbitmq
 
-  ordering.backgroundtasks:
+  ordering-backgroundtasks:
     image: ${REGISTRY:-eshop}/ordering.backgroundtasks:${PLATFORM:-linux}-${TAG:-latest}
     build:
       context: .
       dockerfile: Services/Ordering/Ordering.BackgroundTasks/Dockerfile    
     depends_on:
-      - sql.data
+      - sqldata
       - rabbitmq
 
-  marketing.api:
+  marketing-api:
     image: ${REGISTRY:-eshop}/marketing.api:${PLATFORM:-linux}-${TAG:-latest}
     build:
       context: .
       dockerfile: Services/Marketing/Marketing.API/Dockerfile    
     depends_on:
-      - sql.data
-      - nosql.data
-      - identity.api
+      - sqldata
+      - nosqldata
+      - identity-api
       - rabbitmq
 
-  payment.api:
+  payment-api:
     image: ${REGISTRY:-eshop}/payment.api:${PLATFORM:-linux}-${TAG:-latest}
     build:
       context: .
@@ -81,22 +81,22 @@ services:
     depends_on:
       - rabbitmq    
 
-  locations.api:
+  locations-api:
     image: ${REGISTRY:-eshop}/locations.api:${PLATFORM:-linux}-${TAG:-latest}
     build:
       context: .
       dockerfile: Services/Location/Locations.API/Dockerfile
     depends_on:
-      - nosql.data
+      - nosqldata
       - rabbitmq
 
-  webhooks.api:
+  webhooks-api:
     image: ${REGISTRY:-eshop}/webhooks.api:${PLATFORM:-linux}-${TAG:-latest}
     build:
       context: .
       dockerfile: Services/Webhooks/Webhooks.API/Dockerfile
     depends_on:
-      - sql.data    
+      - sqldata    
 
   mobileshoppingapigw:
     image: ${REGISTRY:-eshop}/ocelotapigw:${PLATFORM:-linux}-${TAG:-latest}
@@ -104,14 +104,14 @@ services:
       context: .
       dockerfile: ApiGateways/ApiGw-Base/Dockerfile
     depends_on:
-      - nosql.data
-      - sql.data
-      - identity.api
+      - nosqldata
+      - sqldata
+      - identity-api
       - rabbitmq
-      - ordering.api
-      - marketing.api
-      - catalog.api
-      - basket.api
+      - ordering-api
+      - marketing-api
+      - catalog-api
+      - basket-api
 
   mobilemarketingapigw:
     image: ${REGISTRY:-eshop}/ocelotapigw:${PLATFORM:-linux}-${TAG:-latest}
@@ -119,44 +119,14 @@ services:
       context: .
       dockerfile: ApiGateways/ApiGw-Base/Dockerfile
     depends_on:
-      - nosql.data
-      - sql.data
-      - identity.api
+      - nosqldata
+      - sqldata
+      - identity-api
       - rabbitmq
-      - ordering.api
-      - marketing.api
-      - catalog.api
-      - basket.api
-
-  webshoppingapigw:
-    image: ${REGISTRY:-eshop}/ocelotapigw:${PLATFORM:-linux}-${TAG:-latest}
-    build:
-      context: .
-      dockerfile: ApiGateways/ApiGw-Base/Dockerfile
-    depends_on:
-      - nosql.data
-      - sql.data
-      - identity.api
-      - rabbitmq
-      - ordering.api
-      - marketing.api
-      - catalog.api
-      - basket.api
-
-  webmarketingapigw:
-    image: ${REGISTRY:-eshop}/ocelotapigw:${PLATFORM:-linux}-${TAG:-latest}
-    build:
-      context: .
-      dockerfile: ApiGateways/ApiGw-Base/Dockerfile
-    depends_on:
-      - nosql.data
-      - sql.data
-      - identity.api
-      - rabbitmq
-      - ordering.api
-      - marketing.api
-      - catalog.api
-      - basket.api
+      - ordering-api
+      - marketing-api
+      - catalog-api
+      - basket-api
 
   mobileshoppingagg:
     image: ${REGISTRY:-eshop}/mobileshoppingagg:${PLATFORM:-linux}-${TAG:-latest}
@@ -164,14 +134,14 @@ services:
       context: .
       dockerfile: ApiGateways/Mobile.Bff.Shopping/aggregator/Dockerfile
     depends_on:
-      - nosql.data
-      - sql.data
-      - identity.api
+      - nosqldata
+      - sqldata
+      - identity-api
       - rabbitmq
-      - ordering.api
-      - marketing.api
-      - catalog.api
-      - basket.api
+      - ordering-api
+      - marketing-api
+      - catalog-api
+      - basket-api
 
   webshoppingagg:
     image: ${REGISTRY:-eshop}/webshoppingagg:${PLATFORM:-linux}-${TAG:-latest}
@@ -179,29 +149,29 @@ services:
       context: .
       dockerfile: ApiGateways/Web.Bff.Shopping/aggregator/Dockerfile
     depends_on:
-      - nosql.data
-      - sql.data
-      - identity.api
+      - nosqldata
+      - sqldata
+      - identity-api
       - rabbitmq
-      - ordering.api
-      - marketing.api
-      - catalog.api
-      - basket.api
+      - ordering-api
+      - marketing-api
+      - catalog-api
+      - basket-api
 
-  ordering.signalrhub:
+  ordering-signalrhub:
     image: ${REGISTRY:-eshop}/ordering.signalrhub:${PLATFORM:-linux}-${TAG:-latest}
     build:
       context: .
       dockerfile: Services/Ordering/Ordering.SignalrHub/Dockerfile
     depends_on:
-      - nosql.data
-      - sql.data
-      - identity.api
+      - nosqldata
+      - sqldata
+      - identity-api
       - rabbitmq
-      - ordering.api
-      - marketing.api
-      - catalog.api
-      - basket.api
+      - ordering-api
+      - marketing-api
+      - catalog-api
+      - basket-api
 
   webstatus:
     image: ${REGISTRY:-eshop}/webstatus:${PLATFORM:-linux}-${TAG:-latest}
@@ -231,13 +201,16 @@ services:
       - webshoppingapigw
       - webmarketingapigw
 
-  webhooks.client:
+  webhooks-client:
     image: ${REGISTRY:-eshop}/webhooks.client:${PLATFORM:-linux}-${TAG:-latest}
     build:
       context: .
       dockerfile: Web/WebhookClient/Dockerfile
     depends_on:
-      - webhooks.api    
+      - webhooks-api    
+
+  webshoppingapigw:
+    image: envoyproxy/envoy:v1.11.1
 
-  envoy:
-    image: envoyproxy/envoy
\ No newline at end of file
+  webmarketingapigw:
+    image: envoyproxy/envoy:v1.11.1