diff --git a/src/ApiGateways/Envoy/tye-config/mobilemarketing/envoy.yaml b/src/ApiGateways/Envoy/tye-config/mobilemarketing/envoy.yaml
index 54b1afa06..e660aef32 100644
--- a/src/ApiGateways/Envoy/tye-config/mobilemarketing/envoy.yaml
+++ b/src/ApiGateways/Envoy/tye-config/mobilemarketing/envoy.yaml
@@ -28,16 +28,17 @@ static_resources:
                   prefix: "/m/"
                 route:
                   auto_host_rewrite: true
-                  prefix_rewrite: "/marketing-api/"
+                  prefix_rewrite: "/"
                   cluster: marketing
               - name: "m-long"
                 match:
                   prefix: "/marketing-api/"
                 route:
                   auto_host_rewrite: true
+                  prefix_rewrite: "/"
                   cluster: marketing
           http_filters:
-          - name: envoy.router  
+          - name: envoy.router      
           access_log:
           - name: envoy.file_access_log
             filter:
@@ -54,22 +55,22 @@ static_resources:
                 route_name: "%ROUTE_NAME%"
                 upstream_host: "%UPSTREAM_HOST%"
                 upstream_cluster: "%UPSTREAM_CLUSTER%"
-                upstream_local_address: "%UPSTREAM_LOCAL_ADDRESS%"    
-              path: "/tmp/access.log"                 
+                upstream_local_address: "%UPSTREAM_LOCAL_ADDRESS%"     
+              path: "/tmp/access.log"
   clusters:
   - name: marketing
     connect_timeout: 0.25s
-    type: logical_dns
+    type: strict_dns
     lb_policy: round_robin
     hosts:
     - socket_address:
-        address: marketing-api
-        port_value: 80
+        address: host.docker.internal
+        port_value: 5110 
   - name: locations
     connect_timeout: 0.25s
-    type: logical_dns
+    type: strict_dns
     lb_policy: round_robin
     hosts:
     - socket_address:
-        address: locations-api
+        address: host.docker.internal
         port_value: 80
diff --git a/src/ApiGateways/Envoy/tye-config/mobileshopping/envoy.yaml b/src/ApiGateways/Envoy/tye-config/mobileshopping/envoy.yaml
index 1ae8c45a1..ecc9eaa7b 100644
--- a/src/ApiGateways/Envoy/tye-config/mobileshopping/envoy.yaml
+++ b/src/ApiGateways/Envoy/tye-config/mobileshopping/envoy.yaml
@@ -28,7 +28,7 @@ static_resources:
                   prefix: "/c/"
                 route:
                   auto_host_rewrite: true
-                  prefix_rewrite: "/catalog-api/"
+                  prefix_rewrite: "/"
                   cluster: catalog
               - name: "c-long"
                 match:
@@ -41,7 +41,7 @@ static_resources:
                   prefix: "/o/"
                 route:
                   auto_host_rewrite: true
-                  prefix_rewrite: "/ordering-api/"
+                  prefix_rewrite: "/"
                   cluster: ordering
               - name: "o-long"
                 match:
@@ -61,7 +61,7 @@ static_resources:
                   prefix: "/b/"
                 route:
                   auto_host_rewrite: true
-                  prefix_rewrite: "/basket-api/"
+                  prefix_rewrite: "/"
                   cluster: basket
               - name: "b-long"
                 match:
@@ -103,37 +103,37 @@ static_resources:
     lb_policy: round_robin
     hosts:
     - socket_address:
-        address: webshoppingagg
-        port_value: 80
+        address: host.docker.internal
+        port_value: 5121
   - name: catalog
     connect_timeout: 0.25s
     type: strict_dns
     lb_policy: round_robin
     hosts:
     - socket_address:
-        address: catalog-api
-        port_value: 80
+        address: host.docker.internal
+        port_value: 5101
   - name: basket
     connect_timeout: 0.25s
     type: strict_dns
     lb_policy: round_robin
     hosts:
     - socket_address:
-        address: basket-api
-        port_value: 80
+        address: host.docker.internal
+        port_value: 5103
   - name: ordering
     connect_timeout: 0.25s
     type: strict_dns
     lb_policy: round_robin
     hosts:
     - socket_address:
-        address: ordering-api
-        port_value: 80
+        address: host.docker.internal
+        port_value: 5102
   - name: signalr-hub
     connect_timeout: 0.25s
     type: strict_dns
     lb_policy: round_robin
     hosts:
     - socket_address:
-        address: ordering-signalrhub
-        port_value: 80
+        address: host.docker.internal
+        port_value: 5112
diff --git a/src/tye.yaml b/src/tye.yaml
index 0d1206431..9f869a004 100644
--- a/src/tye.yaml
+++ b/src/tye.yaml
@@ -1,15 +1,6 @@
 name: eshoponcontainers-servicesandwebapps
 services:
 
-- name: seq
-  image: datalust/seq:latest
-  bindings:
-  - port: 5340
-    containerPort: 80
-  env:
-  - name: ACCEPT_EULA
-    value: Y
-
 - name: sqldata
   image: mcr.microsoft.com/mssql/server:2017-latest
   bindings:
@@ -30,7 +21,7 @@ services:
   - port: 27017
     containerPort: 27017
   volumes:
-    - source: eshop-nosqldata-three
+    - source: eshop-nosqldata-four
       target: /data/db
 
 - name: basketdata
@@ -51,7 +42,16 @@ services:
   - name: amqp-binding
     port: 5672
     containerPort: 5672
-    
+
+- name: seq
+  image: datalust/seq:latest
+  bindings:
+  - port: 5340
+    containerPort: 80
+  env:
+  - name: ACCEPT_EULA
+    value: Y
+
 - name: identity-api
   project: Services/Identity/Identity.API/Identity.API.csproj
   env:
@@ -651,6 +651,8 @@ services:
     value: http://localhost:5100/
   - name: LocationsUrl
     value: http://localhost:5109/
+  - name: SignalrHubUrl
+    value: http://localhost:5202
   - name: IdentityUrlHC
     value: http://localhost:5105/hc
   - name: IsClusterEnv
@@ -678,6 +680,33 @@ services:
     port: 5100
     protocol: http
 
+- name: webspa
+  project: Web/WebSPA/WebSPA.csproj
+  env:
+  - name: ASPNETCORE_ENVIRONMENT
+    value: Development
+  - name: ASPNETCORE_URLS
+    value: http://0.0.0.0:80
+  - name: IdentityUrl
+    value: http://localhost:5105
+  - name: PurchaseUrl
+    value: http://localhost:5202
+  - name: MarketingUrl
+    value: http://localhost:5203
+  - name: IdentityUrlHC
+    value: http://localhost:5105/hc
+  - name: UseCustomizationData
+    value: True
+  - name: ApplicationInsights__InstrumentationKey
+    value: 
+  - name: OrchestratorType
+    value:
+  - name: SignalrHubUrl
+    value: http://localhost:5202
+  bindings:
+  - name: http-port-80-binding
+    port: 5104
+    protocol: http
 
 - name: webhooks-client
   project: Web/WebhookClient/WebhookClient.csproj