diff --git a/reference-apps/eshop/iac/eshop.bicep b/reference-apps/eshop/iac/eshop.bicep
index 9aaa2ec9..32a724f2 100644
--- a/reference-apps/eshop/iac/eshop.bicep
+++ b/reference-apps/eshop/iac/eshop.bicep
@@ -128,9 +128,6 @@ module basket 'services/basket.bicep' = {
     AZURESERVICEBUSENABLED: AZURESERVICEBUSENABLED
     ORCHESTRATOR_TYPE: ORCHESTRATOR_TYPE
     gatewayName: networking.outputs.gateway
-    identityHttpName: networking.outputs.identityHttp
-    basketHttpName: networking.outputs.basketHttp
-    basketGrpcName: networking.outputs.basketGrpc
     rabbitmqName: links.outputs.rabbitmq
     redisBasketName: links.outputs.redisBasket
     TAG: TAG
@@ -145,8 +142,6 @@ module catalog 'services/catalog.bicep' = {
     APPLICATION_INSIGHTS_KEY: APPLICATION_INSIGHTS_KEY 
     AZURESERVICEBUSENABLED: AZURESERVICEBUSENABLED
     AZURESTORAGEENABLED: AZURESTORAGEENABLED
-    catalogGrpcName: networking.outputs.catalogGrpc
-    catalogHttpName: networking.outputs.catalogHttp
     gatewayName: networking.outputs.gateway
     ORCHESTRATOR_TYPE: ORCHESTRATOR_TYPE
     rabbitmqName: links.outputs.rabbitmq
@@ -161,18 +156,11 @@ module identity 'services/identity.bicep' = {
   params: {
     application: eshop.id
     APPLICATION_INSIGHTS_KEY: APPLICATION_INSIGHTS_KEY
-    basketHttpName: networking.outputs.basketHttp
     ENABLEDEVSPACES: ENABLEDEVSPACES
     gatewayName: networking.outputs.gateway
-    identityHttpName: networking.outputs.identityHttp
-    orderingHttpName: networking.outputs.orderingHttp
     redisKeystoreName: links.outputs.redisKeystore
     sqlIdentityDbName: links.outputs.sqlIdentityDb
     TAG: TAG
-    webhooksclientHttpName: networking.outputs.webhooksclientHttp
-    webhooksHttpName: networking.outputs.webhooksHttp
-    webmvcHttpName: networking.outputs.webmvcHttp
-    webshoppingaggHttpName: networking.outputs.webshoppingaggHttp
   }
 }
 
@@ -182,15 +170,8 @@ module ordering 'services/ordering.bicep' = {
     application: eshop.id
     APPLICATION_INSIGHTS_KEY: APPLICATION_INSIGHTS_KEY 
     AZURESERVICEBUSENABLED: AZURESERVICEBUSENABLED
-    basketHttpName: networking.outputs.basketHttp
-    catalogHttpName: networking.outputs.catalogHttp
     gatewayName: networking.outputs.gateway
-    identityHttpName: networking.outputs.identityHttp
     ORCHESTRATOR_TYPE: ORCHESTRATOR_TYPE
-    orderbgtasksHttpName: networking.outputs.orderbgtasksHttp
-    orderingGrpcName: networking.outputs.orderingGrpc
-    orderingHttpName: networking.outputs.orderingHttp
-    orderingsignalrhubHttpName: networking.outputs.orderingsignalrhubHttp
     rabbitmqName: links.outputs.rabbitmq
     redisKeystoreName: links.outputs.redisKeystore
     sqlOrderingDbName: links.outputs.sqlOrderingDb
@@ -206,7 +187,6 @@ module payment 'services/payment.bicep' = {
     APPLICATION_INSIGHTS_KEY: APPLICATION_INSIGHTS_KEY
     AZURESERVICEBUSENABLED: AZURESERVICEBUSENABLED
     ORCHESTRATOR_TYPE: ORCHESTRATOR_TYPE
-    paymentHttpName: networking.outputs.paymentHttp
     rabbitmqName: links.outputs.rabbitmq
     TAG: TAG
     serviceBusConnectionString: (AZURESERVICEBUSENABLED == 'True') ? azure.outputs.serviceBusAuthConnectionString : ''
@@ -217,7 +197,6 @@ module seq 'services/seq.bicep' = {
   name: 'seq'
   params: {
     application: eshop.id 
-    seqHttpName: networking.outputs.seqHttp
   }
 }
 
@@ -227,15 +206,9 @@ module web 'services/web.bicep' = {
     application: eshop.id
     APPLICATION_INSIGHTS_KEY: APPLICATION_INSIGHTS_KEY
     gatewayName: networking.outputs.gateway
-    identityHttpName: networking.outputs.identityHttp
     ORCHESTRATOR_TYPE: ORCHESTRATOR_TYPE
-    orderingsignalrhubHttpName: networking.outputs.orderingsignalrhubHttp
     redisKeystoreName: links.outputs.redisKeystore
     TAG: TAG
-    webmvcHttpName: networking.outputs.webmvcHttp
-    webshoppingaggHttpName: networking.outputs.webshoppingaggHttp
-    webshoppingapigwHttpName: networking.outputs.webshoppingapigwHttp
-    webspaHttpName: networking.outputs.webspaHttp
   }
 }
 
@@ -245,13 +218,10 @@ module webhooks 'services/webhooks.bicep' = {
     application: eshop.id
     AZURESERVICEBUSENABLED: AZURESERVICEBUSENABLED 
     gatewayName: networking.outputs.gateway
-    identityHttpName: networking.outputs.identityHttp
     ORCHESTRATOR_TYPE: ORCHESTRATOR_TYPE
     rabbitmqName: links.outputs.rabbitmq
     sqlWebhooksDbName: links.outputs.sqlWebhooksDb
     TAG: TAG
-    webhooksclientHttpName: networking.outputs.webhooksclientHttp
-    webhooksHttpName: networking.outputs.webhooksHttp
     serviceBusConnectionString: (AZURESERVICEBUSENABLED == 'True') ? azure.outputs.serviceBusAuthConnectionString : ''
   }
 }
@@ -260,21 +230,10 @@ module webshopping 'services/webshopping.bicep' = {
   name: 'webshopping'
   params: {
     application: eshop.id
-    basketGrpcName: networking.outputs.basketGrpc
-    basketHttpName: networking.outputs.basketHttp
-    catalogGrpcName: networking.outputs.catalogGrpc
-    catalogHttpName: networking.outputs.catalogHttp
     gatewayName: networking.outputs.gateway
-    identityHttpName: networking.outputs.identityHttp
     ORCHESTRATOR_TYPE: ORCHESTRATOR_TYPE
-    orderingGrpcName: networking.outputs.orderingGrpc
-    orderingHttpName: networking.outputs.basketHttp
-    paymentHttpName: networking.outputs.paymentHttp
     rabbitmqName: links.outputs.rabbitmq
     TAG: TAG
-    webshoppingaggHttpName: networking.outputs.webshoppingaggHttp
-    webshoppingapigwHttp2Name: networking.outputs.webshoppingapigwHttp2
-    webshoppingapigwHttpName: networking.outputs.webshoppingapigwHttp
   }
 }
 
@@ -283,18 +242,7 @@ module webstatus 'services/webstatus.bicep' = {
   params: {
     application: eshop.id
     APPLICATION_INSIGHTS_KEY: APPLICATION_INSIGHTS_KEY 
-    basketHttpName: networking.outputs.basketHttp
-    catalogHttpName: networking.outputs.catalogHttp
-    identityHttpName: networking.outputs.identityHttp
     ORCHESTRATOR_TYPE: ORCHESTRATOR_TYPE
-    orderbgtasksHttpName: networking.outputs.orderbgtasksHttp
-    orderingHttpName: networking.outputs.orderingHttp
-    orderingsignalrhubHttpName: networking.outputs.orderingsignalrhubHttp
-    paymentHttpName: networking.outputs.paymentHttp
     TAG: TAG
-    webmvcHttpName: networking.outputs.webmvcHttp
-    webshoppingaggHttpName: networking.outputs.webshoppingaggHttp
-    webspaHttpName: networking.outputs.webspaHttp
-    webstatusHttpName: networking.outputs.webstatusHttp
   }
 }
diff --git a/reference-apps/eshop/iac/infra/aws.bicep b/reference-apps/eshop/iac/infra/aws.bicep
index 1fc10c91..74d34082 100644
--- a/reference-apps/eshop/iac/infra/aws.bicep
+++ b/reference-apps/eshop/iac/infra/aws.bicep
@@ -174,6 +174,7 @@ resource rabbitmqContainer 'Applications.Core/containers@2022-03-15-privateprevi
       ports: {
         rabbitmq: {
           containerPort: 5672
+          port: 5672
         }
       }
     }
@@ -287,7 +288,7 @@ resource rabbitmq 'Applications.Messaging/rabbitMQQueues@2022-03-15-privateprevi
     resourceProvisioning: 'manual'
     queue: 'eshop-event-bus'
     host: rabbitmqContainer.name
-    port: rabbitmqContainer.port
+    port: rabbitmqContainer.properties.container.ports.rabbitmq.port
     username: 'guest'
     secrets: {
       password: 'guest'
diff --git a/reference-apps/eshop/iac/infra/containers.bicep b/reference-apps/eshop/iac/infra/containers.bicep
index 3958e612..52cbfec0 100644
--- a/reference-apps/eshop/iac/infra/containers.bicep
+++ b/reference-apps/eshop/iac/infra/containers.bicep
@@ -152,7 +152,7 @@ resource rabbitmq 'Applications.Messaging/rabbitMQQueues@2022-03-15-privateprevi
     resourceProvisioning: 'manual'
     queue: 'eshop-event-bus'
     host: rabbitmqContainer.name
-    port: rrabbitmqContainer.port
+    port: rabbitmqContainer.properties.container.ports.rabbitmq.port
     username: 'guest'
     secrets: {
       password: 'guest'
@@ -168,11 +168,11 @@ resource sqlIdentityDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatep
     resourceProvisioning: 'manual'
     server: sqlIdentityContainer.name
     database: 'IdentityDb'
-    port: sqlIdentityContainer.port
+    port: sqlIdentityContainer.properties.container.ports.sql.port
     username: adminUsername
     secrets: {
       password: adminPassword
-      connectionString: 'Server=tcp:${sqlIdentityContainer.name},${sqlIdentityContainer.port};Initial Catalog=IdentityDb;User Id=${adminUsername};Password=${adminPassword};Encrypt=false'
+      connectionString: 'Server=tcp:${sqlIdentityContainer.name},${sqlIdentityContainer.properties.container.ports.sql.port};Initial Catalog=IdentityDb;User Id=${adminUsername};Password=${adminPassword};Encrypt=false'
     }
   }
 }
@@ -185,11 +185,11 @@ resource sqlCatalogDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatepr
     resourceProvisioning: 'manual'
     server: sqlCatalogContainer.name
     database: 'CatalogDb'
-    port: sqlCatalogContainer.port
+    port: sqlCatalogContainer.properties.container.ports.sql.port
     username: adminUsername
     secrets: {
       password: adminPassword
-      connectionString: 'Server=tcp:${sqlCatalogContainer.name},${sqlCatalogContainer.port};Initial Catalog=CatalogDb;User Id=${adminUsername};Password=${adminPassword};Encrypt=false'
+      connectionString: 'Server=tcp:${sqlCatalogContainer.name},${sqlCatalogContainer.properties.container.ports.sql.port};Initial Catalog=CatalogDb;User Id=${adminUsername};Password=${adminPassword};Encrypt=false'
     }
   }
 }
