diff --git a/02 Deployment of Azure resources/childTemplates/log-analytics.bicep b/02 Deployment of Azure resources/childTemplates/log-analytics.bicep
index fdda8bb..424a413 100644
--- a/02 Deployment of Azure resources/childTemplates/log-analytics.bicep	
+++ b/02 Deployment of Azure resources/childTemplates/log-analytics.bicep	
@@ -53,7 +53,7 @@ resource DCR_AllSystemInformation 'Microsoft.Insights/dataCollectionRules@2021-0
             'Microsoft-Event'
           ]
           xPathQueries: [
-            '*[System[(Level=4 or Level=0)]]'
+            'System!*[System[(Level=1 or Level=2 or Level=3 or Level=4 or Level=0)]]'
           ]
           name: 'AllSystemInformation'
         }
@@ -95,7 +95,7 @@ resource DCR_AllSystemCritical 'Microsoft.Insights/dataCollectionRules@2021-04-0
             'Microsoft-Event'
           ]
           xPathQueries: [
-            '*[System[(Level=1)]]'
+            'System!*[System[(Level=1)]]'
           ]
           name: 'AllSystemCritical'
         }
diff --git a/02 Deployment of Azure resources/parentTemplates/deploy-AzureBicepResources.ps1 b/02 Deployment of Azure resources/parentTemplates/deploy-AzureBicepResources.ps1
index 8762f61..0cb7ed0 100644
--- a/02 Deployment of Azure resources/parentTemplates/deploy-AzureBicepResources.ps1	
+++ b/02 Deployment of Azure resources/parentTemplates/deploy-AzureBicepResources.ps1	
@@ -18,14 +18,3 @@ $paramObject = @{
 # All test Azure resources including NSGs & NSG Security Rukles as both top level resources
 New-AzManagementGroupDeployment -Location $variables.location -TemplateFile '.\02 Deployment of Azure resources\parentTemplates\main.bicep' -ManagementGroupId $variables.ManagementGroupId -Name $TimeNow -TemplateParameterObject $paramObject -Verbose
 
-
-
-
-
-
-
-
-
-# DO NOT DEPLOY
-# NSGs with the Security Rules as sub-resources
-New-AzManagementGroupDeployment -Location $location -TemplateFile './01 Deployment of Azure resources\parentTemplates\main(nsg).bicep' -ManagementGroupId $ManagementGroupId -Name $TimeNow -Verbose
\ No newline at end of file
diff --git a/03.1 Deployment of Azure Resource Policies (BICEP)/parent_PolicyTemplates/main.bicep b/03.1 Deployment of Azure Resource Policies (BICEP)/parent_PolicyTemplates/main.bicep
index 05e89ae..bb70787 100644
--- a/03.1 Deployment of Azure Resource Policies (BICEP)/parent_PolicyTemplates/main.bicep	
+++ b/03.1 Deployment of Azure Resource Policies (BICEP)/parent_PolicyTemplates/main.bicep	
@@ -2,7 +2,7 @@ targetScope = 'managementGroup'
 
 param PaaS_ResourceGroupName string = 'Company_PaaS'
 param IaaS_ResourceGroupName string = 'Company_IaaS'
-param DCR_Name string = 'AllSystemInformation'
+param DCR_Name string = 'DCR-AllSystemInformation'
 
 param listOfAllowedLocations array = [
   'australiaeast'