diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/containers/corerp-resources-friendly-container-version-1.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/containers/corerp-resources-friendly-container-version-1.bicep
index 865cbcb717..458f29c5e3 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/containers/corerp-resources-friendly-container-version-1.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/containers/corerp-resources-friendly-container-version-1.bicep
@@ -19,7 +19,9 @@ resource webapp 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: magpieimage
       env: {
-        DBCONNECTION: redis.listSecrets().connectionString
+        DBCONNECTION: {
+          value: redis.listSecrets().connectionString
+        }
       }
       readinessProbe: {
         kind: 'httpGet'
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-extender.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-extender.bicep
index 70143fdcc5..1f6b23f3c2 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-extender.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-extender.bicep
@@ -33,9 +33,15 @@ resource container 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: magpieimage
       env: {
-        TWILIO_NUMBER: twilio.properties.fromNumber
-        TWILIO_SID: twilio.listSecrets().accountSid
-        TWILIO_ACCOUNT: twilio.listSecrets().authToken
+        TWILIO_NUMBER: {
+          value: twilio.properties.fromNumber
+        }
+        TWILIO_SID: {
+          value: twilio.listSecrets().accountSid
+        }
+        TWILIO_ACCOUNT: {
+          value: twilio.listSecrets().authToken
+        }
       }
     }
     connections: {}
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-dns.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-dns.bicep
index 298aad6acf..650ad24f02 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-dns.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-dns.bicep
@@ -79,7 +79,9 @@ resource backendcontainerdns 'Applications.Core/containers@2023-10-01-preview' =
 		container: {
 			image: magpieimage
 			env: {
-				gatewayUrl: gateway.properties.url
+				gatewayUrl: {
+					value: gateway.properties.url
+				}
 			}
 			ports: {
 				web: {
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-kubernetesmetadata.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-kubernetesmetadata.bicep
index 4417712d88..f9f9975718 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-kubernetesmetadata.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-kubernetesmetadata.bicep
@@ -93,7 +93,9 @@ resource backendContainer 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: magpieimage
       env: {
-        gatewayUrl: gateway.properties.url
+        gatewayUrl: {
+          value: gateway.properties.url
+        }
       }
       ports: {
         web: {
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-sslpassthrough.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-sslpassthrough.bicep
index 544e594f48..85467f5b03 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-sslpassthrough.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-gateway-sslpassthrough.bicep
@@ -54,8 +54,12 @@ resource frontendContainer 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: magpieimage
       env: {
-        TLS_KEY: tlskey
-        TLS_CERT: tlscrt
+        TLS_KEY: {
+          value: tlskey
+        }
+        TLS_CERT: {
+          value: tlscrt
+        }
       }
       ports: {
         web: {
diff --git a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-simulatedenv.bicep b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-simulatedenv.bicep
index 6c923bee3d..d200878ee8 100644
--- a/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-simulatedenv.bicep
+++ b/test/functional-portable/corerp/noncloud/resources/testdata/corerp-resources-simulatedenv.bicep
@@ -91,7 +91,9 @@ resource backendContainer 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: magpieimage
       env: {
-        gatewayUrl: gateway.properties.url
+        gatewayUrl: {
+          value: gateway.properties.url
+        }
       }
       ports: {
         web: {
diff --git a/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-sqldb-manual.bicep b/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-sqldb-manual.bicep
index a3ea4720d6..1439c50243 100644
--- a/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-sqldb-manual.bicep
+++ b/test/functional-portable/datastoresrp/noncloud/resources/testdata/datastoresrp-resources-sqldb-manual.bicep
@@ -84,9 +84,15 @@ resource sqlContainer 'Applications.Core/containers@2023-10-01-preview' = {
     container: {
       image: sqlImage
       env: {
-        ACCEPT_EULA: 'Y'
-        MSSQL_PID: 'Developer'
-        MSSQL_SA_PASSWORD: password
+        ACCEPT_EULA: {
+          value: 'Y'
+        }
+        MSSQL_PID: {
+          value: 'Developer'
+        }
+        MSSQL_SA_PASSWORD: {
+          value: password
+        }
       }
       ports: {
         sql: {