diff --git a/README.md b/README.md
index 4f29d254..fe3ef652 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 This repository contains the source code for quickstarts, reference apps, and tutorials for Radius.
 
-To try out one of these samples, visit https://docs.radapp.dev
+To try out one of these samples, visit https://docs.radapp.io
 
 ## Codespace
 
diff --git a/samples/aws-sqs/sqs.bicep b/samples/aws-sqs/sqs.bicep
index c2b2f7df..e5ae0468 100644
--- a/samples/aws-sqs/sqs.bicep
+++ b/samples/aws-sqs/sqs.bicep
@@ -41,8 +41,12 @@ resource producer 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       env: union(
         {
-          SQS_QUEUE_URL: queue.properties.QueueUrl
-          HTTP_SERVER_PORT: '3000'
+          SQS_QUEUE_URL: {
+            value: queue.properties.QueueUrl
+          }
+          HTTP_SERVER_PORT: {
+            value: '3000'
+          }
         },
         aws_credential
       )
@@ -58,8 +62,12 @@ resource consumer 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       env: union(
         {
-          SQS_QUEUE_URL: queue.properties.QueueUrl
-          HTTP_SERVER_PORT: '4000'
+          SQS_QUEUE_URL: {
+            value: queue.properties.QueueUrl
+          }
+          HTTP_SERVER_PORT: {
+            value: '4000'
+          }
         },
         aws_credential
       )
