diff --git a/dev-infrastructure/configurations/region.tmpl.bicepparam b/dev-infrastructure/configurations/region.tmpl.bicepparam
index 65ed549df..75d89cc50 100644
--- a/dev-infrastructure/configurations/region.tmpl.bicepparam
+++ b/dev-infrastructure/configurations/region.tmpl.bicepparam
@@ -7,5 +7,5 @@ param regionalDNSSubdomain = '{{ .regionalDNSSubdomain }}'
 
 // maestro
 param maestroEventGridNamespacesName = '{{ .maestro.eventGrid.name }}'
-param maestroEventGridMaxClientSessionsPerAuthName = {{ .maestro.eventGrid.maxClientSessionsPerAuthName }}
-param maestroEventGridPrivate = {{ .maestro.eventGrid.private }}
+param maestroEventGridMaxClientSessionsPerAuthName = any('{{ .maestro.eventGrid.maxClientSessionsPerAuthName }}')
+param maestroEventGridPrivate = any('{{ .maestro.eventGrid.private }}')
diff --git a/dev-infrastructure/region-pipeline.yaml b/dev-infrastructure/region-pipeline.yaml
index d680c1bc5..69125cdeb 100644
--- a/dev-infrastructure/region-pipeline.yaml
+++ b/dev-infrastructure/region-pipeline.yaml
@@ -1,4 +1,4 @@
-serviceGroup: Microsoft.Azure.ARO.Test
+serviceGroup: Microsoft.Azure.ARO.HCP.Region
 rolloutName: Region Rollout
 resourceGroups:
 - name: {{ .regionRG }}
@@ -10,7 +10,7 @@ resourceGroups:
     parameters: configurations/region.tmpl.bicepparam
   - name: metrics-infra
     action: ARM
-    template: modules/modules/metrics.bicep
+    template: modules/metrics/metrics.bicep
     parameters: configurations/metrics.tmpl.bicepparam
     dependsOn:
     - region
diff --git a/dev-infrastructure/templates/region.bicep b/dev-infrastructure/templates/region.bicep
index 7c88b7072..89eb9c9bd 100644
--- a/dev-infrastructure/templates/region.bicep
+++ b/dev-infrastructure/templates/region.bicep
@@ -47,7 +47,7 @@ module regionalZoneDelegation '../modules/dns/zone-delegation.bicep' = {
   params: {
     childZoneName: regionalDNSSubdomain
     childZoneNameservers: regionalZone.properties.nameServers
-    parentZoneName: baseDNSZoneName
+    parentZoneName: regionalZone.name
   }
 }