diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 4a93dab046..5bb99e8792 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -6,7 +6,7 @@
   version: '3.7'
   services:
     rover:
-      image: aztfmod/rover:1.5.7-2310.0211
+      image: aztfmod/rover:1.5.6-2309.0507
       user: vscode
 
       labels:
diff --git a/.github/workflows/standalone-scenarios.json b/.github/workflows/standalone-scenarios.json
index 17b6f952e4..38c6d74801 100644
--- a/.github/workflows/standalone-scenarios.json
+++ b/.github/workflows/standalone-scenarios.json
@@ -85,7 +85,7 @@
     "machine_learning/100-aml",
     "machine_learning/101-aml-vnet",
     "machine_learning/102-aml-compute_instance",
-    "maps/101-azure-maps-account/configuration.tfvars",
+    "maps/101-azure-maps-account",
     "managed_service_identity/100-msi-levels",
     "mariadb_server/100-simple-mariadb",
     "mariadb_server/101-vnet-rule-mariadb",
diff --git a/examples/compute/azure_virtual_desktop/wvd_resources_and_session_host/diagnostics_definitions.tfvars b/examples/compute/azure_virtual_desktop/wvd_resources_and_session_host/diagnostics_definitions.tfvars
index 0074743748..454a498e14 100644
--- a/examples/compute/azure_virtual_desktop/wvd_resources_and_session_host/diagnostics_definitions.tfvars
+++ b/examples/compute/azure_virtual_desktop/wvd_resources_and_session_host/diagnostics_definitions.tfvars
@@ -10,10 +10,10 @@ diagnostics_definition = {
     categories = {
       log = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["Checkpoint", true, true, 7],
-        ["Error", true, true, 7],
-        ["Management", true, true, 7],
-        ["Feed", true, true, 7],
+        ["Checkpoint", true, true, 0],
+        ["Error", true, true, 0],
+        ["Management", true, true, 0],
+        ["Feed", true, true, 0],
       ]
     }
   }
@@ -23,12 +23,12 @@ diagnostics_definition = {
     categories = {
       log = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["Checkpoint", true, true, 7],
-        ["Error", true, true, 7],
-        ["Management", true, true, 7],
-        ["Connection", true, true, 7],
-        ["HostRegistration", true, true, 7],
-        ["AgentHealthStatus", true, true, 7],
+        ["Checkpoint", true, true, 0],
+        ["Error", true, true, 0],
+        ["Management", true, true, 0],
+        ["Connection", true, true, 0],
+        ["HostRegistration", true, true, 0],
+        ["AgentHealthStatus", true, true, 0],
       ]
     }
   }
@@ -38,9 +38,9 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["Checkpoint", true, true, 7],
-        ["Error", true, true, 7],
-        ["Management", true, true, 7],
+        ["Checkpoint", true, true, 0],
+        ["Error", true, true, 0],
+        ["Management", true, true, 0],
       ]
     }
   }
diff --git a/examples/compute/container_registry/200-acr-private-link/diagnostics.tfvars b/examples/compute/container_registry/200-acr-private-link/diagnostics.tfvars
index bac09b4749..256587fab4 100644
--- a/examples/compute/container_registry/200-acr-private-link/diagnostics.tfvars
+++ b/examples/compute/container_registry/200-acr-private-link/diagnostics.tfvars
@@ -39,11 +39,11 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["Audit", true, false, 7],
+        ["Audit", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
   }
@@ -53,12 +53,12 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["ContainerRegistryRepositoryEvents", true, false, 7],
-        ["ContainerRegistryLoginEvents", true, false, 7],
+        ["ContainerRegistryRepositoryEvents", true, false, 0],
+        ["ContainerRegistryLoginEvents", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
   }
diff --git a/examples/data_factory/117-data_factory_diagnostics/configuration.tfvars b/examples/data_factory/117-data_factory_diagnostics/configuration.tfvars
index f7e1002f66..5352e986f8 100644
--- a/examples/data_factory/117-data_factory_diagnostics/configuration.tfvars
+++ b/examples/data_factory/117-data_factory_diagnostics/configuration.tfvars
@@ -35,21 +35,21 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["ActivityRuns", true, false, 7],
-        ["PipelineRuns", true, false, 7],
-        ["TriggerRuns", true, false, 7],
-        ["SandboxPipelineRuns", true, false, 7],
-        ["SandboxActivityRuns", true, false, 7],
-        ["SSISPackageEventMessages", true, false, 7],
-        ["SSISPackageExecutableStatistics", true, false, 7],
-        ["SSISPackageEventMessageContext", true, false, 7],
-        ["SSISPackageExecutionComponentPhases", true, false, 7],
-        ["SSISPackageExecutionDataStatistics", true, false, 7],
-        ["SSISIntegrationRuntimeLogs", true, false, 7],
+        ["ActivityRuns", true, false, 0],
+        ["PipelineRuns", true, false, 0],
+        ["TriggerRuns", true, false, 0],
+        ["SandboxPipelineRuns", true, false, 0],
+        ["SandboxActivityRuns", true, false, 0],
+        ["SSISPackageEventMessages", true, false, 0],
+        ["SSISPackageExecutableStatistics", true, false, 0],
+        ["SSISPackageEventMessageContext", true, false, 0],
+        ["SSISPackageExecutionComponentPhases", true, false, 0],
+        ["SSISPackageExecutionDataStatistics", true, false, 0],
+        ["SSISIntegrationRuntimeLogs", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
   }
diff --git a/examples/diagnostics_profiles/100-multiple-destinations/diagnostics_definition.tfvars b/examples/diagnostics_profiles/100-multiple-destinations/diagnostics_definition.tfvars
index b8f58b4355..6a085604ae 100644
--- a/examples/diagnostics_profiles/100-multiple-destinations/diagnostics_definition.tfvars
+++ b/examples/diagnostics_profiles/100-multiple-destinations/diagnostics_definition.tfvars
@@ -9,7 +9,7 @@ diagnostics_definition = {
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
   }
