diff --git a/.github/linters/.arm-ttk.psd1 b/.github/linters/.arm-ttk.psd1
index 6646dba..09b0fe8 100644
--- a/.github/linters/.arm-ttk.psd1
+++ b/.github/linters/.arm-ttk.psd1
@@ -14,5 +14,6 @@
         'apiVersions Should Be Recent In Reference Functions'
         'URIs Should Be Properly Constructed'
         'apiVersions Should Be Recent'
+        'Parameter Types Should Be Consistent'
     )
 }
diff --git a/infra/main.json b/infra/main.json
index 03d2e00..ca238c1 100644
--- a/infra/main.json
+++ b/infra/main.json
@@ -4,8 +4,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.5.6.12127",
-      "templateHash": "8127639514887243763"
+      "version": "0.12.40.16777",
+      "templateHash": "6812121725436570457"
     }
   },
   "parameters": {
@@ -275,8 +275,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.5.6.12127",
-              "templateHash": "10481042174545864292"
+              "version": "0.12.40.16777",
+              "templateHash": "728366978272543469"
             }
           },
           "parameters": {
@@ -447,8 +447,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.5.6.12127",
-              "templateHash": "11669417181826602990"
+              "version": "0.12.40.16777",
+              "templateHash": "17363202885418306246"
             }
           },
           "parameters": {
@@ -533,9 +533,7 @@
                   "preventDataExfiltration": true
                 },
                 "publicNetworkAccess": "Disabled",
-                "purviewConfiguration": {
-                  "purviewResourceId": "[parameters('purviewId')]"
-                },
+                "purviewConfiguration": "[if(empty(parameters('purviewId')), createObject(), createObject('purviewResourceId', parameters('purviewId')))]",
                 "sqlAdministratorLogin": "[parameters('administratorUsername')]",
                 "sqlAdministratorLoginPassword": "[parameters('administratorPassword')]",
                 "virtualNetworkProfile": {
@@ -820,8 +818,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.5.6.12127",
-              "templateHash": "10481417171219687804"
+              "version": "0.12.40.16777",
+              "templateHash": "13602656477775353919"
             }
           },
           "parameters": {
@@ -881,7 +879,7 @@
             "value": "[parameters('subnetId')]"
           },
           "keyVault001Id": {
-            "value": "[reference(resourceId('Microsoft.Resources/deployments', 'keyVault001')).outputs.keyvaultId.value]"
+            "value": "[reference(resourceId('Microsoft.Resources/deployments', 'keyVault001'), '2020-10-01').outputs.keyvaultId.value]"
           },
           "privateDnsZoneIdDataFactory": {
             "value": "[parameters('privateDnsZoneIdDataFactory')]"
@@ -905,8 +903,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.5.6.12127",
-              "templateHash": "1792165604666069858"
+              "version": "0.12.40.16777",
+              "templateHash": "17261996359540555009"
             }
           },
           "parameters": {
@@ -965,9 +963,7 @@
               "properties": {
                 "globalParameters": {},
                 "publicNetworkAccess": "Disabled",
-                "purviewConfiguration": {
-                  "purviewResourceId": "[parameters('purviewId')]"
-                }
+                "purviewConfiguration": "[if(empty(parameters('purviewId')), createObject(), createObject('purviewResourceId', parameters('purviewId')))]"
               }
             },
             {
@@ -1236,8 +1232,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.5.6.12127",
-              "templateHash": "14831264449214122851"
+              "version": "0.12.40.16777",
+              "templateHash": "798091880603537503"
             }
           },
           "parameters": {
@@ -1414,8 +1410,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.5.6.12127",
-              "templateHash": "12271990852463133658"
+              "version": "0.12.40.16777",
+              "templateHash": "862898394482381901"
             }
           },
           "parameters": {
@@ -1625,8 +1621,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.5.6.12127",
-              "templateHash": "5265715090830928459"
+              "version": "0.12.40.16777",
+              "templateHash": "4694966884391621335"
             }
           },
           "parameters": {
@@ -1822,8 +1818,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.5.6.12127",
-              "templateHash": "8277887320269602060"
+              "version": "0.12.40.16777",
+              "templateHash": "2872038126409096446"
             }
           },
           "parameters": {
@@ -1999,8 +1995,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.5.6.12127",
-              "templateHash": "5988095410269889096"
+              "version": "0.12.40.16777",
+              "templateHash": "5151007208354028029"
             }
           },
           "parameters": {
@@ -2190,8 +2186,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.5.6.12127",
-              "templateHash": "11124062553816241397"
+              "version": "0.12.40.16777",
+              "templateHash": "12354731438544814519"
             }
           },
           "parameters": {
@@ -2352,8 +2348,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.5.6.12127",
-              "templateHash": "17672663804510882985"
+              "version": "0.12.40.16777",
+              "templateHash": "15721744851111770609"
             }
           },
           "parameters": {
@@ -2738,8 +2734,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.5.6.12127",
-              "templateHash": "8256106526304999248"
+              "version": "0.12.40.16777",
+              "templateHash": "14507243972275046722"
             }
           },
           "parameters": {
@@ -2995,8 +2991,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.5.6.12127",
-              "templateHash": "7422181253017355270"
+              "version": "0.12.40.16777",
+              "templateHash": "1620764185972933965"
             }
           },
           "parameters": {
diff --git a/infra/modules/services/dashboard.bicep b/infra/modules/services/dashboard.bicep
index b377a86..1a5090d 100644
--- a/infra/modules/services/dashboard.bicep
+++ b/infra/modules/services/dashboard.bicep
@@ -44,6 +44,7 @@ resource dashboardDataFactory 'Microsoft.Portal/dashboards@2020-09-01-preview' =
                   isOptional: true
                 }
               ]