@@ -202,11 +202,11 @@ resource sqlOrderingDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatep
     resourceProvisioning: 'manual'
     server: sqlOrderingContainer.name
     database: 'OrderingDb'
-    port: sqlOrderingContainer.port
+    port: sqlOrderingContainer.properties.container.ports.sql.port
     username: adminUsername
     secrets: {
       password: adminPassword
-      connectionString: 'Server=tcp:${sqlOrderingContainer.name},${sqlOrderingContainer.port};Initial Catalog=OrderingDb;User Id=${adminUsername};Password=${adminPassword};Encrypt=false'
+      connectionString: 'Server=tcp:${sqlOrderingContainer.name},${sqlOrderingContainer.properties.container.ports.sql.port};Initial Catalog=OrderingDb;User Id=${adminUsername};Password=${adminPassword};Encrypt=false'
     }
   }
 }
@@ -219,11 +219,11 @@ resource sqlWebhooksDb 'Applications.Datastores/sqlDatabases@2022-03-15-privatep
     resourceProvisioning: 'manual'
     server: sqlWebhooksContainer.name
     database: 'WebhooksDb'
-    port: sqlWebhooksContainer.port
+    port: sqlWebhooksContainer.properties.container.ports.sql.port
     username: adminUsername
     secrets: {
       password: adminPassword
-      connectionString: 'Server=tcp:${sqlWebhooksContainer.name},${sqlWebhooksContainer.port};Initial Catalog=WebhooksDb;User Id=${adminUsername};Password=${adminPassword};Encrypt=false'
+      connectionString: 'Server=tcp:${sqlWebhooksContainer.name},${sqlWebhooksContainer.properties.container.ports.sql.port};Initial Catalog=WebhooksDb;User Id=${adminUsername};Password=${adminPassword};Encrypt=false'
     }
   }
 }
