diff --git a/src/.env b/src/.env
index 3aac89a3f..6a3254999 100644
--- a/src/.env
+++ b/src/.env
@@ -6,15 +6,15 @@
 
 # Use this values to run the app locally in Windows
 ESHOP_EXTERNAL_DNS_NAME_OR_IP=host.docker.internal
-ESHOP_STORAGE_CATALOG_URL=http://host.docker.internal:5202/c/api/v1/catalog/items/[0]/pic/
+ESHOP_STORAGE_CATALOG_URL=http://host.docker.internal:5121/c/api/v1/catalog/items/[0]/pic/
 
 # Use this values to run the app locally in Mac
 # ESHOP_EXTERNAL_DNS_NAME_OR_IP=docker.for.mac.localhost
-# ESHOP_STORAGE_CATALOG_URL=http://docker.for.mac.localhost:5202/c/api/v1/catalog/items/[0]/pic/
+# ESHOP_STORAGE_CATALOG_URL=http://docker.for.mac.localhost:5121/c/api/v1/catalog/items/[0]/pic/
 
 # Use this values to run the app locally in Linux
 # ESHOP_EXTERNAL_DNS_NAME_OR_IP=docker.for.linux.localhost
-# ESHOP_STORAGE_CATALOG_URL=http://docker.for.linux.localhost:5202/c/api/v1/catalog/items/[0]/pic/
+# ESHOP_STORAGE_CATALOG_URL=http://docker.for.linux.localhost:5121/c/api/v1/catalog/items/[0]/pic/
 
 # Configure this values to the cloud storage locations
 # ESHOP_STORAGE_CATALOG_URL=<YourAzureStorage_Catalog_BLOB_URL>
