diff --git a/.ado/ado-pipelines-STAGETEST.yml b/.ado/ado-pipelines-STAGETEST.yml
index dbc3d5ca..3020285e 100644
--- a/.ado/ado-pipelines-STAGETEST.yml
+++ b/.ado/ado-pipelines-STAGETEST.yml
@@ -129,6 +129,7 @@ jobs:
       #     pwsh: true
 
       - task: AzurePowerShell@5
+        displayName: Test Bicep in PowerShell + Azure Context
         inputs:
           ${{ if and(eq(parameters.STAGE, '00-ALL-SUB'), eq(parameters.UAI, 1)) }}:
             azureSubscription: ${{ parameters.SPG0 }}-G0_UAI
@@ -138,6 +139,7 @@ jobs:
             azureSubscription: ${{ parameters.SP }}-${{ parameters.ENV }}
           ScriptType: InlineScript
           FailOnStandardError: true
+          
           azurePowerShellVersion: "LatestVersion"
           Inline: |
             Get-AzContext
diff --git a/ADF/1-prereqs/07-ListAPIVersions.ps1 b/ADF/1-prereqs/07-ListAPIVersions.ps1
index 0739fa37..d9732450 100644
--- a/ADF/1-prereqs/07-ListAPIVersions.ps1
+++ b/ADF/1-prereqs/07-ListAPIVersions.ps1
@@ -72,6 +72,9 @@ $ResourceTypeName = 'VirtualMachines'
 $ResourceTypeName = 'storageAccounts'
 $ResourceTypeName = 'machines'
 $ResourceTypeName = 'service'
+
+$ProviderNamespace = 'Microsoft.Compute'
+$ResourceTypeName = 'diskEncryptionSets'
 ((Get-AzResourceProvider -ProviderNamespace $ProviderNamespace).ResourceTypes | Where-Object ResourceTypeName -eq $ResourceTypeName).ApiVersions
 
 <#
diff --git a/ADF/bicep/bicepconfig.json b/ADF/bicep/bicepconfig.json
index 89c183cb..e407de11 100644
--- a/ADF/bicep/bicepconfig.json
+++ b/ADF/bicep/bicepconfig.json
@@ -1,9 +1,9 @@
 {
   "experimentalFeaturesEnabled": {
-    // "paramsFiles": false,
+    // "paramsFiles": false, // now GA
     // "extensibility": true,
     // "resourceTypedParamsAndOutputs": false,
-    // "userDefinedTypes": false
+    // "userDefinedTypes": false,
     // "symbolicNameCodegen": true
   },
   "analyzers": {
diff --git a/ADF/release-az/Start-AzDeploy.psm1 b/ADF/release-az/Start-AzDeploy.psm1
index 590da907..92eeb3c2 100644
--- a/ADF/release-az/Start-AzDeploy.psm1
+++ b/ADF/release-az/Start-AzDeploy.psm1
@@ -267,8 +267,8 @@ Function global:Start-AzDeploy
     $OptionalParameters['Environment'] = $Deployment.substring(0, 1)
     $OptionalParameters['DeploymentID'] = $Deployment.substring(1)
 
-    $BaseParam = "$Artifacts/tenants/$App/$Prefix.$Deployment.parameters"
-    $TemplateParametersFile = (Test-Path -Path "${BaseParam}.bicepparam") ? "${BaseParam}.bicepparam" : "${BaseParam}.json"
+    $BaseParam = "$Artifacts/tenants/$App/$Prefix.$Deployment"
+    $TemplateParametersFile = (Test-Path -Path "${BaseParam}.bicepparam") ? "${BaseParam}.bicepparam" : "${BaseParam}.parameters.json"
     Write-Warning -Message "Using parameter file: [$TemplateParametersFile]"
     $TemplateArgs.Add('TemplateParameterFile', $TemplateParametersFile)
 
diff --git a/ADF/tenants/AD/AWU3.G0.parameters.bicepparam b/ADF/tenants/AD/AWU3.G0.bicepparam
similarity index 91%
rename from ADF/tenants/AD/AWU3.G0.parameters.bicepparam
rename to ADF/tenants/AD/AWU3.G0.bicepparam
index e04e68ab..066335a9 100644
--- a/ADF/tenants/AD/AWU3.G0.parameters.bicepparam
+++ b/ADF/tenants/AD/AWU3.G0.bicepparam
@@ -1,6 +1,10 @@
 using '../../bicep/00-ALL-SUB.bicep'
 
-param Global = {}
+param Global = union(
+  loadJsonContent('Global-${Prefix}.json'),
+  loadJsonContent('Global-Global.json'),
+  loadJsonContent('Global-Config.json')
+  )
 
 param Prefix = 'AWU3'
 
diff --git a/ADF/tenants/AD/AWU3.G1.parameters.bicepparam b/ADF/tenants/AD/AWU3.G1.bicepparam
similarity index 96%
rename from ADF/tenants/AD/AWU3.G1.parameters.bicepparam
rename to ADF/tenants/AD/AWU3.G1.bicepparam
index 5eedef61..269a45a1 100644
--- a/ADF/tenants/AD/AWU3.G1.parameters.bicepparam
+++ b/ADF/tenants/AD/AWU3.G1.bicepparam
@@ -1,6 +1,10 @@
 using '../../bicep/00-ALL-SUB.bicep'
 
-param Global = {}
+param Global = union(
+  loadJsonContent('Global-${Prefix}.json'),
+  loadJsonContent('Global-Global.json'),
+  loadJsonContent('Global-Config.json')
+  )
 
 param Prefix = 'AWU3'
 
diff --git a/ADF/tenants/AD/AWU3.M0.parameters.bicepparam b/ADF/tenants/AD/AWU3.M0.bicepparam
similarity index 87%
rename from ADF/tenants/AD/AWU3.M0.parameters.bicepparam
rename to ADF/tenants/AD/AWU3.M0.bicepparam
index c3a9ffbf..dd06ed24 100644
--- a/ADF/tenants/AD/AWU3.M0.parameters.bicepparam
+++ b/ADF/tenants/AD/AWU3.M0.bicepparam
@@ -1,8 +1,12 @@
 using '../../bicep/00-ALL-MG.bicep'
 
-param Global = {}
+param Global = union(
+  loadJsonContent('Global-${Prefix}.json'),
+  loadJsonContent('Global-Global.json'),
+  loadJsonContent('Global-Config.json')
+  )
 
-param Prefix = 'ACU1'
+param Prefix = 'AWU3'
 
 param Environment = 'M'
 
diff --git a/ADF/tenants/AD/AWU3.P0.parameters.bicepparam b/ADF/tenants/AD/AWU3.P0.bicepparam
similarity index 98%
rename from ADF/tenants/AD/AWU3.P0.parameters.bicepparam
rename to ADF/tenants/AD/AWU3.P0.bicepparam
index 9001b566..bbe9265c 100644
--- a/ADF/tenants/AD/AWU3.P0.parameters.bicepparam
+++ b/ADF/tenants/AD/AWU3.P0.bicepparam
@@ -1,6 +1,10 @@
 using '../../bicep/00-ALL-SUB.bicep'
 
-param Global = {}
+param Global = union(
+  loadJsonContent('Global-${Prefix}.json'),
+  loadJsonContent('Global-Global.json'),
+  loadJsonContent('Global-Config.json')
+  )
 
 param Prefix = 'AWU3'