@@ -235,9 +235,9 @@ resource redisBasket 'Applications.Datastores/redisCaches@2022-03-15-privateprev
     environment: environment
     resourceProvisioning: 'manual'
     host: redisBasketContainer.name
-    port: redisBasketContainer.port
+    port: redisBasketContainer.properties.container.ports.redis.port
     secrets: {
-      connectionString: '${redisBasketContainer.name}:${redisBasketContainer.port},abortConnect=False'
+      connectionString: '${redisBasketContainer.name}:${redisBasketContainer.properties.container.ports.redis.port},abortConnect=False'
     }
   }
 }
@@ -249,9 +249,9 @@ resource redisKeystore 'Applications.Datastores/redisCaches@2022-03-15-privatepr
     environment: environment
     resourceProvisioning: 'manual'
     host: redisKeystoreContainer.name
-    port:redisKeystoreContainer.port
+    port:redisKeystoreContainer.properties.container.ports.redis.port
     secrets: {
-      connectionString: '${redisKeystoreContainer.name}:${redisKeystoreContainer.port},abortConnect=False'
+      connectionString: '${redisKeystoreContainer.name}:${redisKeystoreContainer.properties.container.ports.redis.port},abortConnect=False'
     }
   }
 }
diff --git a/reference-apps/eshop/iac/services/identity.bicep b/reference-apps/eshop/iac/services/identity.bicep
index ab54ef14..62506d48 100644
--- a/reference-apps/eshop/iac/services/identity.bicep
+++ b/reference-apps/eshop/iac/services/identity.bicep
@@ -21,24 +21,6 @@ param TAG string
 @description('Name of the Gateway')
 param gatewayName string
 