diff --git a/examples/diagnostics_profiles/101-log-analytics-destination-type-profile/diagnostics_definition.tfvars b/examples/diagnostics_profiles/101-log-analytics-destination-type-profile/diagnostics_definition.tfvars
index 8310612103..1c5d4f3f45 100644
--- a/examples/diagnostics_profiles/101-log-analytics-destination-type-profile/diagnostics_definition.tfvars
+++ b/examples/diagnostics_profiles/101-log-analytics-destination-type-profile/diagnostics_definition.tfvars
@@ -4,11 +4,11 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["VMProtectionAlerts", true, true, 90],
+        ["VMProtectionAlerts", true, true, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, true, 90],
+        ["AllMetrics", true, true, 0],
       ]
     }
   }
@@ -18,13 +18,13 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["DDoSProtectionNotifications", true, true, 90],
-        ["DDoSMitigationFlowLogs", true, true, 90],
-        ["DDoSMitigationReports", true, true, 90],
+        ["DDoSProtectionNotifications", true, true, 0],
+        ["DDoSMitigationFlowLogs", true, true, 0],
+        ["DDoSMitigationReports", true, true, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, true, 90],
+        ["AllMetrics", true, true, 0],
       ]
     }
   }
@@ -34,25 +34,25 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AzureFirewallApplicationRule", true, true, 90],
-        ["AzureFirewallNetworkRule", true, true, 90],
-        ["AzureFirewallDnsProxy", true, true, 90],
-        ["AZFWApplicationRule", true, true, 90],
-        ["AZFWApplicationRuleAggregation", true, true, 90],
-        ["AZFWDnsQuery", true, true, 90],
-        ["AZFWFatFlow", true, true, 90],
-        ["AZFWFlowTrace", true, true, 90],
-        ["AZFWFqdnResolveFailure", true, true, 90],
-        ["AZFWIdpsSignature", true, true, 90],
-        ["AZFWNatRule", true, true, 90],
-        ["AZFWNatRuleAggregation", true, true, 90],
-        ["AZFWNetworkRule", true, true, 90],
-        ["AZFWNetworkRuleAggregation", true, true, 90],
-        ["AZFWThreatIntel", true, true, 90],
+        ["AzureFirewallApplicationRule", true, true, 0],
+        ["AzureFirewallNetworkRule", true, true, 0],
+        ["AzureFirewallDnsProxy", true, true, 0],
+        ["AZFWApplicationRule", true, true, 0],
+        ["AZFWApplicationRuleAggregation", true, true, 0],
+        ["AZFWDnsQuery", true, true, 0],
+        ["AZFWFatFlow", true, true, 0],
+        ["AZFWFlowTrace", true, true, 0],
+        ["AZFWFqdnResolveFailure", true, true, 0],
+        ["AZFWIdpsSignature", true, true, 0],
+        ["AZFWNatRule", true, true, 0],
+        ["AZFWNatRuleAggregation", true, true, 0],
+        ["AZFWNetworkRule", true, true, 0],
+        ["AZFWNetworkRuleAggregation", true, true, 0],
+        ["AZFWThreatIntel", true, true, 0],
       ]
       metric = [
         # ["Category name",  "Metric Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, true, 90],
+        ["AllMetrics", true, true, 0],
       ]
     }
   }
diff --git a/examples/diagnostics_profiles/200-diagnostics-eventhub-namespaces/diagnostics_definition.tfvars b/examples/diagnostics_profiles/200-diagnostics-eventhub-namespaces/diagnostics_definition.tfvars
index 10a20c4ddf..7b842d1ad4 100644
--- a/examples/diagnostics_profiles/200-diagnostics-eventhub-namespaces/diagnostics_definition.tfvars
+++ b/examples/diagnostics_profiles/200-diagnostics-eventhub-namespaces/diagnostics_definition.tfvars
@@ -9,11 +9,11 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["Audit", true, false, 7],
+        ["Audit", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
 
@@ -24,11 +24,11 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AuditEvent", true, false, 7],
+        ["AuditEvent", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
 
@@ -39,7 +39,7 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["BastionAuditLogs", true, false, 7],
+        ["BastionAuditLogs", true, false, 0],
       ]
     }
 
@@ -50,11 +50,11 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["VMProtectionAlerts", true, false, 7],
+        ["VMProtectionAlerts", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
 
@@ -65,13 +65,13 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["DDoSProtectionNotifications", true, false, 7],
-        ["DDoSMitigationFlowLogs", true, false, 7],
-        ["DDoSMitigationReports", true, false, 7],
+        ["DDoSProtectionNotifications", true, false, 0],
+        ["DDoSMitigationFlowLogs", true, false, 0],
+        ["DDoSMitigationReports", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
 
@@ -82,8 +82,8 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["NetworkSecurityGroupEvent", true, false, 7],
-        ["NetworkSecurityGroupRuleCounter", true, false, 7],
+        ["NetworkSecurityGroupEvent", true, false, 0],
+        ["NetworkSecurityGroupRuleCounter", true, false, 0],
       ]
     }
 