diff --git a/src/ApiGateways/Envoy/config/mobileshopping/envoy.yaml b/src/ApiGateways/Envoy/config/mobileshopping/envoy.yaml
deleted file mode 100644
index 8f2162ad7..000000000
--- a/src/ApiGateways/Envoy/config/mobileshopping/envoy.yaml
+++ /dev/null
@@ -1,139 +0,0 @@
-admin:
-  access_log_path: "/dev/null"
-  address:
-    socket_address:
-      address: 0.0.0.0
-      port_value: 8001
-static_resources:
-  listeners:
-  - address:
-      socket_address:
-        address: 0.0.0.0
-        port_value: 80
-    filter_chains:
-    - filters:
-      - name: envoy.http_connection_manager
-        config:
-          codec_type: auto
-          stat_prefix: ingress_http
-          route_config:
-            name: eshop_backend_route
-            virtual_hosts:
-            - name: eshop_backend
-              domains:
-              - "*"
-              routes:
-              - name: "c-short"
-                match:
-                  prefix: "/c/"
-                route:
-                  auto_host_rewrite: true
-                  prefix_rewrite: "/catalog-api/"
-                  cluster: catalog
-              - name: "c-long"
-                match:
-                  prefix: "/catalog-api/"
-                route:
-                  auto_host_rewrite: true
-                  cluster: catalog
-              - name: "o-short"
-                match:
-                  prefix: "/o/"
-                route:
-                  auto_host_rewrite: true
-                  prefix_rewrite: "/ordering-api/"
-                  cluster: ordering
-              - name: "o-long"
-                match:
-                  prefix: "/ordering-api/"
-                route:
-                  auto_host_rewrite: true
-                  cluster: ordering
-              - name: "h-long"
-                match:
-                  prefix: "/hub/notificationhub"
-                route:
-                  auto_host_rewrite: true
-                  cluster: signalr-hub
-                  timeout: 300s
-              - name: "b-short"
-                match:
-                  prefix: "/b/"
-                route:
-                  auto_host_rewrite: true
-                  prefix_rewrite: "/basket-api/"
-                  cluster: basket
-              - name: "b-long"
-                match:
-                  prefix: "/basket-api/"
-                route:
-                  auto_host_rewrite: true
-                  cluster: basket
-              - name: "agg"
-                match:
-                  prefix: "/"
-                route:
-                  auto_host_rewrite: true
-                  prefix_rewrite: "/"
-                  cluster: shoppingagg
-          http_filters:
-          - name: envoy.router
-          access_log:
-          - name: envoy.file_access_log
-            filter:
-              not_health_check_filter: {}
-            config:
-              json_format:
-                time: "%START_TIME%"
-                protocol: "%PROTOCOL%"
-                duration: "%DURATION%"
-                request_method: "%REQ(:METHOD)%"
-                request_host: "%REQ(HOST)%"
-                path: "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%"
-                response_flags: "%RESPONSE_FLAGS%"
-                route_name: "%ROUTE_NAME%"
-                upstream_host: "%UPSTREAM_HOST%"
-                upstream_cluster: "%UPSTREAM_CLUSTER%"
-                upstream_local_address: "%UPSTREAM_LOCAL_ADDRESS%"
-              path: "/tmp/access.log"
-  clusters:
-  - name: shoppingagg
-    connect_timeout: 0.25s
-    type: strict_dns
-    lb_policy: round_robin
-    hosts:
-    - socket_address:
-        address: mobileshoppingagg
-        port_value: 80
-  - name: catalog
-    connect_timeout: 0.25s
-    type: strict_dns
-    lb_policy: round_robin
-    hosts:
-    - socket_address:
-        address: catalog-api
-        port_value: 80
-  - name: basket
-    connect_timeout: 0.25s
-    type: strict_dns
-    lb_policy: round_robin
-    hosts:
-    - socket_address:
-        address: basket-api
-        port_value: 80
-  - name: ordering
-    connect_timeout: 0.25s
-    type: strict_dns
-    lb_policy: round_robin
-    hosts:
-    - socket_address:
-        address: ordering-api
-        port_value: 80
-  - name: signalr-hub
-    connect_timeout: 0.25s
-    type: strict_dns
-    lb_policy: round_robin
-    hosts:
-    - socket_address:
-        address: ordering-signalrhub
-        port_value: 80
diff --git a/src/ApiGateways/Envoy/config/webshopping/envoy.yaml b/src/ApiGateways/Envoy/config/webshopping/envoy.yaml
deleted file mode 100644
index 688fb740c..000000000
--- a/src/ApiGateways/Envoy/config/webshopping/envoy.yaml
+++ /dev/null
@@ -1,142 +0,0 @@
-admin:
-  access_log_path: "/dev/null"
-  address:
-    socket_address:
-      address: 0.0.0.0
-      port_value: 8001
-static_resources:
-  listeners:
-  - address:
-      socket_address:
-        address: 0.0.0.0
-        port_value: 80
-    filter_chains:
-    - filters:
-      - name: envoy.http_connection_manager
-        config:
-          codec_type: auto
-          stat_prefix: ingress_http
-          route_config:
-            name: eshop_backend_route
-            virtual_hosts:
-            - name: eshop_backend
-              domains:
-              - "*"
-              routes:
-              - name: "c-short"
-                match:
-                  prefix: "/c/"
-                route:
-                  auto_host_rewrite: true
-                  prefix_rewrite: "/catalog-api/"
-                  cluster: catalog
-              - name: "c-long"
-                match:
-                  prefix: "/catalog-api/"
-                route:
-                  auto_host_rewrite: true
-                  cluster: catalog
-              - name: "o-short"
-                match:
-                  prefix: "/o/"
-                route:
-                  auto_host_rewrite: true
-                  prefix_rewrite: "/ordering-api/"
-                  cluster: ordering
-              - name: "o-long"
-                match:
-                  prefix: "/ordering-api/"
-                route:
-                  auto_host_rewrite: true
-                  cluster: ordering
-              - name: "h-long"
-                match:
-                  prefix: "/hub/notificationhub"
-                route:
-                  auto_host_rewrite: true
-                  cluster: signalr-hub
-                  timeout: 300s
-                  upgrade_configs:
-                    upgrade_type: "websocket"
-                    enabled: true
-              - name: "b-short"
-                match:
-                  prefix: "/b/"
-                route:
-                  auto_host_rewrite: true
-                  prefix_rewrite: "/basket-api/"
-                  cluster: basket
-              - name: "b-long"
-                match:
-                  prefix: "/basket-api/"
-                route:
-                  auto_host_rewrite: true
-                  cluster: basket
-              - name: "agg"
-                match:
-                  prefix: "/"
-                route:
-                  auto_host_rewrite: true
-                  prefix_rewrite: "/"
-                  cluster: shoppingagg
-          http_filters:
-          - name: envoy.router
-          access_log:
-          - name: envoy.file_access_log
-            filter:
-              not_health_check_filter: {}
-            config:
-              json_format:
-                time: "%START_TIME%"
-                protocol: "%PROTOCOL%"
-                duration: "%DURATION%"
-                request_method: "%REQ(:METHOD)%"
-                request_host: "%REQ(HOST)%"
-                path: "%REQ(X-ENVOY-ORIGINAL-PATH?:PATH)%"
-                response_flags: "%RESPONSE_FLAGS%"
-                route_name: "%ROUTE_NAME%"
-                upstream_host: "%UPSTREAM_HOST%"
-                upstream_cluster: "%UPSTREAM_CLUSTER%"
-                upstream_local_address: "%UPSTREAM_LOCAL_ADDRESS%"
-              path: "/tmp/access.log"
-  clusters:
-  - name: shoppingagg
-    connect_timeout: 0.25s
-    type: strict_dns
-    lb_policy: round_robin
-    hosts:
-    - socket_address:
-        address: webshoppingagg
-        port_value: 80
-  - name: catalog
-    connect_timeout: 0.25s
-    type: strict_dns
-    lb_policy: round_robin
-    hosts:
-    - socket_address:
-        address: catalog-api
-        port_value: 80
-  - name: basket
-    connect_timeout: 0.25s
-    type: strict_dns
-    lb_policy: round_robin
-    hosts:
-    - socket_address:
-        address: basket-api
-        port_value: 80
-  - name: ordering
-    connect_timeout: 0.25s
-    type: strict_dns
-    lb_policy: round_robin
-    hosts:
-    - socket_address:
-        address: ordering-api
-        port_value: 80
-  - name: signalr-hub
-    connect_timeout: 0.25s
-    type: strict_dns
-    lb_policy: round_robin
-    hosts:
-    - socket_address:
-        address: ordering-signalrhub
-        port_value: 80
diff --git a/src/docker-compose.override.yml b/src/docker-compose.override.yml
index 4acec25f1..086804125 100644
--- a/src/docker-compose.override.yml
+++ b/src/docker-compose.override.yml
@@ -169,20 +169,6 @@ services:
     ports:
       - "5113:80"
 