diff --git a/samples/aws/awss3.bicep b/samples/aws/awss3.bicep
index 0fee8a82..82ed6917 100644
--- a/samples/aws/awss3.bicep
+++ b/samples/aws/awss3.bicep
@@ -36,10 +36,18 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = {
     application: app.id
     container: {
       env: {
-        BUCKET_NAME: s3.properties.BucketName
-        AWS_ACCESS_KEY_ID: aws_access_key_id
-        AWS_SECRET_ACCESS_KEY: aws_secret_access_key
-        AWS_DEFAULT_REGION: aws_region
+        BUCKET_NAME: {
+          value: s3.properties.BucketName
+        }
+        AWS_ACCESS_KEY_ID: {
+          value: aws_access_key_id
+        }
+        AWS_SECRET_ACCESS_KEY: {
+          value: aws_secret_access_key
+        }
+        AWS_DEFAULT_REGION: {
+          value: aws_region
+        }
       }
       image: image
     }
diff --git a/samples/dapr/dapr-azure.bicep b/samples/dapr/dapr-azure.bicep
index aa61ac1b..88908e04 100644
--- a/samples/dapr/dapr-azure.bicep
+++ b/samples/dapr/dapr-azure.bicep
@@ -44,8 +44,12 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: 'ghcr.io/radius-project/samples/dapr-frontend:latest'
       env: {
-        CONNECTION_BACKEND_APPID: backend.name
-        ASPNETCORE_URLS: 'http://*:8080'
+        CONNECTION_BACKEND_APPID: {
+          value: backend.name
+        }
+        ASPNETCORE_URLS: {
+          value: 'http://*:8080'
+        }
       }
       ports: {
         ui: {
diff --git a/samples/dapr/dapr.bicep b/samples/dapr/dapr.bicep
index a24ee7fd..d0c79c39 100644
--- a/samples/dapr/dapr.bicep
+++ b/samples/dapr/dapr.bicep
@@ -50,8 +50,12 @@ resource frontend 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: frontendImage
       env: {
-        CONNECTION_BACKEND_APPID: backend.name
-        ASPNETCORE_URLS: 'http://*:8080'
+        CONNECTION_BACKEND_APPID: {
+          value: backend.name
+        }
+        ASPNETCORE_URLS: {
+          value: 'http://*:8080'
+        }
       }
       ports: {
         ui: {
diff --git a/samples/eshop-dapr/services/basket-api.bicep b/samples/eshop-dapr/services/basket-api.bicep
index fa89370d..c3c3e1e2 100644
--- a/samples/eshop-dapr/services/basket-api.bicep
+++ b/samples/eshop-dapr/services/basket-api.bicep
@@ -42,11 +42,21 @@ resource basketApi 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: 'ghcr.io/radius-project/samples/eshopdapr/basket.api:rad-latest'
       env: {
-        ASPNETCORE_ENVIRONMENT: 'Development'
-        ASPNETCORE_URLS: 'http://0.0.0.0:80'
-        IdentityUrl: 'http://identity-api:80'
-        IdentityUrlExternal: '${gateway.properties.url}/identity/'
-        SeqServerUrl: 'http://seq:5340'
+        ASPNETCORE_ENVIRONMENT: {
+          value: 'Development'
+        }
+        ASPNETCORE_URLS: {
+          value: 'http://0.0.0.0:80'
+        }
+        IdentityUrl: {
+          value: 'http://identity-api:80'
+        }
+        IdentityUrlExternal: {
+          value: '${gateway.properties.url}/identity/'
+        }
+        SeqServerUrl: {
+          value: 'http://seq:5340'
+        }
       }
       ports: {
         http: {
diff --git a/samples/eshop-dapr/services/blazor-client.bicep b/samples/eshop-dapr/services/blazor-client.bicep
index b0a0e7e1..42c13b1a 100644
--- a/samples/eshop-dapr/services/blazor-client.bicep
+++ b/samples/eshop-dapr/services/blazor-client.bicep
@@ -26,11 +26,21 @@ resource blazorClient 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: 'ghcr.io/radius-project/samples/eshopdapr/blazor.client:rad-latest'
       env: {
-        ASPNETCORE_ENVIRONMENT: 'Development'
-        ASPNETCORE_URLS: 'http://0.0.0.0:80'
-        ApiGatewayUrlExternal: '${gateway.properties.url}/api/'
-        IdentityUrlExternal: '${gateway.properties.url}/identity/'
-        SeqServerUrl: 'http://seq:5340'
+        ASPNETCORE_ENVIRONMENT: {
+          value: 'Development'
+        }
+        ASPNETCORE_URLS: {
+          value: 'http://0.0.0.0:80'
+        }
+        ApiGatewayUrlExternal: {
+          value: '${gateway.properties.url}/api/'
+        }
+        IdentityUrlExternal: {
+          value: '${gateway.properties.url}/identity/'
+        }
+        SeqServerUrl: {
+          value: 'http://seq:5340'
+        }
       }
       ports: {
         http: {
diff --git a/samples/eshop-dapr/services/catalog-api.bicep b/samples/eshop-dapr/services/catalog-api.bicep
index 18e0f10c..d46c3307 100644
--- a/samples/eshop-dapr/services/catalog-api.bicep
+++ b/samples/eshop-dapr/services/catalog-api.bicep
@@ -51,10 +51,18 @@ resource catalogApi 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: 'ghcr.io/radius-project/samples/eshopdapr/catalog.api:rad-latest'
       env: {
-        ASPNETCORE_ENVIRONMENT: 'Development'
-        ASPNETCORE_URLS: 'http://0.0.0.0:80'
-        RetryMigrations: 'true'
-        SeqServerUrl: 'http://seq:5340'
+        ASPNETCORE_ENVIRONMENT: {
+          value: 'Development'
+        }
+        ASPNETCORE_URLS: {
+          value: 'http://0.0.0.0:80'
+        }
+        RetryMigrations: {
+          value: 'true'
+        }
+        SeqServerUrl: {
+          value: 'http://seq:5340'
+        }
       }
       ports: {
         http: {
diff --git a/samples/eshop-dapr/services/identity-api.bicep b/samples/eshop-dapr/services/identity-api.bicep
index 0ecb2170..36fb846e 100644
--- a/samples/eshop-dapr/services/identity-api.bicep
+++ b/samples/eshop-dapr/services/identity-api.bicep
@@ -49,13 +49,27 @@ resource identityApi 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: 'ghcr.io/radius-project/samples/eshopdapr/identity.api:rad-latest'
       env: {
-        ASPNETCORE_ENVIRONMENT: 'Development'
-        ASPNETCORE_URLS: 'http://0.0.0.0:80'
-        PATH_BASE: '/identity/'
-        BlazorClientUrlExternal: gateway.properties.url
-        IssuerUrl: '${gateway.properties.url}/identity/'
-        RetryMigrations: 'true'
-        SeqServerUrl: 'http://seq:5340'
+        ASPNETCORE_ENVIRONMENT: {
+          value: 'Development'
+        }
+        ASPNETCORE_URLS: {
+          value: 'http://0.0.0.0:80'
+        }
+        PATH_BASE: {
+          value: '/identity/'
+        }
+        BlazorClientUrlExternal: {
+          value: gateway.properties.url
+        }
+        IssuerUrl: {
+          value: '${gateway.properties.url}/identity/'
+        }
+        RetryMigrations: {
+          value: 'true'
+        }
+        SeqServerUrl: {
+          value: 'http://seq:5340'
+        }
       }
       ports: {
         http: {
diff --git a/samples/eshop-dapr/services/ordering-api.bicep b/samples/eshop-dapr/services/ordering-api.bicep
index 0be88e01..87f9a7ba 100644
--- a/samples/eshop-dapr/services/ordering-api.bicep
+++ b/samples/eshop-dapr/services/ordering-api.bicep
@@ -57,13 +57,27 @@ resource orderingApi 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: 'ghcr.io/radius-project/samples/eshopdapr/ordering.api:rad-latest'
       env: {
-        ASPNETCORE_ENVIRONMENT: 'Development'
-        ASPNETCORE_URLS: 'http://0.0.0.0:80'
-        IdentityUrl: 'http://identity-api:80'
-        IdentityUrlExternal: '${gateway.properties.url}/identity/'
-        RetryMigrations: 'true'
-        SeqServerUrl: 'http://seq:5340'
-        SendConfirmationEmail: 'false'
+        ASPNETCORE_ENVIRONMENT: {
+          value: 'Development'
+        }
+        ASPNETCORE_URLS: {
+          value: 'http://0.0.0.0:80'
+        }
+        IdentityUrl: {
+          value: 'http://identity-api:80'
+        }
+        IdentityUrlExternal: {
+          value: '${gateway.properties.url}/identity/'
+        }
+        RetryMigrations: {
+          value: 'true'
+        }
+        SeqServerUrl: {
+          value: 'http://seq:5340'
+        }
+        SendConfirmationEmail: {
+          value: 'false'
+        }
       }
       ports: {
         http: {
diff --git a/samples/eshop-dapr/services/payment-api.bicep b/samples/eshop-dapr/services/payment-api.bicep
index 77b2a619..566e297f 100644
--- a/samples/eshop-dapr/services/payment-api.bicep
+++ b/samples/eshop-dapr/services/payment-api.bicep
@@ -28,9 +28,15 @@ resource paymentApi 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: 'ghcr.io/radius-project/samples/eshopdapr/payment.api:rad-latest'
       env: {
-        ASPNETCORE_ENVIRONMENT: 'Development'
-        ASPNETCORE_URLS: 'http://0.0.0.0:80'
-        SeqServerUrl: 'http://seq:5340'
+        ASPNETCORE_ENVIRONMENT: {
+          value: 'Development'
+        }
+        ASPNETCORE_URLS: {
+          value: 'http://0.0.0.0:80'
+        }
+        SeqServerUrl: {
+          value: 'http://seq:5340'
+        }
       }
       ports: {
         http: {
diff --git a/samples/eshop-dapr/services/seq.bicep b/samples/eshop-dapr/services/seq.bicep
index 9877dd7b..2b7fb4d7 100644
--- a/samples/eshop-dapr/services/seq.bicep
+++ b/samples/eshop-dapr/services/seq.bicep
@@ -14,7 +14,9 @@ resource seq 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: 'datalust/seq:latest'
       env: {
-        ACCEPT_EULA: 'Y'
+        ACCEPT_EULA: {
+          value: 'Y'
+        }
       }
       ports: {
         http: {
diff --git a/samples/eshop-dapr/services/webshopping-agg.bicep b/samples/eshop-dapr/services/webshopping-agg.bicep
index 4efc7a4c..87653be5 100644
--- a/samples/eshop-dapr/services/webshopping-agg.bicep
+++ b/samples/eshop-dapr/services/webshopping-agg.bicep
@@ -28,14 +28,30 @@ resource webshoppingAgg 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: 'ghcr.io/radius-project/samples/eshopdapr/webshoppingagg:rad-latest'
       env: {
-        ASPNETCORE_ENVIRONMENT: 'Development'
-        ASPNETCORE_URLS: 'http://0.0.0.0:80'
-        IdentityUrl: 'http://identity-api:80'
-        IdentityUrlExternal: '${gateway.properties.url}/identity/'
-        SeqServerUrl: 'http://seq:5340'
-        BasketUrlHC: 'http://localhost:3500/v1.0/invoke/basket-api/method/liveness'
-        CatalogUrlHC: 'http://localhost:3500/v1.0/invoke/catalog-api/method/liveness'
-        IdentityUrlHC: 'http://localhost:3500/v1.0/invoke/identity-api/method/liveness'
+        ASPNETCORE_ENVIRONMENT: {
+          value: 'Development'
+        }
+        ASPNETCORE_URLS: {
+          value: 'http://0.0.0.0:80'
+        }
+        IdentityUrl: {
+          value: 'http://identity-api:80'
+        }
+        IdentityUrlExternal: {
+          value: '${gateway.properties.url}/identity/'
+        }
+        SeqServerUrl: {
+          value: 'http://seq:5340'
+        }
+        BasketUrlHC: {
+          value: 'http://localhost:3500/v1.0/invoke/basket-api/method/liveness'
+        }
+        CatalogUrlHC: {
+          value: 'http://localhost:3500/v1.0/invoke/catalog-api/method/liveness'
+        }
+        IdentityUrlHC: {
+          value: 'http://localhost:3500/v1.0/invoke/identity-api/method/liveness'
+        }
       }
       ports: {
         http: {
diff --git a/samples/eshop-dapr/services/webshopping-gw.bicep b/samples/eshop-dapr/services/webshopping-gw.bicep
index 2ce02039..94f57280 100644
--- a/samples/eshop-dapr/services/webshopping-gw.bicep
+++ b/samples/eshop-dapr/services/webshopping-gw.bicep
@@ -11,10 +11,18 @@ resource webshoppingGw 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: 'ghcr.io/radius-project/samples/eshopdapr/webshoppingapigw:rad-latest'
       env: {
-        ENVOY_CATALOG_API_ADDRESS: 'catalog-api'
-        ENVOY_CATALOG_API_PORT: '80'
-        ENVOY_ORDERING_API_ADDRESS: 'ordering-api'
-        ENVOY_ORDERING_API_PORT: '80'
+        ENVOY_CATALOG_API_ADDRESS: {
+          value: 'catalog-api'
+        }
+        ENVOY_CATALOG_API_PORT: {
+          value: '80'
+        }
+        ENVOY_ORDERING_API_ADDRESS: {
+          value: 'ordering-api'
+        }
+        ENVOY_ORDERING_API_PORT: {
+          value: '80'
+        }
       }
       ports: {
         http: {
diff --git a/samples/eshop-dapr/services/webstatus.bicep b/samples/eshop-dapr/services/webstatus.bicep
index 5a697515..eaf48958 100644
--- a/samples/eshop-dapr/services/webstatus.bicep
+++ b/samples/eshop-dapr/services/webstatus.bicep
@@ -17,23 +17,57 @@ resource webstatus 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: 'ghcr.io/radius-project/samples/eshopdapr/webstatus:rad-latest'
       env: {
-        ASPNETCORE_ENVIRONMENT: 'Development'
-        ASPNETCORE_URLS: 'http://0.0.0.0:80'
-        PATH_BASE: '/health'
-        HealthChecksUI__HealthChecks__0__Name: 'Blazor UI Host'
-        HealthChecksUI__HealthChecks__0__Uri: 'http://blazor-client:80/liveness'
-        HealthChecksUI__HealthChecks__1__Name: 'Identity API'
-        HealthChecksUI__HealthChecks__1__Uri: 'http://localhost:3500/v1.0/invoke/identity-api/method/liveness'
-        HealthChecksUI__HealthChecks__2__Name: 'Basket API'
-        HealthChecksUI__HealthChecks__2__Uri: 'http://localhost:3500/v1.0/invoke/basket-api/method/liveness'
-        HealthChecksUI__HealthChecks__3__Name: 'Catalog API'
-        HealthChecksUI__HealthChecks__3__Uri: 'http://localhost:3500/v1.0/invoke/catalog-api/method/liveness'
-        HealthChecksUI__HealthChecks__4__Name: 'Ordering API'
-        HealthChecksUI__HealthChecks__4__Uri: 'http://localhost:3500/v1.0/invoke/ordering-api/method/liveness'
-        HealthChecksUI__HealthChecks__5__Name: 'Payment API'
-        HealthChecksUI__HealthChecks__5__Uri: 'http://localhost:3500/v1.0/invoke/payment-api/method/liveness'
-        HealthChecksUI__HealthChecks__6__Name: 'Web Shopping Aggregator'
-        HealthChecksUI__HealthChecks__6__Uri: 'http://localhost:3500/v1.0/invoke/webshoppingagg/method/liveness'
+        ASPNETCORE_ENVIRONMENT: {
+          value: 'Development'
+        }
+        ASPNETCORE_URLS: {
+          value: 'http://0.0.0.0:80'
+        }
+        PATH_BASE: {
+          value: '/health'
+        }
+        HealthChecksUI__HealthChecks__0__Name: {
+          value: 'Blazor UI Host'
+        }
+        HealthChecksUI__HealthChecks__0__Uri: {
+          value: 'http://blazor-client:80/liveness'
+        }
+        HealthChecksUI__HealthChecks__1__Name: {
+          value: 'Identity API'
+        }
+        HealthChecksUI__HealthChecks__1__Uri: {
+          value: 'http://localhost:3500/v1.0/invoke/identity-api/method/liveness'
+        }
+        HealthChecksUI__HealthChecks__2__Name: {
+          value: 'Basket API'
+        }
+        HealthChecksUI__HealthChecks__2__Uri: {
+          value: 'http://localhost:3500/v1.0/invoke/basket-api/method/liveness'
+        }
+        HealthChecksUI__HealthChecks__3__Name: {
+          value: 'Catalog API'
+        }
+        HealthChecksUI__HealthChecks__3__Uri: {
+          value: 'http://localhost:3500/v1.0/invoke/catalog-api/method/liveness'
+        }
+        HealthChecksUI__HealthChecks__4__Name: {
+          value: 'Ordering API'
+        }
+        HealthChecksUI__HealthChecks__4__Uri: {
+          value: 'http://localhost:3500/v1.0/invoke/ordering-api/method/liveness'
+        }
+        HealthChecksUI__HealthChecks__5__Name: {
+          value: 'Payment API'
+        }
+        HealthChecksUI__HealthChecks__5__Uri: {
+          value: 'http://localhost:3500/v1.0/invoke/payment-api/method/liveness'
+        }
+        HealthChecksUI__HealthChecks__6__Name: {
+          value: 'Web Shopping Aggregator'
+        }
+        HealthChecksUI__HealthChecks__6__Uri: {
+          value: 'http://localhost:3500/v1.0/invoke/webshoppingagg/method/liveness'
+        }
       }
       ports: {
         http: {
diff --git a/samples/eshop/services/basket.bicep b/samples/eshop/services/basket.bicep
index 1cb8bcd0..a9342764 100644
--- a/samples/eshop/services/basket.bicep
+++ b/samples/eshop/services/basket.bicep
@@ -38,18 +38,42 @@ resource basket 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: '${imageRegistry}/basket.api:${imageTag}'
       env: {
-        ASPNETCORE_ENVIRONMENT: 'Development'
-        ASPNETCORE_URLS: 'http://0.0.0.0:80'
-        UseLoadTest: 'False'
-        PATH_BASE: '/basket-api'
-        ORCHESTRATOR_TYPE: 'K8S'
-        PORT: '80'
-        GRPC_PORT: '81'
-        AzureServiceBusEnabled: AZURESERVICEBUSENABLED
-        ConnectionString: redisBasket.listSecrets().connectionString
-        EventBusConnection: eventBusConnectionString
-        identityUrl: 'http://identity-api:5105'
-        IdentityUrlExternal: '${gateway.properties.url}/identity-api'
+        ASPNETCORE_ENVIRONMENT: {
+          value: 'Development'
+        }
+        ASPNETCORE_URLS: {
+          value: 'http://0.0.0.0:80'
+        }
+        UseLoadTest: {
+          value: 'False'
+        }
+        PATH_BASE: {
+          value: '/basket-api'
+        }
+        ORCHESTRATOR_TYPE: {
+          value: 'K8S'
+        }
+        PORT: {
+          value: '80'
+        }
+        GRPC_PORT: {
+          value: '81'
+        }
+        AzureServiceBusEnabled: {
+          value: AZURESERVICEBUSENABLED
+        }
+        ConnectionString: {
+          value: redisBasket.listSecrets().connectionString
+        }
+        EventBusConnection: {
+          value: eventBusConnectionString
+        }
+        identityUrl: {
+          value: 'http://identity-api:5105'
+        }
+        IdentityUrlExternal: {
+          value: '${gateway.properties.url}/identity-api'
+        }
       }
       ports: {
         http: {
diff --git a/samples/eshop/services/catalog.bicep b/samples/eshop/services/catalog.bicep
index 35199590..fb615b9c 100644
--- a/samples/eshop/services/catalog.bicep
+++ b/samples/eshop/services/catalog.bicep
@@ -42,17 +42,39 @@ resource catalog 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: '${imageRegistry}/catalog.api:${imageTag}'
       env: {
-        UseCustomizationData: 'False'
-        PATH_BASE: '/catalog-api'
-        ASPNETCORE_ENVIRONMENT: 'Development'
-        ORCHESTRATOR_TYPE: 'K8S'
-        PORT: '80'
-        GRPC_PORT: '81'
-        PicBaseUrl: PICBASEURL
-        AzureStorageEnabled: 'False'
-        AzureServiceBusEnabled: AZURESERVICEBUSENABLED
-        ConnectionString: sqlCatalogDb.listSecrets().connectionString
-        EventBusConnection: eventBusConnectionString
+        UseCustomizationData: {
+          value: 'False'
+        }
+        PATH_BASE: {
+          value: '/catalog-api'
+        }
+        ASPNETCORE_ENVIRONMENT: {
+          value: 'Development'
+        }
+        ORCHESTRATOR_TYPE: {
+          value: 'K8S'
+        }
+        PORT: {
+          value: '80'
+        }
+        GRPC_PORT: {
+          value: '81'
+        }
+        PicBaseUrl: {
+          value: PICBASEURL
+        }
+        AzureStorageEnabled: {
+          value: 'False'
+        }
+        AzureServiceBusEnabled: {
+          value: AZURESERVICEBUSENABLED
+        }
+        ConnectionString: {
+          value: sqlCatalogDb.listSecrets().connectionString
+        }
+        EventBusConnection: {
+          value: eventBusConnectionString
+        }
       }
       ports: {
         http: {
diff --git a/samples/eshop/services/identity.bicep b/samples/eshop/services/identity.bicep
index d146e283..ef7fb7a9 100644
--- a/samples/eshop/services/identity.bicep
+++ b/samples/eshop/services/identity.bicep
@@ -30,21 +30,51 @@ resource identity 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: '${imageRegistry}/identity.api:${imageTag}'
       env: {
-        PATH_BASE: '/identity-api'
-        ASPNETCORE_ENVIRONMENT: 'Development'
-        ASPNETCORE_URLS: 'http://0.0.0.0:80'
-        OrchestratorType: 'K8S'
-        IsClusterEnv: 'True'
-        DPConnectionString: redisKeystore.listSecrets().connectionString
-        EnableDevspaces: 'False'
-        ConnectionString: sqlIdentityDb.listSecrets().connectionString
-        MvcClient: '${gateway.properties.url}/webmvc'
-        SpaClient: gateway.properties.url
-        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'
+        PATH_BASE: {
+          value: '/identity-api'
+        }
+        ASPNETCORE_ENVIRONMENT: {
+          value: 'Development'
+        }
+        ASPNETCORE_URLS: {
+          value: 'http://0.0.0.0:80'
+        }
+        OrchestratorType: {
+          value: 'K8S'
+        }
+        IsClusterEnv: {
+          value: 'True'
+        }
+        DPConnectionString: {
+          value: redisKeystore.listSecrets().connectionString
+        }
+        EnableDevspaces: {
+          value: 'False'
+        }
+        ConnectionString: {
+          value: sqlIdentityDb.listSecrets().connectionString
+        }
+        MvcClient: {
+          value: '${gateway.properties.url}/webmvc'
+        }
+        SpaClient: {
+          value: gateway.properties.url
+        }
+        BasketApiClient: {
+          value: '${gateway.properties.url}/basket-api'
+        }
+        OrderingApiClient: {
+          value: '${gateway.properties.url}/ordering-api'
+        }
+        WebShoppingAggClient: {
+          value: '${gateway.properties.url}/webshoppingagg'
+        }
+        WebhooksApiClient: {
+          value: '${gateway.properties.url}/webhooks-api'
+        }
+        WebhooksWebClient: {
+          value: '${gateway.properties.url}/webhooks-client'
+        }
       }
       ports: {
         http: {
diff --git a/samples/eshop/services/ordering.bicep b/samples/eshop/services/ordering.bicep
index 1fa6bbd5..ae35139b 100644
--- a/samples/eshop/services/ordering.bicep
+++ b/samples/eshop/services/ordering.bicep
@@ -41,22 +41,54 @@ resource ordering 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: '${imageRegistry}/ordering.api:${imageTag}'
       env: {
-        ASPNETCORE_ENVIRONMENT: 'Development'
-        ASPNETCORE_URLS: 'http://0.0.0.0:80'
-        UseCustomizationData: 'False'
-        AzureServiceBusEnabled: AZURESERVICEBUSENABLED
-        CheckUpdateTime: '30000'
-        ORCHESTRATOR_TYPE: 'K8S'
-        UseLoadTest: 'False'
-        'Serilog__MinimumLevel__Override__Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ': 'Verbose'
-        'Serilog__MinimumLevel__Override__ordering-api': 'Verbose'
-        PATH_BASE: '/ordering-api'
-        GRPC_PORT: '81'
-        PORT: '80'
-        ConnectionString: sqlOrderingDb.listSecrets().connectionString
-        EventBusConnection: eventBusConnectionString
-        identityUrl: 'http://identity-api:5105'
-        IdentityUrlExternal: '${gateway.properties.url}/identity-api'
+        ASPNETCORE_ENVIRONMENT: {
+          value: 'Development'
+        }
+        ASPNETCORE_URLS: {
+          value: 'http://0.0.0.0:80'
+        }
+        UseCustomizationData: {
+          value: 'False'
+        }
+        AzureServiceBusEnabled: {
+          value: AZURESERVICEBUSENABLED
+        }
+        CheckUpdateTime: {
+          value: '30000'
+        }
+        ORCHESTRATOR_TYPE: {
+          value: 'K8S'
+        }
+        UseLoadTest: {
+          value: 'False'
+        }
+        'Serilog__MinimumLevel__Override__Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ': {
+          value: 'Verbose'
+        }
+        'Serilog__MinimumLevel__Override__ordering-api': {
+          value: 'Verbose'
+        }
+        PATH_BASE: {
+          value: '/ordering-api'
+        }
+        GRPC_PORT: {
+          value: '81'
+        }
+        PORT: {
+          value: '80'
+        }
+        ConnectionString: {
+          value: sqlOrderingDb.listSecrets().connectionString
+        }
+        EventBusConnection: {
+          value: eventBusConnectionString
+        }
+        identityUrl: {
+          value: 'http://identity-api:5105'
+        }
+        IdentityUrlExternal: {
+          value: '${gateway.properties.url}/identity-api'
+        }
       }
       ports: {
         http: {
@@ -90,17 +122,39 @@ resource orderbgtasks 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: '${imageRegistry}/ordering.backgroundtasks:${imageTag}'
       env: {
-        ASPNETCORE_ENVIRONMENT: 'Development'
-        ASPNETCORE_URLS: 'http://0.0.0.0:80'
-        UseCustomizationData: 'False'
-        CheckUpdateTime: '30000'
-        GracePeriodTime: '1'
-        UseLoadTest: 'False'
-        'Serilog__MinimumLevel__Override__Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ': 'Verbose'
-        ORCHESTRATOR_TYPE: 'K8S'
-        AzureServiceBusEnabled: AZURESERVICEBUSENABLED
-        ConnectionString: sqlOrderingDb.listSecrets().connectionString
-        EventBusConnection: eventBusConnectionString
+        ASPNETCORE_ENVIRONMENT: {
+          value: 'Development'
+        }
+        ASPNETCORE_URLS: {
+          value: 'http://0.0.0.0:80'
+        }
+        UseCustomizationData: {
+          value: 'False'
+        }
+        CheckUpdateTime: {
+          value: '30000'
+        }
+        GracePeriodTime: {
+          value: '1'
+        }
+        UseLoadTest: {
+          value: 'False'
+        }
+        'Serilog__MinimumLevel__Override__Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ': {
+          value: 'Verbose'
+        }
+        ORCHESTRATOR_TYPE: {
+          value: 'K8S'
+        }
+        AzureServiceBusEnabled: {
+          value: AZURESERVICEBUSENABLED
+        }
+        ConnectionString: {
+          value: sqlOrderingDb.listSecrets().connectionString
+        }
+        EventBusConnection: {
+          value: eventBusConnectionString
+        }
       }
       ports: {
         http: {
@@ -126,16 +180,36 @@ resource orderingsignalrhub 'Applications.Core/containers@2023-10-01-preview' =
     container: {
       image: '${imageRegistry}/ordering.signalrhub:${imageTag}'
       env: {
-        PATH_BASE: '/payment-api'
-        ASPNETCORE_ENVIRONMENT: 'Development'
-        ASPNETCORE_URLS: 'http://0.0.0.0:80'
-        OrchestratorType: 'K8S'
-        IsClusterEnv: 'True'
-        AzureServiceBusEnabled: AZURESERVICEBUSENABLED
-        EventBusConnection: eventBusConnectionString
-        SignalrStoreConnectionString: '${redisKeystore.properties.host}:${redisKeystore.properties.port},password=${redisKeystore.listSecrets().password},abortConnect=False'
-        identityUrl: 'http://identity-api:5105'
-        IdentityUrlExternal: '${gateway.properties.url}/identity-api'
+        PATH_BASE: {
+          value: '/payment-api'
+        }
+        ASPNETCORE_ENVIRONMENT: {
+          value: 'Development'
+        }
+        ASPNETCORE_URLS: {
+          value: 'http://0.0.0.0:80'
+        }
+        OrchestratorType: {
+          value: 'K8S'
+        }
+        IsClusterEnv: {
+          value: 'True'
+        }
+        AzureServiceBusEnabled: {
+          value: AZURESERVICEBUSENABLED
+        }
+        EventBusConnection: {
+          value: eventBusConnectionString
+        }
+        SignalrStoreConnectionString: {
+          value: '${redisKeystore.properties.host}:${redisKeystore.properties.port},password=${redisKeystore.listSecrets().password},abortConnect=False'
+        }
+        identityUrl: {
+          value: 'http://identity-api:5105'
+        }
+        IdentityUrlExternal: {
+          value: '${gateway.properties.url}/identity-api'
+        }
       }
       ports: {
         http: {
diff --git a/samples/eshop/services/payment.bicep b/samples/eshop/services/payment.bicep
index fddeb7dc..18cdc809 100644
--- a/samples/eshop/services/payment.bicep
+++ b/samples/eshop/services/payment.bicep
@@ -32,11 +32,21 @@ resource payment 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: '${imageRegistry}/payment.api:${imageTag}'
       env: {
-        'Serilog__MinimumLevel__Override__payment-api.IntegrationEvents.EventHandling': 'Verbose'
-        'Serilog__MinimumLevel__Override__Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ': 'Verbose'
-        ORCHESTRATOR_TYPE: 'K8S'
-        AzureServiceBusEnabled: AZURESERVICEBUSENABLED
-        EventBusConnection: eventBusConnectionString
+        'Serilog__MinimumLevel__Override__payment-api.IntegrationEvents.EventHandling': {
+          value: 'Verbose'
+        }
+        'Serilog__MinimumLevel__Override__Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ': {
+          value: 'Verbose'
+        }
+        ORCHESTRATOR_TYPE: {
+          value: 'K8S'
+        }
+        AzureServiceBusEnabled: {
+          value: AZURESERVICEBUSENABLED
+        }
+        EventBusConnection: {
+          value: eventBusConnectionString
+        }
       }
       ports: {
         http: {
diff --git a/samples/eshop/services/seq.bicep b/samples/eshop/services/seq.bicep
index cf97cb07..f6a5d1e4 100644
--- a/samples/eshop/services/seq.bicep
+++ b/samples/eshop/services/seq.bicep
@@ -14,7 +14,9 @@ resource seq 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: 'datalust/seq:latest'
       env: {
-        ACCEPT_EULA: 'Y'
+        ACCEPT_EULA: {
+          value: 'Y'
+        }
       }
       ports: {
         web: {
diff --git a/samples/eshop/services/web.bicep b/samples/eshop/services/web.bicep
index 276772aa..e7448796 100644
--- a/samples/eshop/services/web.bicep
+++ b/samples/eshop/services/web.bicep
@@ -27,18 +27,42 @@ resource webspa 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: '${imageRegistry}/webspa:${imageTag}'
       env: {
-        PATH_BASE: '/'
-        ASPNETCORE_ENVIRONMENT: 'Production'
-        ASPNETCORE_URLS: 'http://0.0.0.0:80'
-        UseCustomizationData: 'False'
-        ORCHESTRATOR_TYPE: 'K8S'
-        IsClusterEnv: 'True'
-        CallBackUrl: '${gateway.properties.url}/'
-        DPConnectionString: redisKeystore.listSecrets().connectionString
-        IdentityUrl: '${gateway.properties.url}/identity-api'
-        IdentityUrlHC: 'http://identity-api:5105/liveness'
-        PurchaseUrl: '${gateway.properties.url}/webshoppingapigw'
-        SignalrHubUrl: 'http://ordering-signalrhub:5112'
+        PATH_BASE: {
+          value: '/'
+        }
+        ASPNETCORE_ENVIRONMENT: {
+          value: 'Production'
+        }
+        ASPNETCORE_URLS: {
+          value: 'http://0.0.0.0:80'
+        }
+        UseCustomizationData: {
+          value: 'False'
+        }
+        ORCHESTRATOR_TYPE: {
+          value: 'K8S'
+        }
+        IsClusterEnv: {
+          value: 'True'
+        }
+        CallBackUrl: {
+          value: '${gateway.properties.url}/'
+        }
+        DPConnectionString: {
+          value: redisKeystore.listSecrets().connectionString
+        }
+        IdentityUrl: {
+          value: '${gateway.properties.url}/identity-api'
+        }
+        IdentityUrlHC: {
+          value: 'http://identity-api:5105/liveness'
+        }
+        PurchaseUrl: {
+          value: '${gateway.properties.url}/webshoppingapigw'
+        }
+        SignalrHubUrl: {
+          value: 'http://ordering-signalrhub:5112'
+        }
       }
       ports: {
         http: {
diff --git a/samples/eshop/services/webhooks.bicep b/samples/eshop/services/webhooks.bicep
index 93b74de7..fab5fe99 100644
--- a/samples/eshop/services/webhooks.bicep
+++ b/samples/eshop/services/webhooks.bicep
@@ -38,15 +38,33 @@ resource webhooks 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: '${imageRegistry}/webhooks.api:${imageTag}'
       env: {
-        PATH_BASE: '/webhooks-api'
-        ASPNETCORE_ENVIRONMENT: 'Development'
-        ASPNETCORE_URLS: 'http://0.0.0.0:80'
-        ORCHESTRATOR_TYPE: 'K8S'
-        AzureServiceBusEnabled: AZURESERVICEBUSENABLED
-        ConnectionString: sqlWebhooksDb.listSecrets().connectionString
-        EventBusConnection: eventBusConnectionString
-        identityUrl: 'http://identity-api:5105'
-        IdentityUrlExternal: '${gateway.properties.url}/identity-api'
+        PATH_BASE: {
+          value: '/webhooks-api'
+        }
+        ASPNETCORE_ENVIRONMENT: {
+          value: 'Development'
+        }
+        ASPNETCORE_URLS: {
+          value: 'http://0.0.0.0:80'
+        }
+        ORCHESTRATOR_TYPE: {
+          value: 'K8S'
+        }
+        AzureServiceBusEnabled: {
+          value: AZURESERVICEBUSENABLED
+        }
+        ConnectionString: {
+          value: sqlWebhooksDb.listSecrets().connectionString
+        }
+        EventBusConnection: {
+          value: eventBusConnectionString
+        }
+        identityUrl: {
+          value: 'http://identity-api:5105'
+        }
+        IdentityUrlExternal: {
+          value: '${gateway.properties.url}/identity-api'
+        }
       }
       ports: {
         http: {
diff --git a/samples/eshop/services/webshopping.bicep b/samples/eshop/services/webshopping.bicep
index 0de76854..9bd946b9 100644
--- a/samples/eshop/services/webshopping.bicep
+++ b/samples/eshop/services/webshopping.bicep
@@ -22,24 +22,60 @@ resource webshoppingagg 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: '${imageRegistry}/webshoppingagg:${imageTag}'
       env: {
-        ASPNETCORE_ENVIRONMENT: 'Development'
-        PATH_BASE: '/webshoppingagg'
-        ASPNETCORE_URLS: 'http://0.0.0.0:80'
-        ORCHESTRATOR_TYPE: 'K8S'
-        IsClusterEnv: 'True'
-        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/liveness'
-        OrderingUrlHC: 'http://ordering-api:5102/liveness'
-        IdentityUrlHC: 'http://identity-api:5105/liveness'
-        BasketUrlHC: 'http://basket-api:5103/liveness'
-        PaymentUrlHC: 'http://payment-api:5108/liveness'
-        IdentityUrlExternal: '${gateway.properties.url}/identity-api'
+        ASPNETCORE_ENVIRONMENT: {
+          value: 'Development'
+        }
+        PATH_BASE: {
+          value: '/webshoppingagg'
+        }
+        ASPNETCORE_URLS:  {
+          value: 'http://0.0.0.0:80'
+        }
+        ORCHESTRATOR_TYPE: {
+          value: 'K8S'
+        }
+        IsClusterEnv: {
+          value: 'True'
+        }
+        urls__basket: {
+          value: 'http://basket-api:5103'
+        }
+        urls__catalog: {
+          value: 'http://catalog-api:5101'
+        }
+        urls__orders: {
+          value: 'http://ordering-api:5102'
+        }
+        urls__identity: {
+          value: 'http://identity-api:5105'
+        }
+        urls__grpcBasket: {
+          value: 'grpc://basket-api:9103'
+        }
+        urls__grpcCatalog: {
+          value: 'grpc://catalog-api:9101'
+        }
+        urls__grpcOrdering: {
+          value: 'grpc://ordering-api:9102'
+        }
+        CatalogUrlHC: {
+          value: 'http://catalog-api:5101/liveness'
+        }
+        OrderingUrlHC: {
+          value: 'http://ordering-api:5102/liveness'
+        }
+        IdentityUrlHC: {
+          value: 'http://identity-api:5105/liveness'
+        }
+        BasketUrlHC: {
+          value: 'http://basket-api:5103/liveness'
+        }
+        PaymentUrlHC: {
+          value: 'http://payment-api:5108/liveness'
+        }
+        IdentityUrlExternal: {
+          value: '${gateway.properties.url}/identity-api'
+        }
       }
       ports: {
         http: {
diff --git a/samples/eshop/services/webstatus.bicep b/samples/eshop/services/webstatus.bicep
index c83bb61e..ad01a8d8 100644
--- a/samples/eshop/services/webstatus.bicep
+++ b/samples/eshop/services/webstatus.bicep
@@ -21,29 +21,75 @@ resource webstatus 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: '${imageRegistry}/webstatus:${imageTag}'
       env: {
-        ASPNETCORE_ENVIRONMENT: 'Development'
-        ASPNETCORE_URLS: 'http://0.0.0.0:80'
-        HealthChecksUI__HealthChecks__0__Name: 'WebMVC HTTP Check'
-        HealthChecksUI__HealthChecks__0__Uri: 'http://webmvc:5100/liveness'
-        HealthChecksUI__HealthChecks__1__Name: 'WebSPA HTTP Check'
-        HealthChecksUI__HealthChecks__1__Uri: 'http://web-spa:5104/liveness'
-        HealthChecksUI__HealthChecks__2__Name: 'Web Shopping Aggregator GW HTTP Check'
-        HealthChecksUI__HealthChecks__2__Uri: 'http://webshoppingagg:5121/liveness'
-        HealthChecksUI__HealthChecks__4__Name: 'Ordering HTTP Check'
-        HealthChecksUI__HealthChecks__4__Uri: 'http://ordering-api:5102/liveness'
-        HealthChecksUI__HealthChecks__5__Name: 'Basket HTTP Check'
-        HealthChecksUI__HealthChecks__5__Uri: 'http://basket-api:5103/liveness'
-        HealthChecksUI__HealthChecks__6__Name: 'Catalog HTTP Check'
-        HealthChecksUI__HealthChecks__6__Uri: 'http://catalog-api/liveness'
-        HealthChecksUI__HealthChecks__7__Name: 'Identity HTTP Check'
-        HealthChecksUI__HealthChecks__7__Uri: 'http://identity-api:5105/liveness'
-        HealthChecksUI__HealthChecks__8__Name: 'Payments HTTP Check'
-        HealthChecksUI__HealthChecks__8__Uri: 'http://payment-api:5108/liveness'
-        HealthChecksUI__HealthChecks__9__Name: 'Ordering SignalRHub HTTP Check'
-        HealthChecksUI__HealthChecks__9__Uri: 'http://ordering-signalrhub:5112/liveness'
-        HealthChecksUI__HealthChecks__10__Name: 'Ordering HTTP Background Check'
-        HealthChecksUI__HealthChecks__10__Uri: 'http://ordering-backgroundtasks:5111/liveness'
-        ORCHESTRATOR_TYPE: 'K8S'
+        ASPNETCORE_ENVIRONMENT: {
+          value: 'Development'
+        }
+        ASPNETCORE_URLS: {
+          value: 'http://0.0.0.0:80'
+        }
+        HealthChecksUI__HealthChecks__0__Name: {
+          value: 'WebMVC HTTP Check'
+        }
+        HealthChecksUI__HealthChecks__0__Uri: {
+          value: 'http://webmvc:5100/liveness'
+        }
+        HealthChecksUI__HealthChecks__1__Name: {
+          value: 'WebSPA HTTP Check'
+        }
+        HealthChecksUI__HealthChecks__1__Uri: {
+          value: 'http://web-spa:5104/liveness'
+        }
+        HealthChecksUI__HealthChecks__2__Name: {
+          value: 'Web Shopping Aggregator GW HTTP Check'
+        }
+        HealthChecksUI__HealthChecks__2__Uri: {
+          value: 'http://webshoppingagg:5121/liveness'
+        }
+        HealthChecksUI__HealthChecks__4__Name: {
+          value: 'Ordering HTTP Check'
+        }
+        HealthChecksUI__HealthChecks__4__Uri: {
+          value: 'http://ordering-api:5102/liveness'
+        }
+        HealthChecksUI__HealthChecks__5__Name: {
+          value: 'Basket HTTP Check'
+        }
+        HealthChecksUI__HealthChecks__5__Uri: {
+          value: 'http://basket-api:5103/liveness'
+        }
+        HealthChecksUI__HealthChecks__6__Name: {
+          value: 'Catalog HTTP Check'
+        }
+        HealthChecksUI__HealthChecks__6__Uri: {
+          value: 'http://catalog-api/liveness'
+        }
+        HealthChecksUI__HealthChecks__7__Name: {
+          value: 'Identity HTTP Check'
+        }
+        HealthChecksUI__HealthChecks__7__Uri: {
+          value: 'http://identity-api:5105/liveness'
+        }
+        HealthChecksUI__HealthChecks__8__Name: {
+          value: 'Payments HTTP Check'
+        }
+        HealthChecksUI__HealthChecks__8__Uri: {
+          value: 'http://payment-api:5108/liveness'
+        }
+        HealthChecksUI__HealthChecks__9__Name: {
+          value: 'Ordering SignalRHub HTTP Check'
+        }
+        HealthChecksUI__HealthChecks__9__Uri: {
+          value: 'http://ordering-signalrhub:5112/liveness'
+        }
+        HealthChecksUI__HealthChecks__10__Name: {
+          value: 'Ordering HTTP Background Check'
+        }
+        HealthChecksUI__HealthChecks__10__Uri: {
+          value: 'http://ordering-backgroundtasks:5111/liveness'
+        }
+        ORCHESTRATOR_TYPE: {
+          value: 'K8S'
+        }
       }
       ports: {
         http: {