@@ -94,11 +94,11 @@ diagnostics_definition = {
     categories = {
       # log = [
       #   # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-      #   ["AuditEvent", true, false, 7],
+      #   ["AuditEvent", true, false, 0],
       # ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
 
@@ -109,12 +109,12 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["ContainerRegistryRepositoryEvents", true, false, 7],
-        ["ContainerRegistryLoginEvents", true, false, 7],
+        ["ContainerRegistryRepositoryEvents", true, false, 0],
+        ["ContainerRegistryLoginEvents", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
   }
@@ -124,17 +124,17 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["kube-apiserver", true, false, 7],
-        ["kube-audit", true, false, 7],
-        ["kube-audit-admin", true, false, 7],
-        ["kube-controller-manager", true, false, 7],
-        ["kube-scheduler", true, false, 7],
-        ["cluster-autoscaler", true, false, 7],
-        ["guard", true, false, 7],
+        ["kube-apiserver", true, false, 0],
+        ["kube-audit", true, false, 0],
+        ["kube-audit-admin", true, false, 0],
+        ["kube-controller-manager", true, false, 0],
+        ["kube-scheduler", true, false, 0],
+        ["cluster-autoscaler", true, false, 0],
+        ["guard", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
   }
@@ -145,20 +145,20 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AzureBackupReport", true, true, 7],
-        ["CoreAzureBackup", true, true, 7],
-        ["AddonAzureBackupAlerts", true, true, 7],
-        ["AddonAzureBackupJobs", true, true, 7],
-        ["AddonAzureBackupPolicy", true, true, 7],
-        ["AddonAzureBackupProtectedInstance", true, true, 7],
-        ["AddonAzureBackupStorage", true, true, 7],
-        ["AzureSiteRecoveryJobs", true, true, 7],
-        ["AzureSiteRecoveryEvents", true, true, 7],
-        ["AzureSiteRecoveryReplicatedItems", true, true, 7],
-        ["AzureSiteRecoveryReplicationStats", true, true, 7],
-        ["AzureSiteRecoveryRecoveryPoints", true, true, 7],
-        ["AzureSiteRecoveryReplicationDataUploadRate", true, true, 7],
-        ["AzureSiteRecoveryProtectedDiskDataChurn", true, true, 30],
+        ["AzureBackupReport", true, true, 0],
+        ["CoreAzureBackup", true, true, 0],
+        ["AddonAzureBackupAlerts", true, true, 0],
+        ["AddonAzureBackupJobs", true, true, 0],
+        ["AddonAzureBackupPolicy", true, true, 0],
+        ["AddonAzureBackupProtectedInstance", true, true, 0],
+        ["AddonAzureBackupStorage", true, true, 0],
+        ["AzureSiteRecoveryJobs", true, true, 0],
+        ["AzureSiteRecoveryEvents", true, true, 0],
+        ["AzureSiteRecoveryReplicatedItems", true, true, 0],
+        ["AzureSiteRecoveryReplicationStats", true, true, 0],
+        ["AzureSiteRecoveryRecoveryPoints", true, true, 0],
+        ["AzureSiteRecoveryReplicationDataUploadRate", true, true, 0],
+        ["AzureSiteRecoveryProtectedDiskDataChurn", true, true, 0],
       ]
       metric = [
         #["AllMetrics", 60, True],
@@ -172,13 +172,13 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["JobLogs", true, true, 30],
-        ["JobStreams", true, true, 30],
-        ["DscNodeStatus", true, true, 30],
+        ["JobLogs", true, true, 0],
+        ["JobStreams", true, true, 0],
+        ["DscNodeStatus", true, true, 0],
       ]
       metric = [
         # ["Category name",  "Metric Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, true, 30],
+        ["AllMetrics", true, true, 0],
       ]
     }
 
@@ -189,17 +189,17 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["ArchiveLogs", true, false, 7],
-        ["OperationalLogs", true, false, 7],
-        ["AutoScaleLogs", true, false, 7],
-        ["KafkaCoordinatorLogs", true, false, 7],
-        ["KafkaUserErrorLogs", true, false, 7],
-        ["EventHubVNetConnectionEvent", true, false, 7],
-        ["CustomerManagedKeyUserLogs", true, false, 7],
+        ["ArchiveLogs", true, false, 0],
+        ["OperationalLogs", true, false, 0],
+        ["AutoScaleLogs", true, false, 0],
+        ["KafkaCoordinatorLogs", true, false, 0],
+        ["KafkaUserErrorLogs", true, false, 0],
+        ["EventHubVNetConnectionEvent", true, false, 0],
+        ["CustomerManagedKeyUserLogs", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
 
@@ -214,7 +214,7 @@ diagnostics_definition = {
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", false, false, 7],
+        ["AllMetrics", false, false, 0],
       ]
     }
 