-  mobileshoppingapigw:
-    volumes:
-      - ./ApiGateways/Envoy/config/mobileshopping:/etc/envoy
-    ports:
-    - "5200:80"
-    - "15200:8001"
-
-  webshoppingapigw:
-    volumes:
-      - ./ApiGateways/Envoy/config/webshopping:/etc/envoy
-    ports:
-    - "5202:80"
-    - "15202:8001"
-
   mobileshoppingagg:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
diff --git a/src/docker-compose.prod.yml b/src/docker-compose.prod.yml
index 5623d2e3e..e8a49ff50 100644
--- a/src/docker-compose.prod.yml
+++ b/src/docker-compose.prod.yml
@@ -128,7 +128,7 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - ASPNETCORE_URLS=http://0.0.0.0:80
-      - PurchaseUrl=http://webshoppingapigw
+      - PurchaseUrl=http://webshoppingagg
       - 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.
       - CatalogUrlHC=http://catalog-api/hc
       - OrderingUrlHC=http://ordering-api/hc
@@ -191,26 +191,6 @@ services:
       - "15672:15672"  # Important: In a production environment your should remove the external port
       - "5672:5672"    # Important: In a production environment your should remove the external port
 
-  mobileshoppingapigw:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - 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).
-    volumes:
-      - ./ApiGateways/Mobile.Bff.Shopping/apigw:/app/configuration
-
-  webshoppingapigw:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - 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).
-    volumes:
-      - ./ApiGateways/Web.Bff.Shopping/apigw:/app/configuration
-
   mobileshoppingagg:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
diff --git a/src/docker-compose.yml b/src/docker-compose.yml
index 827683472..2d919945c 100644
--- a/src/docker-compose.yml
+++ b/src/docker-compose.yml
@@ -78,9 +78,6 @@ services:
     depends_on:
       - sqldata
 
-  mobileshoppingapigw:
-    image: envoyproxy/envoy:v1.11.1
-
   mobileshoppingagg:
     image: ${REGISTRY:-eshop}/mobileshoppingagg:${PLATFORM:-linux}-${TAG:-latest}
     build:
