diff --git a/services/Compute/virtualMachines/templates/arm/DataDiskReadLatencyms_abddd643-e7c7-411c-b13a-64fdbb406cc8.json b/services/Compute/virtualMachines/templates/arm/DataDiskReadLatencyms_abddd643-e7c7-411c-b13a-64fdbb406cc8.json
index 34c84b60d..a26bf11cf 100644
--- a/services/Compute/virtualMachines/templates/arm/DataDiskReadLatencyms_abddd643-e7c7-411c-b13a-64fdbb406cc8.json
+++ b/services/Compute/virtualMachines/templates/arm/DataDiskReadLatencyms_abddd643-e7c7-411c-b13a-64fdbb406cc8.json
@@ -112,7 +112,7 @@
     },
     "threshold": {
       "type": "string",
-      "defaultValue": "30",
+      "defaultValue": "25",
       "metadata": {
         "description": "The threshold value at which the alert is activated."
       }
diff --git a/services/Compute/virtualMachines/templates/arm/DataDiskWriteLatencyms_5c51e187-5b5d-428d-98d8-fb9ab4fea646.json b/services/Compute/virtualMachines/templates/arm/DataDiskWriteLatencyms_5c51e187-5b5d-428d-98d8-fb9ab4fea646.json
index 88466502a..ed6ee255b 100644
--- a/services/Compute/virtualMachines/templates/arm/DataDiskWriteLatencyms_5c51e187-5b5d-428d-98d8-fb9ab4fea646.json
+++ b/services/Compute/virtualMachines/templates/arm/DataDiskWriteLatencyms_5c51e187-5b5d-428d-98d8-fb9ab4fea646.json
@@ -112,7 +112,7 @@
     },
     "threshold": {
       "type": "string",
-      "defaultValue": "30",
+      "defaultValue": "25",
       "metadata": {
         "description": "The threshold value at which the alert is activated."
       }
diff --git a/services/Compute/virtualMachines/templates/arm/OSDiskFreeSpacePercentage_dca7af9f-cad2-4751-a61f-77d92c2ce523.json b/services/Compute/virtualMachines/templates/arm/OSDiskFreeSpacePercentage_dca7af9f-cad2-4751-a61f-77d92c2ce523.json
index 2e1a46879..212e11fb7 100644
--- a/services/Compute/virtualMachines/templates/arm/OSDiskFreeSpacePercentage_dca7af9f-cad2-4751-a61f-77d92c2ce523.json
+++ b/services/Compute/virtualMachines/templates/arm/OSDiskFreeSpacePercentage_dca7af9f-cad2-4751-a61f-77d92c2ce523.json
@@ -77,7 +77,7 @@
     "query": {
       "type": "string",
       "minLength": 1,
-      "defaultValue": "InsightsMetrics | where Origin == \"vm.azm.ms\" | where Namespace == \"LogicalDisk\" and Name == \"FreeSpacePercentage\" | extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"]) | summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk ",
+      "defaultValue": "InsightsMetrics | where Origin == \"vm.azm.ms\" | where Namespace == \"LogicalDisk\" and Name == \"FreeSpacePercentage\" | extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"]) | where Disk in ('C:','/') | summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk ",
       "metadata": {
         "description": "Name of the metric used in the comparison to activate the alert."
       }
diff --git a/services/Compute/virtualMachines/templates/arm/OSDiskReadLatencyms_299ce963-728a-48c8-8b7d-e05b5f8a8f38.json b/services/Compute/virtualMachines/templates/arm/OSDiskReadLatencyms_299ce963-728a-48c8-8b7d-e05b5f8a8f38.json
index 2240ffcf8..ff71914be 100644
--- a/services/Compute/virtualMachines/templates/arm/OSDiskReadLatencyms_299ce963-728a-48c8-8b7d-e05b5f8a8f38.json
+++ b/services/Compute/virtualMachines/templates/arm/OSDiskReadLatencyms_299ce963-728a-48c8-8b7d-e05b5f8a8f38.json
@@ -77,7 +77,7 @@
     "query": {
       "type": "string",
       "minLength": 1,
-      "defaultValue": "InsightsMetrics | where Origin == \"vm.azm.ms\" | where Namespace == \"LogicalDisk\" and Name == \"ReadLatencyMs\" | extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"]) | summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk ",
+      "defaultValue": "InsightsMetrics | where Origin == \"vm.azm.ms\" | where Namespace == \"LogicalDisk\" and Name == \"ReadLatencyMs\" | extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"]) | where Disk in ('C:','/') | summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk ",
       "metadata": {
         "description": "Name of the metric used in the comparison to activate the alert."
       }