diff --git a/examples/diagnostics_profiles/201-multi-eventhub-diagnostics/diagnostics_definition.tfvars b/examples/diagnostics_profiles/201-multi-eventhub-diagnostics/diagnostics_definition.tfvars
index 7db5256540..7658e8500f 100644
--- a/examples/diagnostics_profiles/201-multi-eventhub-diagnostics/diagnostics_definition.tfvars
+++ b/examples/diagnostics_profiles/201-multi-eventhub-diagnostics/diagnostics_definition.tfvars
@@ -9,17 +9,17 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["ArchiveLogs", true, false, 7],
-        ["OperationalLogs", true, false, 7],
-        ["AutoScaleLogs", true, false, 7],
-        ["KafkaCoordinatorLogs", true, false, 7],
-        ["KafkaUserErrorLogs", true, false, 7],
-        ["EventHubVNetConnectionEvent", true, false, 7],
-        ["CustomerManagedKeyUserLogs", true, false, 7],
+        ["ArchiveLogs", true, false, 0],
+        ["OperationalLogs", true, false, 0],
+        ["AutoScaleLogs", true, false, 0],
+        ["KafkaCoordinatorLogs", true, false, 0],
+        ["KafkaUserErrorLogs", true, false, 0],
+        ["EventHubVNetConnectionEvent", true, false, 0],
+        ["CustomerManagedKeyUserLogs", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
 
diff --git a/examples/diagnostics_profiles/202-reuse-existing-log-analytics/diagnostics_definition.tfvars b/examples/diagnostics_profiles/202-reuse-existing-log-analytics/diagnostics_definition.tfvars
index 10a20c4ddf..7b842d1ad4 100644
--- a/examples/diagnostics_profiles/202-reuse-existing-log-analytics/diagnostics_definition.tfvars
+++ b/examples/diagnostics_profiles/202-reuse-existing-log-analytics/diagnostics_definition.tfvars
@@ -9,11 +9,11 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["Audit", true, false, 7],
+        ["Audit", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
 
@@ -24,11 +24,11 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AuditEvent", true, false, 7],
+        ["AuditEvent", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
 
@@ -39,7 +39,7 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["BastionAuditLogs", true, false, 7],
+        ["BastionAuditLogs", true, false, 0],
       ]
     }
 
@@ -50,11 +50,11 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["VMProtectionAlerts", true, false, 7],
+        ["VMProtectionAlerts", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
 
@@ -65,13 +65,13 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["DDoSProtectionNotifications", true, false, 7],
-        ["DDoSMitigationFlowLogs", true, false, 7],
-        ["DDoSMitigationReports", true, false, 7],
+        ["DDoSProtectionNotifications", true, false, 0],
+        ["DDoSMitigationFlowLogs", true, false, 0],
+        ["DDoSMitigationReports", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
 
@@ -82,8 +82,8 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["NetworkSecurityGroupEvent", true, false, 7],
-        ["NetworkSecurityGroupRuleCounter", true, false, 7],
+        ["NetworkSecurityGroupEvent", true, false, 0],
+        ["NetworkSecurityGroupRuleCounter", true, false, 0],
       ]
     }
 
@@ -94,11 +94,11 @@ diagnostics_definition = {
     categories = {
       # log = [
       #   # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-      #   ["AuditEvent", true, false, 7],
+      #   ["AuditEvent", true, false, 0],
       # ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
 
@@ -109,12 +109,12 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["ContainerRegistryRepositoryEvents", true, false, 7],
-        ["ContainerRegistryLoginEvents", true, false, 7],
+        ["ContainerRegistryRepositoryEvents", true, false, 0],
+        ["ContainerRegistryLoginEvents", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
   }
@@ -124,17 +124,17 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["kube-apiserver", true, false, 7],
-        ["kube-audit", true, false, 7],
-        ["kube-audit-admin", true, false, 7],
-        ["kube-controller-manager", true, false, 7],
-        ["kube-scheduler", true, false, 7],
-        ["cluster-autoscaler", true, false, 7],
-        ["guard", true, false, 7],
+        ["kube-apiserver", true, false, 0],
+        ["kube-audit", true, false, 0],
+        ["kube-audit-admin", true, false, 0],
+        ["kube-controller-manager", true, false, 0],
+        ["kube-scheduler", true, false, 0],
+        ["cluster-autoscaler", true, false, 0],
+        ["guard", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
   }
@@ -145,20 +145,20 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AzureBackupReport", true, true, 7],
-        ["CoreAzureBackup", true, true, 7],
-        ["AddonAzureBackupAlerts", true, true, 7],
-        ["AddonAzureBackupJobs", true, true, 7],
-        ["AddonAzureBackupPolicy", true, true, 7],
-        ["AddonAzureBackupProtectedInstance", true, true, 7],
-        ["AddonAzureBackupStorage", true, true, 7],
-        ["AzureSiteRecoveryJobs", true, true, 7],
-        ["AzureSiteRecoveryEvents", true, true, 7],
-        ["AzureSiteRecoveryReplicatedItems", true, true, 7],
-        ["AzureSiteRecoveryReplicationStats", true, true, 7],
-        ["AzureSiteRecoveryRecoveryPoints", true, true, 7],
-        ["AzureSiteRecoveryReplicationDataUploadRate", true, true, 7],
-        ["AzureSiteRecoveryProtectedDiskDataChurn", true, true, 30],
+        ["AzureBackupReport", true, true, 0],
+        ["CoreAzureBackup", true, true, 0],
+        ["AddonAzureBackupAlerts", true, true, 0],
+        ["AddonAzureBackupJobs", true, true, 0],
+        ["AddonAzureBackupPolicy", true, true, 0],
+        ["AddonAzureBackupProtectedInstance", true, true, 0],
+        ["AddonAzureBackupStorage", true, true, 0],
+        ["AzureSiteRecoveryJobs", true, true, 0],
+        ["AzureSiteRecoveryEvents", true, true, 0],
+        ["AzureSiteRecoveryReplicatedItems", true, true, 0],
+        ["AzureSiteRecoveryReplicationStats", true, true, 0],
+        ["AzureSiteRecoveryRecoveryPoints", true, true, 0],
+        ["AzureSiteRecoveryReplicationDataUploadRate", true, true, 0],
+        ["AzureSiteRecoveryProtectedDiskDataChurn", true, true, 0],
       ]
       metric = [
         #["AllMetrics", 60, True],
@@ -172,13 +172,13 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["JobLogs", true, true, 30],
-        ["JobStreams", true, true, 30],
-        ["DscNodeStatus", true, true, 30],
+        ["JobLogs", true, true, 0],
+        ["JobStreams", true, true, 0],
+        ["DscNodeStatus", true, true, 0],
       ]
       metric = [
         # ["Category name",  "Metric Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, true, 30],
+        ["AllMetrics", true, true, 0],
       ]
     }
 
@@ -189,17 +189,17 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["ArchiveLogs", true, false, 7],
-        ["OperationalLogs", true, false, 7],
-        ["AutoScaleLogs", true, false, 7],
-        ["KafkaCoordinatorLogs", true, false, 7],
-        ["KafkaUserErrorLogs", true, false, 7],
-        ["EventHubVNetConnectionEvent", true, false, 7],
-        ["CustomerManagedKeyUserLogs", true, false, 7],
+        ["ArchiveLogs", true, false, 0],
+        ["OperationalLogs", true, false, 0],
+        ["AutoScaleLogs", true, false, 0],
+        ["KafkaCoordinatorLogs", true, false, 0],
+        ["KafkaUserErrorLogs", true, false, 0],
+        ["EventHubVNetConnectionEvent", true, false, 0],
+        ["CustomerManagedKeyUserLogs", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
 
@@ -214,7 +214,7 @@ diagnostics_definition = {
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", false, false, 7],
+        ["AllMetrics", false, false, 0],
       ]
     }
 
diff --git a/examples/mssql_server/108-sqlserver-db-diagnostics/configurations.tfvars b/examples/mssql_server/108-sqlserver-db-diagnostics/configurations.tfvars
index 241801308a..2704dce2b1 100644
--- a/examples/mssql_server/108-sqlserver-db-diagnostics/configurations.tfvars
+++ b/examples/mssql_server/108-sqlserver-db-diagnostics/configurations.tfvars
@@ -74,24 +74,24 @@ diagnostics_definition = {
     categories = {
       log = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AutomaticTuning", true, false, 7],
-        ["Blocks", true, false, 7],
-        ["DatabaseWaitStatistics", true, false, 7],
-        ["Deadlocks", true, false, 7],
-        ["DevOpsOperationsAudit", true, false, 7],
-        ["QueryStoreRuntimeStatistics", true, false, 7],
-        ["QueryStoreWaitStatistics", true, false, 7],
-        ["SQLInsights", true, false, 7],
-        ["SQLSecurityAuditEvents", true, false, 7],
-        ["Timeouts", true, false, 7],
-        ["Errors", true, false, 7],
+        ["AutomaticTuning", true, false, 0],
+        ["Blocks", true, false, 0],
+        ["DatabaseWaitStatistics", true, false, 0],
+        ["Deadlocks", true, false, 0],
+        ["DevOpsOperationsAudit", true, false, 0],
+        ["QueryStoreRuntimeStatistics", true, false, 0],
+        ["QueryStoreWaitStatistics", true, false, 0],
+        ["SQLInsights", true, false, 0],
+        ["SQLSecurityAuditEvents", true, false, 0],
+        ["Timeouts", true, false, 0],
+        ["Errors", true, false, 0],
 
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["Basic", true, false, 7],
-        ["InstanceAndAppAdvanced", true, false, 7],
-        ["WorkloadManagement", true, false, 7],
+        ["Basic", true, false, 0],
+        ["InstanceAndAppAdvanced", true, false, 0],
+        ["WorkloadManagement", true, false, 0],
       ]
     }
   }