-@description('Name of the Basket Container')
-param basketHttpName string
-
-@description('Name of the Ordering Container')
-param orderingHttpName string
-
-@description('Name of the WebShoppingAgg Container')
-param webshoppingaggHttpName string
-
-@description('Name of the Webhooks Container')
-param webhooksHttpName string
-
-@description('Name of the WebhooksClient Container')
-param webhooksclientHttpName string
-
-@description('Name of the WebMVC Container')
-param webmvcHttpName string
-
 @description('Name of the Identity SQL Database portable resource')
 param sqlIdentityDbName string
 
@@ -65,13 +47,13 @@ resource identity 'Applications.Core/containers@2022-03-15-privatepreview' = {
         XamarinCallback: ''
         EnableDevspaces: ENABLEDEVSPACES
         ConnectionString: sqlIdentityDb.connectionString()
-        MvcClient: '${gateway.properties.url}/${webmvcHttp.name}'
+        MvcClient: '${gateway.properties.url}/webmvc'
         SpaClient: gateway.properties.url
-        BasketApiClient: '${gateway.properties.url}/${basketHttp.name}'
-        OrderingApiClient: '${gateway.properties.url}/${orderingHttp.name}'
-        WebShoppingAggClient: '${gateway.properties.url}/${webshoppingaggHttp.name}'
-        WebhooksApiClient: '${gateway.properties.url}/${webhooksHttp.name}'
-        WebhooksWebClient: '${gateway.properties.url}/${webhooksclientHttp.name}'
+        BasketApiClient: '${gateway.properties.url}/basket-api'
+        OrderingApiClient: '${gateway.properties.url}/ordering-api'
+        WebShoppingAggClient: '${gateway.properties.url}/webshoppingagg'
+        WebhooksApiClient: '${gateway.properties.url}/webhooks-api'
+        WebhooksWebClient: '${gateway.properties.url}/webhooks-client'
       }
       ports: {
         http: {
@@ -90,27 +72,27 @@ resource identity 'Applications.Core/containers@2022-03-15-privatepreview' = {
         disableDefaultEnvVars: true
       }
       webmvc: {
-        source: webmvcHttp.id
+        source: 'http://webmvc:5100'
         disableDefaultEnvVars: true
       }
       basket: {
-        source: basketHttp.id
+        source: 'http://basket-api:5103'
         disableDefaultEnvVars: true
       }
       ordering: {
-        source: orderingHttp.id
+        source: 'http://ordering-api:5102'
         disableDefaultEnvVars: true
       }
       webshoppingagg: {
-        source: webshoppingaggHttp.id
+        source: 'http://webshoppingagg:5121'
         disableDefaultEnvVars: true
       }
       webhooks: {
-        source: webhooksHttp.id
+        source: 'http://webhooks-api:5113'
         disableDefaultEnvVars: true
       }
-      webhoolsclient: {
-        source: webhooksclientHttp.id
+      webhooksclient: {
+        source: 'http://webhooks-client:5114'
         disableDefaultEnvVars: true
       }
     }
@@ -123,29 +105,6 @@ resource gateway 'Applications.Core/gateways@2022-03-15-privatepreview' existing
   name: gatewayName
 }
 
-resource basketHttp 'Applications.Core/containers@2022-03-15-privatepreview' existing = {
-  name: basketHttpName
-}
-
-resource orderingHttp 'Applications.Core/containers@2022-03-15-privatepreview' existing = {
-  name: orderingHttpName
-}
-
-resource webshoppingaggHttp 'Applications.Core/containers@2022-03-15-privatepreview' existing = {
-  name: webshoppingaggHttpName
-}
-
-resource webhooksHttp 'Applications.Core/containers@2022-03-15-privatepreview' existing =  {
-  name: webhooksHttpName
-}
-
-resource webhooksclientHttp 'Applications.Core/containers@2022-03-15-privatepreview' existing = {
-  name: webhooksclientHttpName
-}
-
-resource webmvcHttp 'Applications.Core/containers@2022-03-15-privatepreview' existing = {
-  name: webmvcHttpName
-}
 
 // PORTABLE RESOURCES -----------------------------------------------------------
 
diff --git a/reference-apps/eshop/iac/services/webshopping.bicep b/reference-apps/eshop/iac/services/webshopping.bicep
index a87ce515..f1a08181 100644
--- a/reference-apps/eshop/iac/services/webshopping.bicep
+++ b/reference-apps/eshop/iac/services/webshopping.bicep
@@ -17,39 +17,6 @@ param TAG string
 @description('Name of the Gateway')
 param gatewayName string
 
-@description('Basket Http Route name')
-param basketHttpName string
-
-@description('Basket gRPC Route name')
-param basketGrpcName string
-
-@description('Ordering Http Route name')
-param orderingHttpName string
-
-@description('Ordering gRPC Route name')
-param orderingGrpcName string
-
-@description('Identity Http Route name')
-param identityHttpName string
-
-@description('Catalog Http Route name')
-param catalogHttpName string
-
-@description('Catalog gRPC Route name')
-param catalogGrpcName string
-
-@description('Payment Http Route name')
-param paymentHttpName string
-
-@description('Web shopping API GW HTTP Route name')
-param webshoppingapigwHttpName string
-
-@description('Web shopping API GW HTTP Route 2 name')
-param webshoppingapigwHttp2Name string
-
-@description('Web Shopping Aggregator Http Route name')
-param webshoppingaggHttpName string
-
 @description('The name of the RabbitMQ portable resource')
 param rabbitmqName string
 
@@ -66,19 +33,19 @@ resource webshoppingagg 'Applications.Core/containers@2022-03-15-privatepreview'
         ASPNETCORE_URLS: 'http://0.0.0.0:80'
         OrchestratorType: ORCHESTRATOR_TYPE
         IsClusterEnv: 'True'
-        urls__basket: basketHttp.properties.url
-        urls__catalog: catalogHttp.properties.url
-        urls__orders: orderingHttp.properties.url
-        urls__identity: identityHttp.properties.url
-        urls__grpcBasket: basketGrpc.properties.url
-        urls__grpcCatalog: catalogGrpc.properties.url
-        urls__grpcOrdering: orderingGrpc.properties.url
-        CatalogUrlHC: '${catalogHttp.properties.url}/hc'
-        OrderingUrlHC: '${orderingHttp.properties.url}/hc'
-        IdentityUrlHC: '${identityHttp.properties.url}/hc'
-        BasketUrlHC: '${basketHttp.properties.url}/hc'
-        PaymentUrlHC: '${paymentHttp.properties.url}/hc'
-        IdentityUrlExternal: '${gateway.properties.url}/${identityHttp.properties.hostname}'
+        urls__basket: 'http://basket-api:5103'
+        urls__catalog: 'http://catalog-api:5101'
+        urls__orders: 'http://ordering-api:5102'
+        urls__identity: 'http://identity-api:5105'
+        urls__grpcBasket: 'grpc://basket-api:9103'
+        urls__grpcCatalog: 'grpc://catalog-api:9101'
+        urls__grpcOrdering: 'grpc://ordering-api:9102'
+        CatalogUrlHC: 'http://catalog-api:5101/hc'
+        OrderingUrlHC: 'http://ordering-api:5102/hc'
+        IdentityUrlHC: 'http://identity-api:5105/hc'
+        BasketUrlHC: 'http://basket-api:5103/hc'
+        PaymentUrlHC: 'http://payment-api:5108/hc'
+        IdentityUrlExternal: '${gateway.properties.url}/identity-api'
       }
       ports: {
         http: {
@@ -93,19 +60,19 @@ resource webshoppingagg 'Applications.Core/containers@2022-03-15-privatepreview'
         disableDefaultEnvVars: true
       }
       identity: {
-        source: identityHttp.id
+        source: 'http://identity-api:5105'
         disableDefaultEnvVars: true
       }
       ordering: {
-        source: orderingHttp.id
+        source: 'http://ordering-api:5102'
         disableDefaultEnvVars: true
       }
       catalog: {
-        source: catalogHttp.id
+        source: 'http://catalog-api:5101'
         disableDefaultEnvVars: true
       }
       basket: {
-        source: basketHttp.id
+        source: 'http://basket-api:5103'
         disableDefaultEnvVars: true
       }
     }