@@ -154,6 +151,3 @@ services:
       dockerfile: Web/WebhookClient/Dockerfile
     depends_on:
       - webhooks-api
-
-  webshoppingapigw:
-    image: envoyproxy/envoy:v1.11.1
diff --git a/src/eShopOnContainers-ServicesAndWebApps.sln b/src/eShopOnContainers-ServicesAndWebApps.sln
index 203d5b54d..d73ec39c4 100644
--- a/src/eShopOnContainers-ServicesAndWebApps.sln
+++ b/src/eShopOnContainers-ServicesAndWebApps.sln
@@ -103,17 +103,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Webhooks.API", "Services\We
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebhookClient", "Web\WebhookClient\WebhookClient.csproj", "{766D7E92-6AF0-476C-ADD5-282BF4D8C576}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Envoy", "Envoy", "{882A8F3A-C61F-4C44-86DD-A5A258714BF2}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{3ABEEE8C-35E0-4185-9825-C44326151F5B}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ordering.BackgroundTasks", "Services\Ordering\Ordering.BackgroundTasks\Ordering.BackgroundTasks.csproj", "{D4DBA4A3-E4A5-4D9D-8ACF-F38F7D506191}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "webshopping", "webshopping", "{966B1B0B-2AE0-4438-8741-1C5A05556095}"
-	ProjectSection(SolutionItems) = preProject
-		ApiGateways\Envoy\config\webshopping\envoy.yaml = ApiGateways\Envoy\config\webshopping\envoy.yaml
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mobile.Bff.Shopping", "Mobile.Bff.Shopping", "{798BFC44-2CCD-45FA-B37A-5173B03C2B30}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mobile.Shopping.HttpAggregator", "ApiGateways\Mobile.Bff.Shopping\aggregator\Mobile.Shopping.HttpAggregator.csproj", "{B62E859F-825E-4C8B-93EC-5966EACFD026}"
@@ -1580,10 +1571,7 @@ Global
 		{E0AA11C4-2873-461D-8F82-53392530FB7A} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8}
 		{84E2016E-0435-44C6-8020-3D288AA38B2C} = {E0AA11C4-2873-461D-8F82-53392530FB7A}
 		{766D7E92-6AF0-476C-ADD5-282BF4D8C576} = {E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04}
-		{882A8F3A-C61F-4C44-86DD-A5A258714BF2} = {77849D35-37D4-4802-81DC-9477B2775A40}
-		{3ABEEE8C-35E0-4185-9825-C44326151F5B} = {882A8F3A-C61F-4C44-86DD-A5A258714BF2}
 		{D4DBA4A3-E4A5-4D9D-8ACF-F38F7D506191} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
-		{966B1B0B-2AE0-4438-8741-1C5A05556095} = {3ABEEE8C-35E0-4185-9825-C44326151F5B}
 		{798BFC44-2CCD-45FA-B37A-5173B03C2B30} = {77849D35-37D4-4802-81DC-9477B2775A40}
 		{B62E859F-825E-4C8B-93EC-5966EACFD026} = {798BFC44-2CCD-45FA-B37A-5173B03C2B30}
 		{373D8AA1-36BE-49EC-89F0-6CB736666285} = {807BB76E-B2BB-47A2-A57B-3D1B20FF5E7F}
diff --git a/src/launchSettings.json b/src/launchSettings.json
index 9cd41054e..135b32aca 100644
--- a/src/launchSettings.json
+++ b/src/launchSettings.json
@@ -9,7 +9,6 @@
         "catalog-api": "StartDebugging",
         "identity-api": "StartDebugging",
         "mobileshoppingagg": "StartDebugging",
-        "mobileshoppingapigw": "StartWithoutDebugging",
         "nosqldata": "StartWithoutDebugging",
         "ordering-api": "StartDebugging",
         "ordering-backgroundtasks": "StartDebugging",
@@ -22,7 +21,6 @@
         "webhooks-client": "StartDebugging",
         "webmvc": "StartDebugging",
         "webshoppingagg": "StartDebugging",
-        "webshoppingapigw": "StartWithoutDebugging",
         "webspa": "StartDebugging",
         "webstatus": "StartDebugging"
       }