@@ -112,7 +112,7 @@
     },
     "threshold": {
       "type": "string",
-      "defaultValue": "30",
+      "defaultValue": "25",
       "metadata": {
         "description": "The threshold value at which the alert is activated."
       }
diff --git a/services/Compute/virtualMachines/templates/arm/OSDiskWriteLatencyms_37d9da12-88e6-4c01-8772-384920d34458.json b/services/Compute/virtualMachines/templates/arm/OSDiskWriteLatencyms_37d9da12-88e6-4c01-8772-384920d34458.json
index 021e217d6..16126afa7 100644
--- a/services/Compute/virtualMachines/templates/arm/OSDiskWriteLatencyms_37d9da12-88e6-4c01-8772-384920d34458.json
+++ b/services/Compute/virtualMachines/templates/arm/OSDiskWriteLatencyms_37d9da12-88e6-4c01-8772-384920d34458.json
@@ -77,7 +77,7 @@
     "query": {
       "type": "string",
       "minLength": 1,
-      "defaultValue": "InsightsMetrics| where Origin == \"vm.azm.ms\" | where Namespace == \"LogicalDisk\" and Name == \"WriteLatencyMs\" | extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"]) | summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk ",
+      "defaultValue": "InsightsMetrics| where Origin == \"vm.azm.ms\" | where Namespace == \"LogicalDisk\" and Name == \"WriteLatencyMs\" | extend Disk=tostring(todynamic(Tags)[\"vm.azm.ms/mountId\"]) | where Disk in ('C:','/') | summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk ",
       "metadata": {
         "description": "Name of the metric used in the comparison to activate the alert."
       }
