diff --git a/.github/workflows/bicep_deploy.yml b/.github/workflows/bicep_deploy.yml
index f0b75e7e9c..3887f44204 100644
--- a/.github/workflows/bicep_deploy.yml
+++ b/.github/workflows/bicep_deploy.yml
@@ -127,9 +127,18 @@ jobs:
       resourceGroupName: ${{ inputs.resourceGroupName }}
       action: validate
     secrets: inherit
+    
+  what_if:
+    needs: validate
+    uses: ./.github/workflows/bicep_az_deployment_group.yml
+    with:
+      environment: ${{ inputs.environment }}
+      resourceGroupName: ${{ inputs.resourceGroupName }}
+      action: what-if
+    secrets: inherit
 
   deploy:
-    needs: validate
+    needs: what_if
     uses: ./.github/workflows/bicep_az_deployment_group.yml
     with:
       environment: ${{ inputs.environment }}
diff --git a/.github/workflows/bicep_lint.yml b/.github/workflows/bicep_lint.yml
new file mode 100644
index 0000000000..86666485f3
--- /dev/null
+++ b/.github/workflows/bicep_lint.yml
@@ -0,0 +1,30 @@
+name: Bicep Quality Assurance - Lint
+
+on:
+  pull_request:
+    branches:
+      - feat/stbr-infra
+    paths:
+      - '.github/workflows/bicep_az_deployment_group.yml'
+      - '.github/workflows/bicep_deploy.yml'
+      - '.github/workflows/bicep_workflow_feature.yml'
+      - 'infrastructure/**'
+  workflow_dispatch:
+
+jobs:
+  lint:
+    name: Lint Bicep code
+    runs-on: [self-hosted, linux, deployment]
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Install Bicep
+      run: |
+        az config set bicep.use_binary_from_path=False
+        az bicep install
+        az bicep upgrade
+
+    - name: Lint Bicep Code
+      run: |
+        az bicep version
+        az bicep build --file infrastructure/resource_group_level/main.bicep
diff --git a/.github/workflows/feature_deploy.yml b/.github/workflows/feature_deploy.yml
index 1d1af54d31..6de4f1440e 100644
--- a/.github/workflows/feature_deploy.yml
+++ b/.github/workflows/feature_deploy.yml
@@ -106,6 +106,8 @@ jobs:
             az webapp deployment slot delete --name tfs-${{ env.environment }}-${{ matrix.repository }} --resource-group ${{ env.resource_group }}  --slot ${{ github.sha }}
 
   deploy-functionapps:
+    # Disable for now
+    if: ${{ false }}
     # We depend on deploy-webapps to reduce the chances of being throttled
     needs: [deployment-environment, deploy-webapps]
     name: Deploy Functionapps
diff --git a/cspell.json b/cspell.json
index 1268aaccca..547a6cf5e7 100644
--- a/cspell.json
+++ b/cspell.json
@@ -88,6 +88,7 @@
     "NVARCHAR",
     "ORDANANCE",
     "organisation",
+    "parameterised",
     "pino",
     "pinojs",
     "plusplus",