diff --git a/examples/networking/bastion/100-bastion-with-vm/diagnostics_definitions.tfvars b/examples/networking/bastion/100-bastion-with-vm/diagnostics_definitions.tfvars
index abf9c32133..17b705d6e0 100644
--- a/examples/networking/bastion/100-bastion-with-vm/diagnostics_definitions.tfvars
+++ b/examples/networking/bastion/100-bastion-with-vm/diagnostics_definitions.tfvars
@@ -20,11 +20,11 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["VMProtectionAlerts", true, false, 7],
+        ["VMProtectionAlerts", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
 
@@ -34,10 +34,10 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["BastionAuditLogs", true, false, 7],
+        ["BastionAuditLogs", true, false, 0],
       ]
       metric = [
-        ["AllMetrics", true, true, 7],
+        ["AllMetrics", true, true, 0],
       ]
     }
 
@@ -48,12 +48,12 @@ diagnostics_definition = {
     categories = {
       log = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["DDoSProtectionNotifications", true, true, 7],
-        ["DDoSMitigationFlowLogs", true, true, 7],
-        ["DDoSMitigationReports", true, true, 7],
+        ["DDoSProtectionNotifications", true, true, 0],
+        ["DDoSMitigationFlowLogs", true, true, 0],
+        ["DDoSMitigationReports", true, true, 0],
       ]
       metric = [
-        ["AllMetrics", true, true, 7],
+        ["AllMetrics", true, true, 0],
       ]
     }
   }
