diff --git a/examples/app_gateway/100-simple-app-gateway/standalone/main.tf b/examples/app_gateway/100-simple-app-gateway/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/app_gateway/100-simple-app-gateway/standalone/main.tf
+++ b/examples/app_gateway/100-simple-app-gateway/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/app_gateway/101-private-public/standalone/main.tf b/examples/app_gateway/101-private-public/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/app_gateway/101-private-public/standalone/main.tf
+++ b/examples/app_gateway/101-private-public/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/app_gateway/210-agw-with-keyvault/standalone/main.tf b/examples/app_gateway/210-agw-with-keyvault/standalone/main.tf
index 6e445f733b..76a48273bd 100644
--- a/examples/app_gateway/210-agw-with-keyvault/standalone/main.tf
+++ b/examples/app_gateway/210-agw-with-keyvault/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/app_insights/100-all-attributes/standalone/main.tf b/examples/app_insights/100-all-attributes/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/app_insights/100-all-attributes/standalone/main.tf
+++ b/examples/app_insights/100-all-attributes/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/app_insights/100-simple/standalone/main.tf b/examples/app_insights/100-simple/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/app_insights/100-simple/standalone/main.tf
+++ b/examples/app_insights/100-simple/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/automation/100-simple-automation-account/standalone/main.tf b/examples/automation/100-simple-automation-account/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/automation/100-simple-automation-account/standalone/main.tf
+++ b/examples/automation/100-simple-automation-account/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/azure_ad/100-sevice-principle-with-builtin-roles/standalone/main.tf b/examples/azure_ad/100-sevice-principle-with-builtin-roles/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/azure_ad/100-sevice-principle-with-builtin-roles/standalone/main.tf
+++ b/examples/azure_ad/100-sevice-principle-with-builtin-roles/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/azure_ad/101-service-principle-with-custom-roles/standalone/main.tf b/examples/azure_ad/101-service-principle-with-custom-roles/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/azure_ad/101-service-principle-with-custom-roles/standalone/main.tf
+++ b/examples/azure_ad/101-service-principle-with-custom-roles/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/azure_ad/102-password-rotation/standalone/main.tf b/examples/azure_ad/102-password-rotation/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/azure_ad/102-password-rotation/standalone/main.tf
+++ b/examples/azure_ad/102-password-rotation/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/azure_ad/201-groups-and-roles/standalone/main.tf b/examples/azure_ad/201-groups-and-roles/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/azure_ad/201-groups-and-roles/standalone/main.tf
+++ b/examples/azure_ad/201-groups-and-roles/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/compute/availability_set/100-simple-availabilityset/standalone/main.tf b/examples/compute/availability_set/100-simple-availabilityset/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/compute/availability_set/100-simple-availabilityset/standalone/main.tf
+++ b/examples/compute/availability_set/100-simple-availabilityset/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/compute/availability_set/101-availabilityset-with-proximity-placement-group/standalone/main.tf b/examples/compute/availability_set/101-availabilityset-with-proximity-placement-group/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/compute/availability_set/101-availabilityset-with-proximity-placement-group/standalone/main.tf
+++ b/examples/compute/availability_set/101-availabilityset-with-proximity-placement-group/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/compute/container_registry/100-simple-acr/standalone/main.tf b/examples/compute/container_registry/100-simple-acr/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/compute/container_registry/100-simple-acr/standalone/main.tf
+++ b/examples/compute/container_registry/100-simple-acr/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/compute/container_registry/200-acr-private-link/standalone/main.tf b/examples/compute/container_registry/200-acr-private-link/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/compute/container_registry/200-acr-private-link/standalone/main.tf
+++ b/examples/compute/container_registry/200-acr-private-link/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/compute/kubernetes_services/101-single-cluster/standalone/main.tf b/examples/compute/kubernetes_services/101-single-cluster/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/compute/kubernetes_services/101-single-cluster/standalone/main.tf
+++ b/examples/compute/kubernetes_services/101-single-cluster/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/compute/kubernetes_services/102-multi-nodepools/standalone/main.tf b/examples/compute/kubernetes_services/102-multi-nodepools/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/compute/kubernetes_services/102-multi-nodepools/standalone/main.tf
+++ b/examples/compute/kubernetes_services/102-multi-nodepools/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/compute/kubernetes_services/103-multi-clusters/standalone/main.tf b/examples/compute/kubernetes_services/103-multi-clusters/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/compute/kubernetes_services/103-multi-clusters/standalone/main.tf
+++ b/examples/compute/kubernetes_services/103-multi-clusters/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/compute/kubernetes_services/104-private-cluster/standalone/main.tf b/examples/compute/kubernetes_services/104-private-cluster/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/compute/kubernetes_services/104-private-cluster/standalone/main.tf
+++ b/examples/compute/kubernetes_services/104-private-cluster/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/compute/proximity_placement_group/standalone/main.tf b/examples/compute/proximity_placement_group/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/compute/proximity_placement_group/standalone/main.tf
+++ b/examples/compute/proximity_placement_group/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/compute/virtual_machine/105-single-windows-vm-kv-admin-secrets/standalone/main.tf b/examples/compute/virtual_machine/105-single-windows-vm-kv-admin-secrets/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/compute/virtual_machine/105-single-windows-vm-kv-admin-secrets/standalone/main.tf
+++ b/examples/compute/virtual_machine/105-single-windows-vm-kv-admin-secrets/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/compute/virtual_machine/210-vm-bastion-winrm/standalone/main.tf b/examples/compute/virtual_machine/210-vm-bastion-winrm/standalone/main.tf
index 31d03beec2..d00e369d9b 100644
--- a/examples/compute/virtual_machine/210-vm-bastion-winrm/standalone/main.tf
+++ b/examples/compute/virtual_machine/210-vm-bastion-winrm/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/compute/virtual_machine/211-vm-bastion-winrm-agents/registry/main.tf b/examples/compute/virtual_machine/211-vm-bastion-winrm-agents/registry/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/compute/virtual_machine/211-vm-bastion-winrm-agents/registry/main.tf
+++ b/examples/compute/virtual_machine/211-vm-bastion-winrm-agents/registry/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/compute/virtual_machine/211-vm-bastion-winrm-agents/standalone/main.tf b/examples/compute/virtual_machine/211-vm-bastion-winrm-agents/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/compute/virtual_machine/211-vm-bastion-winrm-agents/standalone/main.tf
+++ b/examples/compute/virtual_machine/211-vm-bastion-winrm-agents/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/cosmos_db/100-simple-cosmos-db-cassandra/standalone/main.tf b/examples/cosmos_db/100-simple-cosmos-db-cassandra/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/cosmos_db/100-simple-cosmos-db-cassandra/standalone/main.tf
+++ b/examples/cosmos_db/100-simple-cosmos-db-cassandra/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/cosmos_db/100-simple-cosmos-db-gremlin/standalone/main.tf b/examples/cosmos_db/100-simple-cosmos-db-gremlin/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/cosmos_db/100-simple-cosmos-db-gremlin/standalone/main.tf
+++ b/examples/cosmos_db/100-simple-cosmos-db-gremlin/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/cosmos_db/100-simple-cosmos-db-mongo/standalone/main.tf b/examples/cosmos_db/100-simple-cosmos-db-mongo/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/cosmos_db/100-simple-cosmos-db-mongo/standalone/main.tf
+++ b/examples/cosmos_db/100-simple-cosmos-db-mongo/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/cosmos_db/100-simple-cosmos-db-sql/standalone/main.tf b/examples/cosmos_db/100-simple-cosmos-db-sql/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/cosmos_db/100-simple-cosmos-db-sql/standalone/main.tf
+++ b/examples/cosmos_db/100-simple-cosmos-db-sql/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/cosmos_db/100-simple-cosmos-db-table/standalone/main.tf b/examples/cosmos_db/100-simple-cosmos-db-table/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/cosmos_db/100-simple-cosmos-db-table/standalone/main.tf
+++ b/examples/cosmos_db/100-simple-cosmos-db-table/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/databricks/100-simple-databricks/standalone/main.tf b/examples/databricks/100-simple-databricks/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/databricks/100-simple-databricks/standalone/main.tf
+++ b/examples/databricks/100-simple-databricks/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/datalake/101-datalake-storage/standalone/main.tf b/examples/datalake/101-datalake-storage/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/datalake/101-datalake-storage/standalone/main.tf
+++ b/examples/datalake/101-datalake-storage/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/eventhub_namespace/100-simple-evh/standalone/main.tf b/examples/eventhub_namespace/100-simple-evh/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/eventhub_namespace/100-simple-evh/standalone/main.tf
+++ b/examples/eventhub_namespace/100-simple-evh/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/eventhub_namespace/101-evh-with-private-endpoint/standalone/main.tf b/examples/eventhub_namespace/101-evh-with-private-endpoint/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/eventhub_namespace/101-evh-with-private-endpoint/standalone/main.tf
+++ b/examples/eventhub_namespace/101-evh-with-private-endpoint/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/keyvault/101-keyvault-policies/standalone/main.tf b/examples/keyvault/101-keyvault-policies/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/keyvault/101-keyvault-policies/standalone/main.tf
+++ b/examples/keyvault/101-keyvault-policies/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/keyvault/102-keyvault-cert-issuer/standalone/main.tf b/examples/keyvault/102-keyvault-cert-issuer/standalone/main.tf
index 76dd46e9b4..dcd672051e 100644
--- a/examples/keyvault/102-keyvault-cert-issuer/standalone/main.tf
+++ b/examples/keyvault/102-keyvault-cert-issuer/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/machine_learning/100-aml/standalone/main.tf b/examples/machine_learning/100-aml/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/machine_learning/100-aml/standalone/main.tf
+++ b/examples/machine_learning/100-aml/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/machine_learning/101-aml-vnet/standalone/main.tf b/examples/machine_learning/101-aml-vnet/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/machine_learning/101-aml-vnet/standalone/main.tf
+++ b/examples/machine_learning/101-aml-vnet/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/main.tf b/examples/main.tf
index ba5744d700..7953b938e3 100644
--- a/examples/main.tf
+++ b/examples/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
     time = {
       source  = "hashicorp/time"
diff --git a/examples/mariadb_server/100-simple-mariadb/standalone/main.tf b/examples/mariadb_server/100-simple-mariadb/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/mariadb_server/100-simple-mariadb/standalone/main.tf
+++ b/examples/mariadb_server/100-simple-mariadb/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/mariadb_server/101-vnet-rule-mariadb/standalone/main.tf b/examples/mariadb_server/101-vnet-rule-mariadb/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/mariadb_server/101-vnet-rule-mariadb/standalone/main.tf
+++ b/examples/mariadb_server/101-vnet-rule-mariadb/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/mariadb_server/102-private-endpoint-mariadb/standalone/main.tf b/examples/mariadb_server/102-private-endpoint-mariadb/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/mariadb_server/102-private-endpoint-mariadb/standalone/main.tf
+++ b/examples/mariadb_server/102-private-endpoint-mariadb/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/mariadb_server/103-private-endpoint-with-fw-rule-mariadb/standalone/main.tf b/examples/mariadb_server/103-private-endpoint-with-fw-rule-mariadb/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/mariadb_server/103-private-endpoint-with-fw-rule-mariadb/standalone/main.tf
+++ b/examples/mariadb_server/103-private-endpoint-with-fw-rule-mariadb/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/monitoring/100-service-health-alerts/standalone/main.tf b/examples/monitoring/100-service-health-alerts/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/monitoring/100-service-health-alerts/standalone/main.tf
+++ b/examples/monitoring/100-service-health-alerts/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/mssql_mi/200-mi/standalone/main.tf b/examples/mssql_mi/200-mi/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/mssql_mi/200-mi/standalone/main.tf
+++ b/examples/mssql_mi/200-mi/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/mssql_mi/standalone/main.tf b/examples/mssql_mi/standalone/main.tf
index a0250ed5f2..303cabc1a5 100644
--- a/examples/mssql_mi/standalone/main.tf
+++ b/examples/mssql_mi/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/mssql_server/elastic_pools/standalone/main.tf b/examples/mssql_server/elastic_pools/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/mssql_server/elastic_pools/standalone/main.tf
+++ b/examples/mssql_server/elastic_pools/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/mssql_server/failover_groups/standalone/main.tf b/examples/mssql_server/failover_groups/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/mssql_server/failover_groups/standalone/main.tf
+++ b/examples/mssql_server/failover_groups/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/mysql_server/100-simple-mysql/standalone/main.tf b/examples/mysql_server/100-simple-mysql/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/mysql_server/100-simple-mysql/standalone/main.tf
+++ b/examples/mysql_server/100-simple-mysql/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/mysql_server/101-vnet-rule-mysql/standalone/main.tf b/examples/mysql_server/101-vnet-rule-mysql/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/mysql_server/101-vnet-rule-mysql/standalone/main.tf
+++ b/examples/mysql_server/101-vnet-rule-mysql/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/mysql_server/102-private-endpoint-mysql/standalone/main.tf b/examples/mysql_server/102-private-endpoint-mysql/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/mysql_server/102-private-endpoint-mysql/standalone/main.tf
+++ b/examples/mysql_server/102-private-endpoint-mysql/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/mysql_server/103-private-endpoint-with-fw-rule-mysql/standalone/main.tf b/examples/mysql_server/103-private-endpoint-with-fw-rule-mysql/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/mysql_server/103-private-endpoint-with-fw-rule-mysql/standalone/main.tf
+++ b/examples/mysql_server/103-private-endpoint-with-fw-rule-mysql/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/netapp/101-nfs/standalone/main.tf b/examples/netapp/101-nfs/standalone/main.tf
index e5b269d642..ff4dc03a01 100644
--- a/examples/netapp/101-nfs/standalone/main.tf
+++ b/examples/netapp/101-nfs/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/networking/dns_zones/100-simple-dns_zone/standalone/main.tf b/examples/networking/dns_zones/100-simple-dns_zone/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/networking/dns_zones/100-simple-dns_zone/standalone/main.tf
+++ b/examples/networking/dns_zones/100-simple-dns_zone/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/networking/express_routes/standalone/main.tf b/examples/networking/express_routes/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/networking/express_routes/standalone/main.tf
+++ b/examples/networking/express_routes/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/networking/firewall/100-simple-firewall-with-routes/standalone/main.tf b/examples/networking/firewall/100-simple-firewall-with-routes/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/networking/firewall/100-simple-firewall-with-routes/standalone/main.tf
+++ b/examples/networking/firewall/100-simple-firewall-with-routes/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/networking/front_door/100-simple-front_door/standalone/main.tf b/examples/networking/front_door/100-simple-front_door/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/networking/front_door/100-simple-front_door/standalone/main.tf
+++ b/examples/networking/front_door/100-simple-front_door/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/networking/front_door/101-front_door_waf/standalone/main.tf b/examples/networking/front_door/101-front_door_waf/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/networking/front_door/101-front_door_waf/standalone/main.tf
+++ b/examples/networking/front_door/101-front_door_waf/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/networking/private_dns/100-private-dns-vnet-links/standalone/main.tf b/examples/networking/private_dns/100-private-dns-vnet-links/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/networking/private_dns/100-private-dns-vnet-links/standalone/main.tf
+++ b/examples/networking/private_dns/100-private-dns-vnet-links/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/networking/private_links/endpoints/centralized/standalone/main.tf b/examples/networking/private_links/endpoints/centralized/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/networking/private_links/endpoints/centralized/standalone/main.tf
+++ b/examples/networking/private_links/endpoints/centralized/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/networking/virtual_network/100-simple-vnet-subnets-nsgs/standalone/main.tf b/examples/networking/virtual_network/100-simple-vnet-subnets-nsgs/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/networking/virtual_network/100-simple-vnet-subnets-nsgs/standalone/main.tf
+++ b/examples/networking/virtual_network/100-simple-vnet-subnets-nsgs/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/networking/virtual_network/100-subnet-delegation/standalone/main.tf b/examples/networking/virtual_network/100-subnet-delegation/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/networking/virtual_network/100-subnet-delegation/standalone/main.tf
+++ b/examples/networking/virtual_network/100-subnet-delegation/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/networking/virtual_network/101-vnet-peering-nsg/standalone/main.tf b/examples/networking/virtual_network/101-vnet-peering-nsg/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/networking/virtual_network/101-vnet-peering-nsg/standalone/main.tf
+++ b/examples/networking/virtual_network/101-vnet-peering-nsg/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/networking/virtual_network/200-nsg-flow-logs/standalone/main.tf b/examples/networking/virtual_network/200-nsg-flow-logs/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/networking/virtual_network/200-nsg-flow-logs/standalone/main.tf
+++ b/examples/networking/virtual_network/200-nsg-flow-logs/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/networking/virtual_network_gateway/100-expressroute-gateway/standalone/main.tf b/examples/networking/virtual_network_gateway/100-expressroute-gateway/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/networking/virtual_network_gateway/100-expressroute-gateway/standalone/main.tf
+++ b/examples/networking/virtual_network_gateway/100-expressroute-gateway/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/networking/virtual_network_gateway/101-vpn-site-to-site/standalone/main.tf b/examples/networking/virtual_network_gateway/101-vpn-site-to-site/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/networking/virtual_network_gateway/101-vpn-site-to-site/standalone/main.tf
+++ b/examples/networking/virtual_network_gateway/101-vpn-site-to-site/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/networking/virtual_network_gateway/102-vpn-site-to-site-active-active/standalone/main.tf b/examples/networking/virtual_network_gateway/102-vpn-site-to-site-active-active/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/networking/virtual_network_gateway/102-vpn-site-to-site-active-active/standalone/main.tf
+++ b/examples/networking/virtual_network_gateway/102-vpn-site-to-site-active-active/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/networking/virtual_network_gateway/103-vpn-site-to-site-connection/standalone/main.tf b/examples/networking/virtual_network_gateway/103-vpn-site-to-site-connection/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/networking/virtual_network_gateway/103-vpn-site-to-site-connection/standalone/main.tf
+++ b/examples/networking/virtual_network_gateway/103-vpn-site-to-site-connection/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/networking/virtual_network_gateway_connections/100-expressroute-gateway-connection/standalone/main.tf b/examples/networking/virtual_network_gateway_connections/100-expressroute-gateway-connection/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/networking/virtual_network_gateway_connections/100-expressroute-gateway-connection/standalone/main.tf
+++ b/examples/networking/virtual_network_gateway_connections/100-expressroute-gateway-connection/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/networking/virtual_wan/100-vwan-multi-hubs/standalone/main.tf b/examples/networking/virtual_wan/100-vwan-multi-hubs/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/networking/virtual_wan/100-vwan-multi-hubs/standalone/main.tf
+++ b/examples/networking/virtual_wan/100-vwan-multi-hubs/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/networking/virtual_wan/101-vwan-multi-hubs-firewalls/standalone/main.tf b/examples/networking/virtual_wan/101-vwan-multi-hubs-firewalls/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/networking/virtual_wan/101-vwan-multi-hubs-firewalls/standalone/main.tf
+++ b/examples/networking/virtual_wan/101-vwan-multi-hubs-firewalls/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/networking/virtual_wan/102-vwan-multi-hubs-gw/standalone/main.tf b/examples/networking/virtual_wan/102-vwan-multi-hubs-gw/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/networking/virtual_wan/102-vwan-multi-hubs-gw/standalone/main.tf
+++ b/examples/networking/virtual_wan/102-vwan-multi-hubs-gw/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/postgresql_server/100-simple-postgresql/standalone/main.tf b/examples/postgresql_server/100-simple-postgresql/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/postgresql_server/100-simple-postgresql/standalone/main.tf
+++ b/examples/postgresql_server/100-simple-postgresql/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/postgresql_server/101-vnet-rule-postgresql/standalone/main.tf b/examples/postgresql_server/101-vnet-rule-postgresql/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/postgresql_server/101-vnet-rule-postgresql/standalone/main.tf
+++ b/examples/postgresql_server/101-vnet-rule-postgresql/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/postgresql_server/102-private-endpoint-postgresql/standalone/main.tf b/examples/postgresql_server/102-private-endpoint-postgresql/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/postgresql_server/102-private-endpoint-postgresql/standalone/main.tf
+++ b/examples/postgresql_server/102-private-endpoint-postgresql/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/postgresql_server/103-private-endpoint-with-fw-rule/standalone/main.tf b/examples/postgresql_server/103-private-endpoint-with-fw-rule/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/postgresql_server/103-private-endpoint-with-fw-rule/standalone/main.tf
+++ b/examples/postgresql_server/103-private-endpoint-with-fw-rule/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/recovery_vault/101-simple-asrv/standalone/main.tf b/examples/recovery_vault/101-simple-asrv/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/recovery_vault/101-simple-asrv/standalone/main.tf
+++ b/examples/recovery_vault/101-simple-asrv/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/recovery_vault/102-asr-protection/standalone/main.tf b/examples/recovery_vault/102-asr-protection/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/recovery_vault/102-asr-protection/standalone/main.tf
+++ b/examples/recovery_vault/102-asr-protection/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/recovery_vault/103-asr-with-private-endpoint/standalone/main.tf b/examples/recovery_vault/103-asr-with-private-endpoint/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/recovery_vault/103-asr-with-private-endpoint/standalone/main.tf
+++ b/examples/recovery_vault/103-asr-with-private-endpoint/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/redis_cache/100-redis-standard/standalone/main.tf b/examples/redis_cache/100-redis-standard/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/redis_cache/100-redis-standard/standalone/main.tf
+++ b/examples/redis_cache/100-redis-standard/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/synapse_analytics/100-synapse/standalone/main.tf b/examples/synapse_analytics/100-synapse/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/synapse_analytics/100-synapse/standalone/main.tf
+++ b/examples/synapse_analytics/100-synapse/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/synapse_analytics/101-synapse-sparkpool/standalone/main.tf b/examples/synapse_analytics/101-synapse-sparkpool/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/synapse_analytics/101-synapse-sparkpool/standalone/main.tf
+++ b/examples/synapse_analytics/101-synapse-sparkpool/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/webapps/appservice/101-appservice-simple/standalone/main.tf b/examples/webapps/appservice/101-appservice-simple/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/webapps/appservice/101-appservice-simple/standalone/main.tf
+++ b/examples/webapps/appservice/101-appservice-simple/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/webapps/appservice/102-appservice-slots/standalone/main.tf b/examples/webapps/appservice/102-appservice-slots/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/webapps/appservice/102-appservice-slots/standalone/main.tf
+++ b/examples/webapps/appservice/102-appservice-slots/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/webapps/appservice/103-appservice-extend/standalone/main.tf b/examples/webapps/appservice/103-appservice-extend/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/webapps/appservice/103-appservice-extend/standalone/main.tf
+++ b/examples/webapps/appservice/103-appservice-extend/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/webapps/appservice/104-appservice-appinsight/standalone/main.tf b/examples/webapps/appservice/104-appservice-appinsight/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/webapps/appservice/104-appservice-appinsight/standalone/main.tf
+++ b/examples/webapps/appservice/104-appservice-appinsight/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/examples/webapps/appservice/105-appservice-backup/standalone/main.tf b/examples/webapps/appservice/105-appservice-backup/standalone/main.tf
index dfc4c4ce2d..2e9a59ced2 100644
--- a/examples/webapps/appservice/105-appservice-backup/standalone/main.tf
+++ b/examples/webapps/appservice/105-appservice-backup/standalone/main.tf
@@ -26,7 +26,7 @@ terraform {
     }
     azurecaf = {
       source  = "aztfmod/azurecaf"
-      version = "~> 1.1.0"
+      version = "~> 1.2.0"
     }
   }
   required_version = ">= 0.13"