+              #disable-next-line BCP036
               type: 'Extension/HubsExtension/PartType/MonitorChartPart'
               settings: {
                 content: {
@@ -108,6 +109,7 @@ resource dashboardDataFactory 'Microsoft.Portal/dashboards@2020-09-01-preview' =
                   isOptional: true
                 }
               ]
+              #disable-next-line BCP036
               type: 'Extension/HubsExtension/PartType/MonitorChartPart'
               settings: {
                 content: {
@@ -190,6 +192,7 @@ resource dashboardSynapse 'Microsoft.Portal/dashboards@2020-09-01-preview' = if
                   isOptional: true
                 }
               ]
+              #disable-next-line BCP036
               type: 'Extension/HubsExtension/PartType/MonitorChartPart'
               settings: {
                 content: {
@@ -254,6 +257,7 @@ resource dashboardSynapse 'Microsoft.Portal/dashboards@2020-09-01-preview' = if
                   isOptional: true
                 }
               ]
+              #disable-next-line BCP036
               type: 'Extension/HubsExtension/PartType/MonitorChartPart'
               settings: {
                 content: {
diff --git a/infra/modules/services/datafactory.bicep b/infra/modules/services/datafactory.bicep
index 9394414..dc82eba 100644
--- a/infra/modules/services/datafactory.bicep
+++ b/infra/modules/services/datafactory.bicep
@@ -34,7 +34,7 @@ resource datafactory 'Microsoft.DataFactory/factories@2018-06-01' = {
     globalParameters: {}
     publicNetworkAccess: 'Disabled'
     #disable-next-line BCP037
-    purviewConfiguration: {
+    purviewConfiguration: empty(purviewId) ? {} : {
       purviewResourceId: purviewId
     }
   }
diff --git a/infra/modules/services/synapse.bicep b/infra/modules/services/synapse.bicep
index bb9e4ed..280fd79 100644
--- a/infra/modules/services/synapse.bicep
+++ b/infra/modules/services/synapse.bicep
@@ -49,7 +49,7 @@ resource synapse 'Microsoft.Synapse/workspaces@2021-03-01' = {
       preventDataExfiltration: true
     }
     publicNetworkAccess: 'Disabled'
-    purviewConfiguration: {
+    purviewConfiguration: empty(purviewId) ? {} : {
       purviewResourceId: purviewId
     }
     sqlAdministratorLogin: administratorUsername