diff --git a/examples/networking/firewall/101-simple-firewall/configuration.tfvars b/examples/networking/firewall/101-simple-firewall/configuration.tfvars
index 63d0c7eb7d..1a4ed5f006 100644
--- a/examples/networking/firewall/101-simple-firewall/configuration.tfvars
+++ b/examples/networking/firewall/101-simple-firewall/configuration.tfvars
@@ -77,25 +77,25 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AzureFirewallApplicationRule", true, false, 7],
-        ["AzureFirewallNetworkRule", true, false, 7],
-        ["AzureFirewallDnsProxy", true, false, 7],
-        ["AZFWApplicationRule", true, false, 7],
-        ["AZFWApplicationRuleAggregation", true, false, 7],
-        ["AZFWDnsQuery", true, false, 7],
-        ["AZFWFatFlow", true, true, 7],
-        ["AZFWFlowTrace", true, true, 7],
-        ["AZFWFqdnResolveFailure", true, false, 7],
-        ["AZFWIdpsSignature", true, false, 7],
-        ["AZFWNatRule", true, false, 7],
-        ["AZFWNatRuleAggregation", true, false, 7],
-        ["AZFWNetworkRule", true, false, 7],
-        ["AZFWNetworkRuleAggregation", true, false, 7],
-        ["AZFWThreatIntel", true, false, 7],
+        ["AzureFirewallApplicationRule", true, false, 0],
+        ["AzureFirewallNetworkRule", true, false, 0],
+        ["AzureFirewallDnsProxy", true, false, 0],
+        ["AZFWApplicationRule", true, false, 0],
+        ["AZFWApplicationRuleAggregation", true, false, 0],
+        ["AZFWDnsQuery", true, false, 0],
+        ["AZFWFatFlow", true, true, 0],
+        ["AZFWFlowTrace", true, true, 0],
+        ["AZFWFqdnResolveFailure", true, false, 0],
+        ["AZFWIdpsSignature", true, false, 0],
+        ["AZFWNatRule", true, false, 0],
+        ["AZFWNatRuleAggregation", true, false, 0],
+        ["AZFWNetworkRule", true, false, 0],
+        ["AZFWNetworkRuleAggregation", true, false, 0],
+        ["AZFWThreatIntel", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
 
diff --git a/examples/networking/firewall/104-firewall-force-tunnelling/configuration.tfvars b/examples/networking/firewall/104-firewall-force-tunnelling/configuration.tfvars
index be7edb790b..9e9a39aa74 100644
--- a/examples/networking/firewall/104-firewall-force-tunnelling/configuration.tfvars
+++ b/examples/networking/firewall/104-firewall-force-tunnelling/configuration.tfvars
@@ -102,25 +102,25 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AzureFirewallApplicationRule", true, false, 7],
-        ["AzureFirewallNetworkRule", true, false, 7],
-        ["AzureFirewallDnsProxy", true, false, 7],
-        ["AZFWApplicationRule", true, false, 7],
-        ["AZFWApplicationRuleAggregation", true, false, 7],
-        ["AZFWDnsQuery", true, false, 7],
-        ["AZFWFatFlow", true, true, 7],
-        ["AZFWFlowTrace", true, true, 7],
-        ["AZFWFqdnResolveFailure", true, false, 7],
-        ["AZFWIdpsSignature", true, false, 7],
-        ["AZFWNatRule", true, false, 7],
-        ["AZFWNatRuleAggregation", true, false, 7],
-        ["AZFWNetworkRule", true, false, 7],
-        ["AZFWNetworkRuleAggregation", true, false, 7],
-        ["AZFWThreatIntel", true, false, 7],
+        ["AzureFirewallApplicationRule", true, false, 0],
+        ["AzureFirewallNetworkRule", true, false, 0],
+        ["AzureFirewallDnsProxy", true, false, 0],
+        ["AZFWApplicationRule", true, false, 0],
+        ["AZFWApplicationRuleAggregation", true, false, 0],
+        ["AZFWDnsQuery", true, false, 0],
+        ["AZFWFatFlow", true, true, 0],
+        ["AZFWFlowTrace", true, true, 0],
+        ["AZFWFqdnResolveFailure", true, false, 0],
+        ["AZFWIdpsSignature", true, false, 0],
+        ["AZFWNatRule", true, false, 0],
+        ["AZFWNatRuleAggregation", true, false, 0],
+        ["AZFWNetworkRule", true, false, 0],
+        ["AZFWNetworkRuleAggregation", true, false, 0],
+        ["AZFWThreatIntel", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
 
diff --git a/examples/networking/front_door/100-simple-front_door/diagnostics_definition.tfvars b/examples/networking/front_door/100-simple-front_door/diagnostics_definition.tfvars
index 7676dd6fd4..1cdc672f25 100644
--- a/examples/networking/front_door/100-simple-front_door/diagnostics_definition.tfvars
+++ b/examples/networking/front_door/100-simple-front_door/diagnostics_definition.tfvars
@@ -10,12 +10,12 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["FrontdoorAccessLog", true, false, 7],
-        ["FrontdoorWebApplicationFirewallLog", true, false, 7],
+        ["FrontdoorAccessLog", true, false, 0],
+        ["FrontdoorWebApplicationFirewallLog", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
   }
diff --git a/examples/networking/front_door/102-front_door_advanced/diagnostics_definition.tfvars b/examples/networking/front_door/102-front_door_advanced/diagnostics_definition.tfvars
index 7676dd6fd4..1cdc672f25 100644
--- a/examples/networking/front_door/102-front_door_advanced/diagnostics_definition.tfvars
+++ b/examples/networking/front_door/102-front_door_advanced/diagnostics_definition.tfvars
@@ -10,12 +10,12 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["FrontdoorAccessLog", true, false, 7],
-        ["FrontdoorWebApplicationFirewallLog", true, false, 7],
+        ["FrontdoorAccessLog", true, false, 0],
+        ["FrontdoorWebApplicationFirewallLog", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
   }
diff --git a/examples/networking/virtual_network/200-nsg-flow-logs/diagnostics_definitions.tfvars b/examples/networking/virtual_network/200-nsg-flow-logs/diagnostics_definitions.tfvars
index abf9c32133..17b705d6e0 100644
--- a/examples/networking/virtual_network/200-nsg-flow-logs/diagnostics_definitions.tfvars
+++ b/examples/networking/virtual_network/200-nsg-flow-logs/diagnostics_definitions.tfvars
@@ -20,11 +20,11 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["VMProtectionAlerts", true, false, 7],
+        ["VMProtectionAlerts", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
 
@@ -34,10 +34,10 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["BastionAuditLogs", true, false, 7],
+        ["BastionAuditLogs", true, false, 0],
       ]
       metric = [
-        ["AllMetrics", true, true, 7],
+        ["AllMetrics", true, true, 0],
       ]
     }
 
@@ -48,12 +48,12 @@ diagnostics_definition = {
     categories = {
       log = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["DDoSProtectionNotifications", true, true, 7],
-        ["DDoSMitigationFlowLogs", true, true, 7],
-        ["DDoSMitigationReports", true, true, 7],
+        ["DDoSProtectionNotifications", true, true, 0],
+        ["DDoSMitigationFlowLogs", true, true, 0],
+        ["DDoSMitigationReports", true, true, 0],
       ]
       metric = [
-        ["AllMetrics", true, true, 7],
+        ["AllMetrics", true, true, 0],
       ]
     }
   }