diff --git a/locals.tf b/locals.tf
index 877f9e9a14..2f67d5e65f 100644
--- a/locals.tf
+++ b/locals.tf
@@ -64,6 +64,7 @@ locals {
     virtual_wans                                            = try(var.networking.virtual_wans, {})
     vnet_peerings                                           = try(var.networking.vnet_peerings, {})
     vnets                                                   = try(var.networking.vnets, {})
+    ip_groups                                               = try(var.networking.ip_groups, {})
   }
 
   database = {
@@ -122,4 +123,4 @@ locals {
     virtual_machines = try(var.enable.virtual_machines, true)
   }
 
-}
\ No newline at end of file
+}
diff --git a/modules/networking/firewall/module.tf b/modules/networking/firewall/module.tf
index 76c7195ba9..1f25cbb7fa 100755
--- a/modules/networking/firewall/module.tf
+++ b/modules/networking/firewall/module.tf
@@ -22,13 +22,13 @@ resource "azurerm_firewall" "fw" {
   ip_configuration {
     name                 = "configuration"
     subnet_id            = var.subnet_id
-    public_ip_address_id = try(var.public_ip_id, var.public_ip_addresses[var.public_ip_keys[0]].id)
+    public_ip_address_id = (var.public_ip_id != null) ? var.public_ip_id : var.public_ip_addresses[var.public_ip_keys[0]].id
   }
 
   dynamic "ip_configuration" {
     for_each = {
       for key, value in try(var.public_ip_addresses, {}) : key => value
-      if try(contains(var.public_ip_keys, key) && (key != var.public_ip_keys[0]), false)
+      if(var.public_ip_id == null) && try(contains(var.public_ip_keys, key) && (key != var.public_ip_keys[0]), false)
     }
     content {
       name                 = ip_configuration.key
diff --git a/modules/networking/firewall/variables.tf b/modules/networking/firewall/variables.tf
index 1a12e87924..3e1e600cad 100755
--- a/modules/networking/firewall/variables.tf
+++ b/modules/networking/firewall/variables.tf
@@ -1,49 +1,49 @@
-variable global_settings {
+variable "global_settings" {
   description = "Global settings object (see module README.md)"
 }
-variable name {
+variable "name" {
   description = "(Required) Name of the Azure Firewall to be created"
 }
 
-variable location {
+variable "location" {
   description = "(Required) Location of the Azure Firewall to be created"
 }
 
-variable tags {
+variable "tags" {
   description = "(Required) Tags of the Azure Firewall to be created"
 }
 
-variable resource_group_name {
+variable "resource_group_name" {
   description = "(Required) Resource Group of the Azure Firewall to be created"
 }
 
-variable subnet_id {
+variable "subnet_id" {
   description = "(Required) ID for the subnet where to deploy the Azure Firewall "
 }
 
-variable public_ip_id {
-  description = "(Required) Public IP address identifier. IP address must be of type static and standard."
-  default = null
+variable "public_ip_id" {
+  description = "(Optional) Public IP address identifier. IP address must be of type static and standard."
+  default     = null
 }
 
-variable diagnostics {
+variable "diagnostics" {
   default = {}
 }
-variable settings {}
+variable "settings" {}
 
-variable diagnostic_profiles {
+variable "diagnostic_profiles" {
   default = {}
 }
 
-variable base_tags {
+variable "base_tags" {
   description = "Base tags for the resource to be inherited from the resource group."
-  type        = map
+  type        = map(any)
 }
 
-variable public_ip_addresses {
-  
+variable "public_ip_addresses" {
+
 }
 
-variable public_ip_keys {
-  
-}
\ No newline at end of file
+variable "public_ip_keys" {
+
+}
diff --git a/modules/networking/firewall_application_rule_collections/application_rule_collection.tf b/modules/networking/firewall_application_rule_collections/application_rule_collection.tf
index 37822c776b..c3d66ed9f5 100755
--- a/modules/networking/firewall_application_rule_collections/application_rule_collection.tf
+++ b/modules/networking/firewall_application_rule_collections/application_rule_collection.tf
@@ -25,9 +25,14 @@ resource "azurerm_firewall_application_rule_collection" "rule" {
     content {
       name             = rule.value.name
       description      = try(rule.value.description, null)
-      source_addresses = rule.value.source_addresses
-      fqdn_tags        = try(rule.value.fqdn_tags, null)
-      target_fqdns     = try(rule.value.target_fqdns, null)
+      source_addresses = try(rule.value.source_addresses, null)
+      source_ip_groups = try(rule.value.source_ip_groups, try(flatten([
+        for key, value in var.ip_groups : value.id
+        if contains(rule.value.source_ip_groups_keys, key)
+        ]), null)
+      )
+      fqdn_tags    = try(rule.value.fqdn_tags, null)
+      target_fqdns = try(rule.value.target_fqdns, null)
 
       dynamic "protocol" {
         for_each = try(rule.value.protocol, {})
@@ -39,4 +44,4 @@ resource "azurerm_firewall_application_rule_collection" "rule" {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/modules/networking/firewall_application_rule_collections/variables.tf b/modules/networking/firewall_application_rule_collections/variables.tf
index c04135e985..dc6d541001 100755
--- a/modules/networking/firewall_application_rule_collections/variables.tf
+++ b/modules/networking/firewall_application_rule_collections/variables.tf
@@ -1,16 +1,20 @@
-variable azure_firewall_name {
+variable "azure_firewall_name" {
   description = "(Required) Specifies the name of the Firewall in which the Network Rule Collection should be created. Changing this forces a new resource to be created."
 }
 
-variable resource_group_name {
+variable "resource_group_name" {
   description = "(Required) Specifies the name of the Resource Group in which the Firewall exists. Changing this forces a new resource to be created."
 }
 
-variable rule_collections {
+variable "rule_collections" {
   description = "(Required) One or more rules as defined https://www.terraform.io/docs/providers/azurerm/r/firewall_network_rule_collection.html"
 }
 
-variable azurerm_firewall_application_rule_collection_definition {}
-variable global_settings {
+variable "azurerm_firewall_application_rule_collection_definition" {}
+variable "global_settings" {
   description = "Global settings object (see module README.md)"
-}
\ No newline at end of file
+}
+
+variable "ip_groups" {
+  default = {}
+}
diff --git a/modules/networking/firewall_nat_rule_collections/nat_rule_collection.tf b/modules/networking/firewall_nat_rule_collections/nat_rule_collection.tf
index 71ba4a7cf2..bcb220e580 100644
--- a/modules/networking/firewall_nat_rule_collections/nat_rule_collection.tf
+++ b/modules/networking/firewall_nat_rule_collections/nat_rule_collection.tf
@@ -25,9 +25,14 @@ resource "azurerm_firewall_nat_rule_collection" "natcollection" {
   dynamic "rule" {
     for_each = var.azurerm_firewall_nat_rule_collection_definition[each.key].ruleset
     content {
-      name                  = rule.value.name
-      description           = try(rule.value.description, null)
-      source_addresses      = rule.value.source_addresses
+      name             = rule.value.name
+      description      = try(rule.value.description, null)
+      source_addresses = try(rule.value.source_addresses, null)
+      source_ip_groups = try(rule.value.source_ip_groups, try(flatten([
+        for key, value in var.ip_groups : value.id
+        if contains(rule.value.source_ip_groups_keys, key)
+        ]), null)
+      )
       destination_ports     = rule.value.destination_ports
       destination_addresses = rule.value.destination_addresses
       translated_port       = rule.value.translated_port
@@ -35,4 +40,4 @@ resource "azurerm_firewall_nat_rule_collection" "natcollection" {
       protocols             = rule.value.protocols
     }
   }
-}
\ No newline at end of file
+}
diff --git a/modules/networking/firewall_nat_rule_collections/variables.tf b/modules/networking/firewall_nat_rule_collections/variables.tf
index 8180d182e8..cfc4b9d600 100644
--- a/modules/networking/firewall_nat_rule_collections/variables.tf
+++ b/modules/networking/firewall_nat_rule_collections/variables.tf
@@ -1,16 +1,19 @@
-variable azure_firewall_name {
+variable "azure_firewall_name" {
   description = "(Required) Specifies the name of the Firewall in which the Network Rule Collection should be created. Changing this forces a new resource to be created."
 }
 
-variable resource_group_name {
+variable "resource_group_name" {
   description = "(Required) Specifies the name of the Resource Group in which the Firewall exists. Changing this forces a new resource to be created."
 }
 
-variable rule_collections {
+variable "rule_collections" {
   description = "(Required) One or more rules as defined https://www.terraform.io/docs/providers/azurerm/r/firewall_nat_rule_collection.html"
 }
 
-variable azurerm_firewall_nat_rule_collection_definition {}
-variable global_settings {
+variable "azurerm_firewall_nat_rule_collection_definition" {}
+variable "global_settings" {
   description = "Global settings object (see module README.md)"
-}
\ No newline at end of file
+}
+variable "ip_groups" {
+  default = {}
+}
diff --git a/modules/networking/firewall_network_rule_collections/network_rule_collection.tf b/modules/networking/firewall_network_rule_collections/network_rule_collection.tf
index 1feb7a6928..194ec749c3 100755
--- a/modules/networking/firewall_network_rule_collections/network_rule_collection.tf
+++ b/modules/networking/firewall_network_rule_collections/network_rule_collection.tf
@@ -23,12 +23,22 @@ resource "azurerm_firewall_network_rule_collection" "rule" {
     for_each = var.azurerm_firewall_network_rule_collection_definition[each.key].ruleset
 
     content {
-      name                  = rule.value.name
-      description           = try(rule.value.description, null)
-      source_addresses      = rule.value.source_addresses
-      destination_addresses = rule.value.destination_addresses
-      destination_ports     = rule.value.destination_ports
-      protocols             = rule.value.protocols
+      name             = rule.value.name
+      description      = try(rule.value.description, null)
+      source_addresses = try(rule.value.source_addresses, null)
+      source_ip_groups = try(rule.value.source_ip_groups, try(flatten([
+        for key, value in var.ip_groups : value.id
+        if contains(rule.value.source_ip_groups_keys, key)
+        ]), null)
+      )
+      destination_addresses = try(rule.value.destination_addresses, null)
+      destination_ip_groups = try(rule.value.destination_ip_groups, try(flatten([
+        for key, value in var.ip_groups : value.id
+        if contains(rule.value.destination_ip_groups_keys, key)
+        ]), null)
+      )
+      destination_ports = rule.value.destination_ports
+      protocols         = rule.value.protocols
     }
   }
-}
\ No newline at end of file
+}
diff --git a/modules/networking/firewall_network_rule_collections/variables.tf b/modules/networking/firewall_network_rule_collections/variables.tf
index 2c6d3bcd23..3ed06f06b5 100755
--- a/modules/networking/firewall_network_rule_collections/variables.tf
+++ b/modules/networking/firewall_network_rule_collections/variables.tf
@@ -1,16 +1,19 @@
-variable azure_firewall_name {
+variable "azure_firewall_name" {
   description = "(Required) Specifies the name of the Firewall in which the Network Rule Collection should be created. Changing this forces a new resource to be created."
 }
 
-variable resource_group_name {
+variable "resource_group_name" {
   description = "(Required) Specifies the name of the Resource Group in which the Firewall exists. Changing this forces a new resource to be created."
 }
 
-variable rule_collections {
+variable "rule_collections" {
   description = "(Required) One or more rules as defined https://www.terraform.io/docs/providers/azurerm/r/firewall_network_rule_collection.html"
 }
 
-variable azurerm_firewall_network_rule_collection_definition {}
-variable global_settings {
+variable "azurerm_firewall_network_rule_collection_definition" {}
+variable "global_settings" {
   description = "Global settings object (see module README.md)"
-}
\ No newline at end of file
+}
+variable "ip_groups" {
+  default = {}
+}
diff --git a/modules/networking/ip_group/main.tf b/modules/networking/ip_group/main.tf
new file mode 100755
index 0000000000..f1858e8a31
--- /dev/null
+++ b/modules/networking/ip_group/main.tf
@@ -0,0 +1,14 @@
+locals {
+  module_tag = {
+    "module" = basename(abspath(path.module))
+  }
+  tags = merge(var.base_tags, local.module_tag, try(var.settings.tags, null))
+}
+
+terraform {
+  required_providers {
+    azurecaf = {
+      source = "aztfmod/azurecaf"
+    }
+  }
+}
\ No newline at end of file
diff --git a/modules/networking/ip_group/module.tf b/modules/networking/ip_group/module.tf
new file mode 100755
index 0000000000..8a5db28381
--- /dev/null
+++ b/modules/networking/ip_group/module.tf
@@ -0,0 +1,32 @@
+#Reference: https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/ip_group
+
+resource "azurecaf_name" "ip_group" {
+  name          = var.name
+  resource_type = "azurerm_ip_group"
+  prefixes      = [var.global_settings.prefix]
+  random_length = var.global_settings.random_length
+  clean_input   = true
+  passthrough   = var.global_settings.passthrough
+  use_slug      = var.global_settings.use_slug
+}
+
+locals {
+  cidrs = try(var.settings.cidrs, try(var.settings.subnet_keys, []) == [] ? var.vnet.address_space : flatten([
+    for key, subnet in var.vnet.subnets : subnet.cidr
+    if contains(var.settings.subnet_keys, key)
+  ]))
+}
+output "cidrs" {
+  value = local.cidrs
+}
+resource "azurerm_ip_group" "ip_group" {
+
+  name                = azurecaf_name.ip_group.result
+  location            = var.resource_group.location
+  resource_group_name = var.resource_group.name
+  tags                = local.tags
+  cidrs               = local.cidrs
+}
+
+
+#   subnets             = lookup(each.value, "lz_key", null) == null ? local.combined_objects_networking[local.client_config.landingzone_key][each.value.vnet_key].subnets : local.combined_objects_networking[each.value.lz_key][each.value.vnet_key].subnets
diff --git a/modules/networking/ip_group/output.tf b/modules/networking/ip_group/output.tf
new file mode 100755
index 0000000000..8f3a30090d
--- /dev/null
+++ b/modules/networking/ip_group/output.tf
@@ -0,0 +1,4 @@
+output "id" {
+  description = "The ID of the IP Group."
+  value       = azurerm_ip_group.ip_group.id
+}
diff --git a/modules/networking/ip_group/variables.tf b/modules/networking/ip_group/variables.tf
new file mode 100755
index 0000000000..11560c592f
--- /dev/null
+++ b/modules/networking/ip_group/variables.tf
@@ -0,0 +1,27 @@
+variable "global_settings" {
+  description = "Global settings object (see module README.md)"
+}
+variable "name" {
+  description = "(Required) Name of the IP Group to be created"
+}
+
+variable "tags" {
+  description = "(Required) Tags of the IP Group to be created"
+}
+
+variable "resource_group" {
+  description = "(Required) Resource Group of the IP Group to be created"
+}
+
+variable "base_tags" {
+  description = "Base tags for the resource to be inherited from the resource group."
+  type        = map(any)
+}
+
+variable "vnet" {
+  description = "(Required) Vnet CIDRs of the IP Group to be created"
+}
+
+variable "settings" {}
+
+variable "client_config" {}
diff --git a/networking_firewall.tf b/networking_firewall.tf
index 782560b859..e0b0fb8968 100755
--- a/networking_firewall.tf
+++ b/networking_firewall.tf
@@ -1,4 +1,4 @@
-module azurerm_firewalls {
+module "azurerm_firewalls" {
   source   = "./modules/networking/firewall"
   for_each = local.networking.azurerm_firewalls
 
@@ -16,7 +16,7 @@ module azurerm_firewalls {
   settings            = each.value
 }
 
-module azurerm_firewall_network_rule_collections {
+module "azurerm_firewall_network_rule_collections" {
   source = "./modules/networking/firewall_network_rule_collections"
   for_each = {
     for key, firewall in local.networking.azurerm_firewalls : key => firewall
@@ -28,10 +28,10 @@ module azurerm_firewall_network_rule_collections {
   rule_collections                                    = each.value.azurerm_firewall_network_rule_collections
   azurerm_firewall_network_rule_collection_definition = local.networking.azurerm_firewall_network_rule_collection_definition
   global_settings                                     = local.global_settings
-
+  ip_groups                                           = module.ip_groups
 }
 
-module azurerm_firewall_application_rule_collections {
+module "azurerm_firewall_application_rule_collections" {
   source = "./modules/networking/firewall_application_rule_collections"
   for_each = {
     for key, firewall in local.networking.azurerm_firewalls : key => firewall
@@ -43,11 +43,11 @@ module azurerm_firewall_application_rule_collections {
   rule_collections                                        = each.value.azurerm_firewall_application_rule_collections
   azurerm_firewall_application_rule_collection_definition = local.networking.azurerm_firewall_application_rule_collection_definition
   global_settings                                         = local.global_settings
-
+  ip_groups                                               = module.ip_groups
 }
 
 
-module azurerm_firewall_nat_rule_collections {
+module "azurerm_firewall_nat_rule_collections" {
   source = "./modules/networking/firewall_nat_rule_collections"
   for_each = {
     for key, firewall in local.networking.azurerm_firewalls : key => firewall
@@ -59,10 +59,10 @@ module azurerm_firewall_nat_rule_collections {
   rule_collections                                = each.value.azurerm_firewall_nat_rule_collections
   azurerm_firewall_nat_rule_collection_definition = local.networking.azurerm_firewall_nat_rule_collection_definition
   global_settings                                 = local.global_settings
-
+  ip_groups                                       = module.ip_groups
 }
 
-output azurerm_firewalls {
+output "azurerm_firewalls" {
   value = module.azurerm_firewalls
 
 }
diff --git a/networking_ip_groups.tf b/networking_ip_groups.tf
new file mode 100644
index 0000000000..f17fc91f45
--- /dev/null
+++ b/networking_ip_groups.tf
@@ -0,0 +1,19 @@
+
+
+module "ip_groups" {
+  source   = "./modules/networking/ip_group"
+  for_each = local.networking.ip_groups
+
+  global_settings = local.global_settings
+  client_config   = local.client_config
+  name            = each.value.name
+  resource_group  = module.resource_groups[each.value.resource_group_key]
+  tags            = try(each.value.tags, null)
+  vnet            = lookup(each.value, "lz_key", null) == null ? local.combined_objects_networking[local.client_config.landingzone_key][each.value.vnet_key] : local.combined_objects_networking[each.value.lz_key][each.value.vnet_key]
+  settings        = each.value
+  base_tags       = try(local.global_settings.inherit_tags, false) ? module.resource_groups[each.value.resource_group_key].tags : {}
+}
+
+output "ip_groups" {
+  value = module.ip_groups
+}
diff --git a/variables.tf b/variables.tf
index ae9cf2772d..af67177a82 100755
--- a/variables.tf
+++ b/variables.tf
@@ -1,5 +1,5 @@
 # Global settings
-variable global_settings {
+variable "global_settings" {
   description = "Global settings object for the current deployment."
   default = {
     passthrough    = false
@@ -12,23 +12,23 @@ variable global_settings {
   }
 }
 
-variable tenant_id {
+variable "tenant_id" {
   description = "Azure AD Tenant ID for the current deployment."
   default     = null
 }
 
-variable current_landingzone_key {
+variable "current_landingzone_key" {
   description = "Key for the current landing zones where the deployment is executed. Used in the context of landing zone deployment."
   default     = "standalone"
   type        = string
 }
 
-variable tfstates {
+variable "tfstates" {
   description = "Terraform states configuration object. Used in the context of landing zone deployment."
   default     = {}
 }
 
-variable enable {
+variable "enable" {
   description = "Map of services defined in the configuration file you want to disable during a deployment."
   default = {
     # bastion_hosts    = true
@@ -36,108 +36,108 @@ variable enable {
   }
 }
 
-variable environment {
+variable "environment" {
   description = "Name of the CAF environment."
   type        = string
   default     = "sandpit"
 }
 
-variable logged_user_objectId {
+variable "logged_user_objectId" {
   description = "Used to set access policies based on the value 'logged_in_user'. Can only be used in interactive execution with vscode."
   default     = null
 }
-variable logged_aad_app_objectId {
+variable "logged_aad_app_objectId" {
   description = "Used to set access policies based on the value 'logged_in_aad_app'"
   default     = null
 }
 
-variable use_msi {
+variable "use_msi" {
   description = "Deployment using an MSI for authentication."
   default     = false
   type        = bool
 }
 
-variable tags {
+variable "tags" {
   description = "Tags to be used for this resource deployment."
-  type        = map
+  type        = map(any)
   default     = null
 }
 
-variable resource_groups {
+variable "resource_groups" {
   description = "Resource groups configuration objects"
   default     = {}
 }
 
-variable subscriptions {
+variable "subscriptions" {
   default = {}
 }
 
-variable remote_objects {
+variable "remote_objects" {
   description = "Remote objects is used to allow the landing zone to retrieve remote tfstate objects and pass them to the caf module"
   default     = {}
 }
 
 ## Diagnostics settings
-variable diagnostics_definition {
+variable "diagnostics_definition" {
   default     = null
   description = "Shared diadgnostics settings that can be used by the services to enable diagnostics"
 }
 
-variable diagnostics_destinations {
+variable "diagnostics_destinations" {
   default = null
 }
 
-variable log_analytics {
+variable "log_analytics" {
   default = {}
 }
 
-variable diagnostics {
+variable "diagnostics" {
   default = {}
 }
 
-variable event_hub_namespaces {
+variable "event_hub_namespaces" {
   default = {}
 }
 
-variable subnet_id {
+variable "subnet_id" {
   default = {}
 }
 
-variable user_type {
+variable "user_type" {
   description = "The rover set this value to user or serviceprincipal. It is used to handle Azure AD api consents."
   default     = {}
 }
 
 ## Azure AD
-variable azuread_apps {
+variable "azuread_apps" {
   default = {}
 }
 
-variable azuread_groups {
+variable "azuread_groups" {
   default = {}
 }
 
-variable azuread_roles {
+variable "azuread_roles" {
   default = {}
 }
 
-variable azuread_users {
+variable "azuread_users" {
   default = {}
 }
 
-variable azuread_api_permissions {
+variable "azuread_api_permissions" {
   default = {}
 }
 
 ## Compute variables
-variable compute {
+variable "compute" {
   description = "Compute configuration objects"
   default = {
     virtual_machines = {}
   }
 }
 
-variable webapp {
+variable "webapp" {
   description = "Web applications configuration objects"
   default = {
     # app_services                 = {}
@@ -149,69 +149,69 @@ variable webapp {
 
 
 ## Databases variables
-variable database {
+variable "database" {
   description = "Database configuration objects"
   default     = {}
 }
 
 ## Networking variables
-variable networking {
+variable "networking" {
   description = "Networking configuration objects"
   default     = {}
 }
 
 ## Security variables
-variable security {
+variable "security" {
   default = {}
 }
 
-variable managed_identities {
+variable "managed_identities" {
   description = "Managed Identity configuration objects"
   default     = {}
 }
 
-variable keyvaults {
+variable "keyvaults" {
   description = "Key Vault configuration objects"
   default     = {}
 }
 
-variable keyvault_access_policies {
+variable "keyvault_access_policies" {
   default = {}
 }
 
-variable keyvault_access_policies_azuread_apps {
+variable "keyvault_access_policies_azuread_apps" {
   default = {}
 }
 
-variable custom_role_definitions {
+variable "custom_role_definitions" {
   description = "Custom role definitions configuration objects"
   default     = {}
 }
-variable role_mapping {
+variable "role_mapping" {
   default = {
     built_in_role_mapping = {}
     custom_role_mapping   = {}
   }
 }
 
-variable dynamic_keyvault_secrets {
+variable "dynamic_keyvault_secrets" {
   default = {}
 }
 
 ## Storage variables
-variable storage_accounts {
+variable "storage_accounts" {
   default = {}
 }
-variable storage {
+variable "storage" {
   description = "Storage configuration objects"
   default     = {}
 }
-variable diagnostic_storage_accounts {
+variable "diagnostic_storage_accounts" {
   default = {}
 }
 
 # Shared services
-variable shared_services {
+variable "shared_services" {
   description = "Shared services configuration objects"
   default = {
     # automations = {}
@@ -220,13 +220,17 @@ variable shared_services {
   }
 }
 
-variable keyvault_certificate_issuers {
+variable "keyvault_certificate_issuers" {
   default = {}
 }
-variable cosmos_dbs {
+variable "cosmos_dbs" {
   default = {}
 }
 
-variable local_network_gateways {
+variable "local_network_gateways" {
+  default = {}
+}
+
+variable "ip_groups" {
   default = {}
 }