@@ -112,7 +112,7 @@
     },
     "threshold": {
       "type": "string",
-      "defaultValue": "50",
+      "defaultValue": "25",
       "metadata": {
         "description": "The threshold value at which the alert is activated."
       }
diff --git a/services/Compute/virtualMachines/templates/bicep/DataDiskReadLatencyms_abddd643-e7c7-411c-b13a-64fdbb406cc8.bicep b/services/Compute/virtualMachines/templates/bicep/DataDiskReadLatencyms_abddd643-e7c7-411c-b13a-64fdbb406cc8.bicep
index 6d8cce3d2..e7665f494 100644
--- a/services/Compute/virtualMachines/templates/bicep/DataDiskReadLatencyms_abddd643-e7c7-411c-b13a-64fdbb406cc8.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/DataDiskReadLatencyms_abddd643-e7c7-411c-b13a-64fdbb406cc8.bicep
@@ -62,7 +62,7 @@ param resourceIdColumn string = '_ResourceId'
 param operator string = 'GreaterThan'
 
 @description('The threshold value at which the alert is activated.')
-param threshold int = 30
+param threshold int = 25
 
 @description('The number of periods to check in the alert evaluation.')
 param numberOfEvaluationPeriods int = 1
diff --git a/services/Compute/virtualMachines/templates/bicep/DataDiskWriteLatencyms_5c51e187-5b5d-428d-98d8-fb9ab4fea646.bicep b/services/Compute/virtualMachines/templates/bicep/DataDiskWriteLatencyms_5c51e187-5b5d-428d-98d8-fb9ab4fea646.bicep
index bcd634e82..5e732ee39 100644
--- a/services/Compute/virtualMachines/templates/bicep/DataDiskWriteLatencyms_5c51e187-5b5d-428d-98d8-fb9ab4fea646.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/DataDiskWriteLatencyms_5c51e187-5b5d-428d-98d8-fb9ab4fea646.bicep
@@ -62,7 +62,7 @@ param resourceIdColumn string = '_ResourceId'
 param operator string = 'GreaterThan'
 
 @description('The threshold value at which the alert is activated.')
-param threshold int = 30
+param threshold int = 25
 
 @description('The number of periods to check in the alert evaluation.')
 param numberOfEvaluationPeriods int = 1
diff --git a/services/Compute/virtualMachines/templates/bicep/OSDiskFreeSpacePercentage_dca7af9f-cad2-4751-a61f-77d92c2ce523.bicep b/services/Compute/virtualMachines/templates/bicep/OSDiskFreeSpacePercentage_dca7af9f-cad2-4751-a61f-77d92c2ce523.bicep
index 5b74013fd..13e60d976 100644
--- a/services/Compute/virtualMachines/templates/bicep/OSDiskFreeSpacePercentage_dca7af9f-cad2-4751-a61f-77d92c2ce523.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/OSDiskFreeSpacePercentage_dca7af9f-cad2-4751-a61f-77d92c2ce523.bicep
@@ -43,7 +43,7 @@ param autoMitigate bool = true
 
 @description('Name of the metric used in the comparison to activate the alert.')
 @minLength(1)
-param query string = 'InsightsMetrics | where Origin == "vm.azm.ms" | where Namespace == "LogicalDisk" and Name == "FreeSpacePercentage" | extend Disk=tostring(todynamic(Tags)["vm.azm.ms/mountId"]) | summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk '
+param query string = 'InsightsMetrics | where Origin == "vm.azm.ms" | where Namespace == "LogicalDisk" and Name == "FreeSpacePercentage" | extend Disk=tostring(todynamic(Tags)["vm.azm.ms/mountId"]) | where Disk in (\'C:\',\'/\') | summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk '
 
 @description('Name of the measure column used in the alert evaluation.')
 param metricMeasureColumn string = 'AggregatedValue'
diff --git a/services/Compute/virtualMachines/templates/bicep/OSDiskReadLatencyms_299ce963-728a-48c8-8b7d-e05b5f8a8f38.bicep b/services/Compute/virtualMachines/templates/bicep/OSDiskReadLatencyms_299ce963-728a-48c8-8b7d-e05b5f8a8f38.bicep
index 6b59fcd6b..949a4619b 100644
--- a/services/Compute/virtualMachines/templates/bicep/OSDiskReadLatencyms_299ce963-728a-48c8-8b7d-e05b5f8a8f38.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/OSDiskReadLatencyms_299ce963-728a-48c8-8b7d-e05b5f8a8f38.bicep
@@ -43,7 +43,7 @@ param autoMitigate bool = true
 
 @description('Name of the metric used in the comparison to activate the alert.')
 @minLength(1)
-param query string = 'InsightsMetrics | where Origin == "vm.azm.ms" | where Namespace == "LogicalDisk" and Name == "ReadLatencyMs" | extend Disk=tostring(todynamic(Tags)["vm.azm.ms/mountId"]) | summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk '
+param query string = 'InsightsMetrics | where Origin == "vm.azm.ms" | where Namespace == "LogicalDisk" and Name == "ReadLatencyMs" | extend Disk=tostring(todynamic(Tags)["vm.azm.ms/mountId"]) | where Disk in (\'C:\',\'/\') | summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk '
 
 @description('Name of the measure column used in the alert evaluation.')
 param metricMeasureColumn string = 'AggregatedValue'
@@ -62,7 +62,7 @@ param resourceIdColumn string = '_ResourceId'
 param operator string = 'GreaterThan'
 
 @description('The threshold value at which the alert is activated.')
-param threshold int = 30
+param threshold int = 25
 
 @description('The number of periods to check in the alert evaluation.')
 param numberOfEvaluationPeriods int = 1
diff --git a/services/Compute/virtualMachines/templates/bicep/OSDiskWriteLatencyms_37d9da12-88e6-4c01-8772-384920d34458.bicep b/services/Compute/virtualMachines/templates/bicep/OSDiskWriteLatencyms_37d9da12-88e6-4c01-8772-384920d34458.bicep
index 94a81f3a3..4ea7f5fd2 100644
--- a/services/Compute/virtualMachines/templates/bicep/OSDiskWriteLatencyms_37d9da12-88e6-4c01-8772-384920d34458.bicep
+++ b/services/Compute/virtualMachines/templates/bicep/OSDiskWriteLatencyms_37d9da12-88e6-4c01-8772-384920d34458.bicep
@@ -43,7 +43,7 @@ param autoMitigate bool = true
 
 @description('Name of the metric used in the comparison to activate the alert.')
 @minLength(1)
-param query string = 'InsightsMetrics| where Origin == "vm.azm.ms" | where Namespace == "LogicalDisk" and Name == "WriteLatencyMs" | extend Disk=tostring(todynamic(Tags)["vm.azm.ms/mountId"]) | summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk '
+param query string = 'InsightsMetrics| where Origin == "vm.azm.ms" | where Namespace == "LogicalDisk" and Name == "WriteLatencyMs" | extend Disk=tostring(todynamic(Tags)["vm.azm.ms/mountId"]) | where Disk in (\'C:\',\'/\') | summarize AggregatedValue = avg(Val) by bin(TimeGenerated, 15m), Computer, _ResourceId, Disk '
 
 @description('Name of the measure column used in the alert evaluation.')
 param metricMeasureColumn string = 'AggregatedValue'
@@ -62,7 +62,7 @@ param resourceIdColumn string = '_ResourceId'
 param operator string = 'GreaterThan'
 
 @description('The threshold value at which the alert is activated.')
-param threshold int = 50
+param threshold int = 25
 
 @description('The number of periods to check in the alert evaluation.')
 param numberOfEvaluationPeriods int = 1