diff --git a/examples/networking/virtual_network/201-nsg-flow-logs-v1/diagnostics_definitions.tfvars b/examples/networking/virtual_network/201-nsg-flow-logs-v1/diagnostics_definitions.tfvars
index abf9c32133..17b705d6e0 100644
--- a/examples/networking/virtual_network/201-nsg-flow-logs-v1/diagnostics_definitions.tfvars
+++ b/examples/networking/virtual_network/201-nsg-flow-logs-v1/diagnostics_definitions.tfvars
@@ -20,11 +20,11 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["VMProtectionAlerts", true, false, 7],
+        ["VMProtectionAlerts", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
 
@@ -34,10 +34,10 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["BastionAuditLogs", true, false, 7],
+        ["BastionAuditLogs", true, false, 0],
       ]
       metric = [
-        ["AllMetrics", true, true, 7],
+        ["AllMetrics", true, true, 0],
       ]
     }
 
@@ -48,12 +48,12 @@ diagnostics_definition = {
     categories = {
       log = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["DDoSProtectionNotifications", true, true, 7],
-        ["DDoSMitigationFlowLogs", true, true, 7],
-        ["DDoSMitigationReports", true, true, 7],
+        ["DDoSProtectionNotifications", true, true, 0],
+        ["DDoSMitigationFlowLogs", true, true, 0],
+        ["DDoSMitigationReports", true, true, 0],
       ]
       metric = [
-        ["AllMetrics", true, true, 7],
+        ["AllMetrics", true, true, 0],
       ]
     }
   }
diff --git a/examples/networking/virtual_network/202-network_watchers/diagnostics_definitions.tfvars b/examples/networking/virtual_network/202-network_watchers/diagnostics_definitions.tfvars
index abf9c32133..17b705d6e0 100644
--- a/examples/networking/virtual_network/202-network_watchers/diagnostics_definitions.tfvars
+++ b/examples/networking/virtual_network/202-network_watchers/diagnostics_definitions.tfvars
@@ -20,11 +20,11 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["VMProtectionAlerts", true, false, 7],
+        ["VMProtectionAlerts", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
 
@@ -34,10 +34,10 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["BastionAuditLogs", true, false, 7],
+        ["BastionAuditLogs", true, false, 0],
       ]
       metric = [
-        ["AllMetrics", true, true, 7],
+        ["AllMetrics", true, true, 0],
       ]
     }
 
@@ -48,12 +48,12 @@ diagnostics_definition = {
     categories = {
       log = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["DDoSProtectionNotifications", true, true, 7],
-        ["DDoSMitigationFlowLogs", true, true, 7],
-        ["DDoSMitigationReports", true, true, 7],
+        ["DDoSProtectionNotifications", true, true, 0],
+        ["DDoSMitigationFlowLogs", true, true, 0],
+        ["DDoSMitigationReports", true, true, 0],
       ]
       metric = [
-        ["AllMetrics", true, true, 7],
+        ["AllMetrics", true, true, 0],
       ]
     }
   }
diff --git a/examples/purview/100-purview_account/configuration.tfvars b/examples/purview/100-purview_account/configuration.tfvars
index acd2a9e642..1a0eb1469e 100644
--- a/examples/purview/100-purview_account/configuration.tfvars
+++ b/examples/purview/100-purview_account/configuration.tfvars
@@ -1,7 +1,6 @@
 global_settings = {
   regions = {
-    region1 = "australiaeast"
-    region2 = "australiacentral"
+    region1 = "eastus2"
   }
 }
 resource_groups = {
diff --git a/examples/purview/101-purview_account_private_link/configuration.tfvars b/examples/purview/101-purview_account_private_link/configuration.tfvars
index d1f1ca151d..3df22efc53 100644
--- a/examples/purview/101-purview_account_private_link/configuration.tfvars
+++ b/examples/purview/101-purview_account_private_link/configuration.tfvars
@@ -1,7 +1,6 @@
 global_settings = {
   regions = {
-    region1 = "australiaeast"
-    region2 = "australiacentral"
+    region1 = "eastus2"
   }
 }
 resource_groups = {
diff --git a/examples/redis_cache/101-redis-diagnostics/configurations.tfvars b/examples/redis_cache/101-redis-diagnostics/configurations.tfvars
index 8738abf805..4e9846b7af 100644
--- a/examples/redis_cache/101-redis-diagnostics/configurations.tfvars
+++ b/examples/redis_cache/101-redis-diagnostics/configurations.tfvars
@@ -60,7 +60,7 @@ diagnostics_definition = {
     categories = {
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
   }
diff --git a/examples/storage_accounts/100-simple-storage-account-diagnostics/diagnostics.tfvars b/examples/storage_accounts/100-simple-storage-account-diagnostics/diagnostics.tfvars
index 4ec22cc43a..05b533dc6b 100644
--- a/examples/storage_accounts/100-simple-storage-account-diagnostics/diagnostics.tfvars
+++ b/examples/storage_accounts/100-simple-storage-account-diagnostics/diagnostics.tfvars
@@ -32,8 +32,8 @@ diagnostics_definition = {
     categories = {
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["Transaction", true, false, 7],
-        ["Capacity", true, false, 7],
+        ["Transaction", true, false, 0],
+        ["Capacity", true, false, 0],
       ]
     }
   }
@@ -48,8 +48,8 @@ diagnostics_definition = {
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["Transaction", true, false, 7],
-        ["Capacity", true, false, 7],
+        ["Transaction", true, false, 0],
+        ["Capacity", true, false, 0],
       ]
     }
   }
