diff --git a/examples/mssql_server/108-sqlserver-db-diagnostics/configurations.tfvars b/examples/mssql_server/108-sqlserver-db-diagnostics/configurations.tfvars
index 5a4ef97f5e..241801308a 100644
--- a/examples/mssql_server/108-sqlserver-db-diagnostics/configurations.tfvars
+++ b/examples/mssql_server/108-sqlserver-db-diagnostics/configurations.tfvars
@@ -74,11 +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],
+
       ]
       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],
       ]
     }
   }
diff --git a/examples/mysql_flexible_server/100-simple-mysql-flexible/configuration.tfvars b/examples/mysql_flexible_server/100-simple-mysql-flexible/configuration.tfvars
index dd9413da90..fd33eed5d1 100644
--- a/examples/mysql_flexible_server/100-simple-mysql-flexible/configuration.tfvars
+++ b/examples/mysql_flexible_server/100-simple-mysql-flexible/configuration.tfvars
@@ -20,7 +20,7 @@ mysql_flexible_server = {
     name     = "vks-flexible-testservers"
     version  = "8.0.21" #Possible values are 5.7, and 8.0.21
     sku_name = "GP_Standard_D2ds_v4"
-
+    zone     = 1
     resource_group = {
       key = "mysql_region1"
       # lz_key = ""                           # Set the lz_key if the resource group is remote.
diff --git a/examples/mysql_flexible_server/101-delegated-subnet-with-fw-rule/configuration.tfvars b/examples/mysql_flexible_server/101-delegated-subnet-with-fw-rule/configuration.tfvars
index b8be8aceca..c88445af49 100644
--- a/examples/mysql_flexible_server/101-delegated-subnet-with-fw-rule/configuration.tfvars
+++ b/examples/mysql_flexible_server/101-delegated-subnet-with-fw-rule/configuration.tfvars
@@ -22,6 +22,7 @@ mysql_flexible_server = {
     name     = "mysqltest-flexible-server"
     version  = "5.7" #Possible values are 5.7, and 8.0.21
     sku_name = "GP_Standard_D2ds_v4"
+    zone     = 1
 
     keyvault = {
       key = "mysql-re1" # (Required) when auto-generated administrator credentials needed.
diff --git a/examples/networking/firewall/101-simple-firewall/configuration.tfvars b/examples/networking/firewall/101-simple-firewall/configuration.tfvars
index 14f30c5656..ddd4a760e6 100644
--- a/examples/networking/firewall/101-simple-firewall/configuration.tfvars
+++ b/examples/networking/firewall/101-simple-firewall/configuration.tfvars
@@ -80,6 +80,16 @@ diagnostics_definition = {
         ["AzureFirewallApplicationRule", true, false, 7],
         ["AzureFirewallNetworkRule", true, false, 7],
         ["AzureFirewallDnsProxy", true, false, 7],
+        ["AZFWApplicationRule", true, false, 7],
+        ["AZFWApplicationRuleAggregation", true, false, 7],
+        ["AZFWDnsQuery", true, false, 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],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
diff --git a/examples/networking/firewall/104-firewall-force-tunnelling/configuration.tfvars b/examples/networking/firewall/104-firewall-force-tunnelling/configuration.tfvars
index 7d50ba389a..fbdd01b6ae 100644
--- a/examples/networking/firewall/104-firewall-force-tunnelling/configuration.tfvars
+++ b/examples/networking/firewall/104-firewall-force-tunnelling/configuration.tfvars
@@ -105,6 +105,16 @@ diagnostics_definition = {
         ["AzureFirewallApplicationRule", true, false, 7],
         ["AzureFirewallNetworkRule", true, false, 7],
         ["AzureFirewallDnsProxy", true, false, 7],
+        ["AZFWApplicationRule", true, false, 7],
+        ["AZFWApplicationRuleAggregation", true, false, 7],
+        ["AZFWDnsQuery", true, false, 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],
       ]
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
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 874457802a..008fb03b67 100644
--- a/examples/storage_accounts/100-simple-storage-account-diagnostics/diagnostics.tfvars
+++ b/examples/storage_accounts/100-simple-storage-account-diagnostics/diagnostics.tfvars
@@ -39,6 +39,7 @@ diagnostics_definition = {
       metric = [
         #["Category name",  "Diagnostics Enabled(true/false)", "Retention Enabled(true/false)", Retention_period]
         ["Transaction", true, false, 7],
+        ["Capacity", true, false, 7],
       ]
     }
   }
diff --git a/modules/databases/mssql_database/database.tf b/modules/databases/mssql_database/database.tf
index 9eaf982be7..aec0ad3616 100644
--- a/modules/databases/mssql_database/database.tf
+++ b/modules/databases/mssql_database/database.tf
@@ -15,7 +15,7 @@ resource "azurerm_mssql_database" "mssqldb" {
   create_mode                 = try(var.settings.create_mode, null)
   creation_source_database_id = try(var.settings.creation_source_database_id, null)
   elastic_pool_id             = try(var.elastic_pool_id, null)
-  geo_backup_enabled          = try(var.settings.geo_backup_enabled, false)
+  geo_backup_enabled          = try(var.settings.geo_backup_enabled, null)
   license_type                = try(var.settings.license_type, null)
   max_size_gb                 = try(var.settings.max_size_gb, null)
   min_capacity                = try(var.settings.min_capacity, null)
diff --git a/modules/webapps/static_site/module.tf b/modules/webapps/static_site/module.tf
index a1df59570b..d7614fa759 100644
--- a/modules/webapps/static_site/module.tf
+++ b/modules/webapps/static_site/module.tf
@@ -1,6 +1,6 @@
 resource "azurecaf_name" "static_site" {
   name          = var.name
-  resource_type = "azurerm_app_service" # FIXME: missing naming convention provider for 'azurerm_static_site' (https://github.com/aztfmod/terraform-provider-azurecaf/issues/178)
+  resource_type = "azurerm_static_site"
   prefixes      = var.global_settings.prefixes
   random_length = var.global_settings.random_length
   clean_input   = true