diff --git a/.github/workflows/azd-template-validation.yml b/.github/workflows/azd-template-validation.yml
index 7ffec1c..6145100 100644
--- a/.github/workflows/azd-template-validation.yml
+++ b/.github/workflows/azd-template-validation.yml
@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - main
+  pull_request:
+    branches:
+      - main
 
 permissions:
   contents: read
@@ -29,6 +32,8 @@ jobs:
           AZURE_ENV_NAME: ${{ vars.AZURE_ENV_NAME }}
           AZURE_LOCATION: ${{ vars.AZURE_LOCATION }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          fabricCapacityMode: none
+          fabricCapacityAdmins: 'v-prisinghal@MngEnvMCAP993385.onmicrosoft.com'
 
       - name: print result
         run: cat ${{ steps.validation.outputs.resultFile }}
diff --git a/README.md b/README.md
index 291dc06..cd9e95e 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,10 @@ This accelerator extends the [AI Landing Zone](https://github.com/Azure/ai-landi
 <!-------------------------------------------->
 <!-- KEY FEATURES                            -->
 <!-------------------------------------------->
+
+## Features
+
+
 ### Key features
 <details open>
   <summary>Click to learn more about the key features this solution enables</summary>
@@ -73,6 +77,9 @@ This accelerator extends the [AI Landing Zone](https://github.com/Azure/ai-landi
 <!-------------------------------------------->
 <!-- QUICK DEPLOY                            -->
 <!-------------------------------------------->
+
+## Getting Started
+
 <h2><img src="./docs/images/readme/quick-deploy.png" width="48" />
 Quick deploy
 </h2>
@@ -213,6 +220,11 @@ After deployment, you'll have a complete, enterprise-ready platform that unifies
 <!------------------------------------------>
 <!-- SUPPORTING DOCUMENTATION                -->
 <!------------------------------------------>
+
+
+## Guidance
+
+
 <h2><img src="./docs/images/readme/supporting-documentation.png" width="48" />
 Supporting documentation
 </h2>
@@ -251,6 +263,10 @@ Supporting documentation
 
 </details>
 
+
+## Resources
+
+
 ### Cross references
 Check out similar solution accelerators
 | Solution Accelerator | Description |
diff --git a/infra/main.bicep b/infra/main.bicep
index c7433e4..fcc3289 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -117,7 +117,7 @@ param purviewCollectionName string = ''
 // AI LANDING ZONE DEPLOYMENT
 // ========================================
 
-module aiLandingZone '../submodules/ai-landing-zone/bicep/deploy/main.bicep' = {
+module aiLandingZone '../submodules/ai-landing-zone/bicep/infra/main.bicep' = {
   name: 'ai-landing-zone'
   params: {
     deployToggles: deployToggles
diff --git a/infra/main.bicepparam b/infra/main.bicepparam
index 9d68690..273651b 100644
--- a/infra/main.bicepparam
+++ b/infra/main.bicepparam
@@ -99,7 +99,7 @@ param aiSearchAdditionalAccessObjectIds = []
 // - Full setup: fabricCapacityPreset='create', fabricWorkspacePreset='create'
 // - No Fabric:  fabricCapacityPreset='none',   fabricWorkspacePreset='none'
 // - BYO both:   fabricCapacityPreset='byo',    fabricWorkspacePreset='byo'
-var fabricCapacityPreset = 'create'
+var fabricCapacityPreset = readEnvironmentVariable('fabricCapacityMode', 'create')
 var fabricWorkspacePreset = fabricCapacityPreset
 
 // Legacy toggle retained for back-compat with older docs/scripts
@@ -118,7 +118,8 @@ param fabricWorkspaceName = '' // optional (helpful for naming/UX)
 param fabricCapacitySku = 'F8'
 
 // Fabric capacity admin members (email addresses or object IDs).
-param fabricCapacityAdmins = []
+var fabricAdminValue = readEnvironmentVariable('fabricCapacityAdmins', '')
+param fabricCapacityAdmins = empty(fabricAdminValue) ? [] : [fabricAdminValue]
 
 // ========================================
 // PURVIEW PARAMETERS (Optional)