diff --git a/examples/webapps/appservice-environment/101-simple_ase/configuration.tfvars b/examples/webapps/appservice-environment/101-simple_ase/configuration.tfvars
index 89ca776a6d..2fe45d2730 100644
--- a/examples/webapps/appservice-environment/101-simple_ase/configuration.tfvars
+++ b/examples/webapps/appservice-environment/101-simple_ase/configuration.tfvars
@@ -345,7 +345,7 @@ network_security_group_definition = {
 #       ]
 #       # metric = [
 #       #   #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-#       #   ["AllMetrics", false, false, 7],
+#       #   ["AllMetrics", false, false, 0],
 #       # ]
 #     }
 #   }
diff --git a/examples/webapps/appservice/106-appservice-diagnostics/configuration.tfvars b/examples/webapps/appservice/106-appservice-diagnostics/configuration.tfvars
index ef92ccd5b0..0540fd4f38 100644
--- a/examples/webapps/appservice/106-appservice-diagnostics/configuration.tfvars
+++ b/examples/webapps/appservice/106-appservice-diagnostics/configuration.tfvars
@@ -98,16 +98,16 @@ diagnostics_definition = {
     categories = {
       log = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AppServiceHTTPLogs", true, false, 7],
-        ["AppServiceConsoleLogs", true, false, 7],
-        ["AppServiceAppLogs", true, false, 7],
-        ["AppServiceAuditLogs", true, false, 7],
-        ["AppServiceIPSecAuditLogs", true, false, 7],
-        ["AppServicePlatformLogs", true, false, 7],
+        ["AppServiceHTTPLogs", true, false, 0],
+        ["AppServiceConsoleLogs", true, false, 0],
+        ["AppServiceAppLogs", true, false, 0],
+        ["AppServiceAuditLogs", true, false, 0],
+        ["AppServiceIPSecAuditLogs", true, false, 0],
+        ["AppServicePlatformLogs", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
   }
diff --git a/examples/webapps/function_app/101-function_app-private/configuration.tfvars b/examples/webapps/function_app/101-function_app-private/configuration.tfvars
index beb7493985..fcc60c9fd7 100644
--- a/examples/webapps/function_app/101-function_app-private/configuration.tfvars
+++ b/examples/webapps/function_app/101-function_app-private/configuration.tfvars
@@ -26,6 +26,7 @@ app_service_plans = {
     resource_group_key = "funapp"
     name               = "asp-simple"
     kind               = "linux"
+    reserved           = true
 
     sku = {
       tier = "Standard"
diff --git a/main.tf b/main.tf
index d915035000..e411427323 100644
--- a/main.tf
+++ b/main.tf
@@ -3,14 +3,14 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.68.0"
+      version = "~> 3.75.0"
       configuration_aliases = [
         azurerm.vhub
       ]
     }
     azuread = {
       source  = "hashicorp/azuread"
-      version = "~> 2.41.0"
+      version = "~> 2.43.0"
     }
     azapi = {
       source  = "azure/azapi"
diff --git a/modules/analytics/databricks_workspace/workspace.tf b/modules/analytics/databricks_workspace/workspace.tf
index c5f0762cb6..2c740702e8 100644
--- a/modules/analytics/databricks_workspace/workspace.tf
+++ b/modules/analytics/databricks_workspace/workspace.tf
@@ -59,4 +59,8 @@ resource "azurerm_databricks_workspace" "ws" {
       private_subnet_network_security_group_association_id = can(var.settings.custom_parameters.private_subnet_network_security_group_association_id) || can(var.settings.custom_parameters.private_subnet_key) == false ? try(var.settings.custom_parameters.private_subnet_network_security_group_association_id, null) : var.vnets[try(var.settings.custom_parameters.lz_key, var.client_config.landingzone_key)][var.settings.custom_parameters.vnet_key].subnets[var.settings.custom_parameters.private_subnet_key].id
     }
   }
+
+  timeouts {
+    delete = "60m"
+  }
 }
diff --git a/modules/compute/virtual_machine/mssql_vm.tf b/modules/compute/virtual_machine/mssql_vm.tf
index 44db9761fe..c987cdeb4c 100644
--- a/modules/compute/virtual_machine/mssql_vm.tf
+++ b/modules/compute/virtual_machine/mssql_vm.tf
@@ -116,9 +116,9 @@ resource "azurerm_mssql_virtual_machine" "mssqlvm" {
   }
 
   timeouts {
-    create = "2h"
+    create = "4h"
     update = "2h"
-    delete = "2h"
+    delete = "4h"
     read   = "5m"
   }
 }
diff --git a/modules/webapps/ase/examples/single-ase-internal/configuration.tfvars b/modules/webapps/ase/examples/single-ase-internal/configuration.tfvars
index 8841ce873a..9d431ecaae 100644
--- a/modules/webapps/ase/examples/single-ase-internal/configuration.tfvars
+++ b/modules/webapps/ase/examples/single-ase-internal/configuration.tfvars
@@ -313,11 +313,11 @@ diagnostics_definition = {
     categories = {
       log = [
         # ["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["VMProtectionAlerts", true, false, 7],
+        ["VMProtectionAlerts", true, false, 0],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
-        ["AllMetrics", true, false, 7],
+        ["AllMetrics", true, false, 0],
       ]
     }
 
diff --git a/modules/webapps/asev3/module.tf b/modules/webapps/asev3/module.tf
index 7c5abd0342..2dacb1430d 100644
--- a/modules/webapps/asev3/module.tf
+++ b/modules/webapps/asev3/module.tf
@@ -22,8 +22,8 @@ resource "azurerm_app_service_environment_v3" "asev3" {
     for_each = can(var.settings.cluster_settings) ? var.settings.cluster_settings : []
 
     content {
-      name  = cluster_setting.name
-      value = cluster_setting.value
+      name  = cluster_setting.value.name
+      value = cluster_setting.value.value
     }
   }