@@ -140,50 +107,6 @@ resource gateway 'Applications.Core/gateways@2022-03-15-privatepreview' existing
   name: gatewayName
 }
 
-resource basketGrpc 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = {
-  name: basketGrpcName
-}
-
-resource catalogGrpc 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = {
-  name: catalogGrpcName
-}
-
-resource orderingGrpc 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = {
-  name: orderingGrpcName
-}
-
-resource catalogHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = {
-  name: catalogHttpName
-}
-
-resource basketHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = {
-  name: basketHttpName
-}
-
-resource orderingHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = {
-  name: orderingHttpName
-}
-
-resource identityHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = {
-  name: identityHttpName
-}
-
-resource paymentHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = {
-  name: paymentHttpName
-}
-
-resource webshoppingaggHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = {
-  name: webshoppingaggHttpName
-}
-
-resource webshoppingapigwHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = {
-  name: webshoppingapigwHttpName
-}
-
-resource webshoppingapigwHttp2 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = {
-  name: webshoppingapigwHttp2Name
-}
-
 // PORTABLE RESOURCES --------------------------------------------------------
 
 resource rabbitmq 'Applications.Messaging/rabbitMQQueues@2022-03-15-privatepreview' existing = {
diff --git a/reference-apps/eshop/iac/services/webstatus.bicep b/reference-apps/eshop/iac/services/webstatus.bicep
index b27459bb..e20ce7c3 100644
--- a/reference-apps/eshop/iac/services/webstatus.bicep
+++ b/reference-apps/eshop/iac/services/webstatus.bicep
@@ -17,38 +17,6 @@ param APPLICATION_INSIGHTS_KEY string
 @description('Cotnainer image tag to use for eshop images')
 param TAG string
 
-@description('Basket Http Route name')
-param basketHttpName string
-
-@description('Ordering Http Route name')
-param orderingHttpName string
-
-@description('Ordering SignalR Hub Http Route name')
-param orderingsignalrhubHttpName string
-
-@description('Ordering Background Tasks Http Route name')
-param orderbgtasksHttpName string
-
-@description('Identity Http Route name')
-param identityHttpName string
-
-@description('Catalog Http Route name')
-param catalogHttpName string
-
-@description('Payment Http Route name')
-param paymentHttpName string
-
-@description('Web MVC Http Route name')
-param webmvcHttpName string
-
-@description('Web SPA Http Route name')
-param webspaHttpName string
-
-@description('Web Shopping Aggregator Http Route name')
-param webshoppingaggHttpName string
-
-@description('Web Status Http Route name')
-param webstatusHttpName string
 
 // CONTAINAERS ---------------------------------------------------------
 
@@ -63,25 +31,25 @@ resource webstatus 'Applications.Core/containers@2022-03-15-privatepreview' = {
         ASPNETCORE_ENVIRONMENT: 'Development'
         ASPNETCORE_URLS: 'http://0.0.0.0:80'
         HealthChecksUI__HealthChecks__0__Name: 'WebMVC HTTP Check'
-        HealthChecksUI__HealthChecks__0__Uri: '${webmvcHttp.properties.url}/hc'
+        HealthChecksUI__HealthChecks__0__Uri: 'http://webmvc:5100/hc'
         HealthChecksUI__HealthChecks__1__Name: 'WebSPA HTTP Check'
-        HealthChecksUI__HealthChecks__1__Uri: '${webspaHttp.properties.url}/hc'
+        HealthChecksUI__HealthChecks__1__Uri: 'http://web-spa:5104/hc'
         HealthChecksUI__HealthChecks__2__Name: 'Web Shopping Aggregator GW HTTP Check'
-        HealthChecksUI__HealthChecks__2__Uri: '${webshoppingaggHttp.properties.url}/hc'
+        HealthChecksUI__HealthChecks__2__Uri: 'http://webshoppingagg:5121/hc'
         HealthChecksUI__HealthChecks__4__Name: 'Ordering HTTP Check'
-        HealthChecksUI__HealthChecks__4__Uri: '${orderingHttp.properties.url}/hc'
+        HealthChecksUI__HealthChecks__4__Uri: 'http://ordering-api:5102/hc'
         HealthChecksUI__HealthChecks__5__Name: 'Basket HTTP Check'
-        HealthChecksUI__HealthChecks__5__Uri: '${basketHttp.properties.url}/hc'
+        HealthChecksUI__HealthChecks__5__Uri: 'http://basket-api:5103/hc'
         HealthChecksUI__HealthChecks__6__Name: 'Catalog HTTP Check'
-        HealthChecksUI__HealthChecks__6__Uri: '${catalogHttp.properties.url}/hc'
+        HealthChecksUI__HealthChecks__6__Uri: 'http://catalog-api/hc'
         HealthChecksUI__HealthChecks__7__Name: 'Identity HTTP Check'
-        HealthChecksUI__HealthChecks__7__Uri: '${identityHttp.properties.url}/hc'
+        HealthChecksUI__HealthChecks__7__Uri: 'http://identity-api:5105/hc'
         HealthChecksUI__HealthChecks__8__Name: 'Payments HTTP Check'
-        HealthChecksUI__HealthChecks__8__Uri: '${paymentHttp.properties.url}/hc'
+        HealthChecksUI__HealthChecks__8__Uri: 'http://payment-api:5108/hc'
         HealthChecksUI__HealthChecks__9__Name: 'Ordering SignalRHub HTTP Check'
-        HealthChecksUI__HealthChecks__9__Uri: '${orderingsignalrhubHttp.properties.url}/hc'
+        HealthChecksUI__HealthChecks__9__Uri: 'http://ordering-signalrhub:5112/hc'
         HealthChecksUI__HealthChecks__10__Name: 'Ordering HTTP Background Check'
-        HealthChecksUI__HealthChecks__10__Uri: '${orderbgtasksHttp.properties.url}/hc'
+        HealthChecksUI__HealthChecks__10__Uri: 'http://ordering-backgroundtasks:5111/hc'
         ApplicationInsights__InstrumentationKey: APPLICATION_INSIGHTS_KEY
         OrchestratorType: ORCHESTRATOR_TYPE
       }
@@ -94,49 +62,3 @@ resource webstatus 'Applications.Core/containers@2022-03-15-privatepreview' = {
     }
   }
 }
-
-// NETWORKING ----------------------------------------------
-
-resource catalogHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = {
-  name: catalogHttpName
-}
-
-resource basketHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = {
-  name: basketHttpName
-}
-
-resource orderingHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = {
-  name: orderingHttpName
-}
-
-resource orderingsignalrhubHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = {
-  name: orderingsignalrhubHttpName
-}
-
-resource orderbgtasksHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = {
-  name: orderbgtasksHttpName
-}
-
-resource identityHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = {
-  name: identityHttpName
-}
-
-resource paymentHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = {
-  name: paymentHttpName
-}
-
-resource webmvcHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = {
-  name: webmvcHttpName
-}
-
-resource webspaHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = {
-  name: webspaHttpName
-}
-
-resource webshoppingaggHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = {
-  name: webshoppingaggHttpName
-}
-
-resource webstatusHttp 'Applications.Core/httpRoutes@2022-03-15-privatepreview' existing = {
-  name: webstatusHttpName
-}