diff --git a/.github/workflows/bicep_lint.yml b/.github/workflows/bicep_lint.yml
new file mode 100644
index 0000000000..b0f842c2d1
--- /dev/null
+++ b/.github/workflows/bicep_lint.yml
@@ -0,0 +1,30 @@
+name: Deploy Feature Infrastructure using Bicep
+
+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/resource_group_level/**'
+  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/bicep_workflow_feature.yml b/.github/workflows/bicep_workflow_feature.yml
index 9b6bd7edae..bc5f822696 100644
--- a/.github/workflows/bicep_workflow_feature.yml
+++ b/.github/workflows/bicep_workflow_feature.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - feat/stbr-infra
-      - feat/FN-692/add-what-if-to-bicep-deploy-pipeline
     paths:
       - '.github/workflows/bicep_az_deployment_group.yml'
       - '.github/workflows/bicep_deploy.yml'
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",
diff --git a/infrastructure/resource_group_level/modules/storage.bicep b/infrastructure/resource_group_level/modules/storage.bicep
index 36c757ac2e..e3aaf17758 100644
--- a/infrastructure/resource_group_level/modules/storage.bicep
+++ b/infrastructure/resource_group_level/modules/storage.bicep
@@ -199,16 +199,6 @@ resource utilisationReportsFileShare 'Microsoft.Storage/storageAccounts/fileServ
   }
 }
 
-resource testFileShare 'Microsoft.Storage/storageAccounts/fileServices/shares@2022-09-01' = {
-  parent: defaultFileService
-  name: 'test-file-share'
-  properties: {
-    accessTier: 'TransactionOptimized'
-    shareQuota: 5120
-    enabledProtocols: 'SMB'
-  }
-}
-
 resource queues 'Microsoft.Storage/storageAccounts/queueServices/queues@2022-09-01' = [for queueName in queueNames: {
   parent: queueService
   name: queueName