diff --git a/docs/wiki/examples/starter-module-config/complete-multi-region/config-hub-and-spoke-vnet-multi-region.yaml b/docs/wiki/examples/starter-module-config/complete-multi-region/config-hub-and-spoke-vnet-multi-region.yaml
index efd06de..f7be4e7 100644
--- a/docs/wiki/examples/starter-module-config/complete-multi-region/config-hub-and-spoke-vnet-multi-region.yaml
+++ b/docs/wiki/examples/starter-module-config/complete-multi-region/config-hub-and-spoke-vnet-multi-region.yaml
@@ -29,7 +29,7 @@ hub_and_spoke_vnet_settings:
   ddos_protection_plan:
     location: ${starter_location_01}
     name: ddos-hub-${starter_location_01}
-    resource_group_name: rg-hub-ddos-${starter_location_01}
+    resource_group_name: ${connectivity_resource_group_ddos}
 hub_and_spoke_vnet_virtual_networks:
   primary:
     hub_virtual_network:
@@ -53,16 +53,19 @@ hub_and_spoke_vnet_virtual_networks:
       location: ${starter_location_01}
       name: vnet-hub-${starter_location_01}
       resource_group_creation_enabled: false
-      resource_group_name: rg-hub-${starter_location_01}
+      resource_group_name: ${connectivity_resource_group_vnet_primary}
       subnets:
         virtual_network_gateway:
           address_prefixes:
             - 10.0.1.0/24
           assign_generated_route_table: false
           name: GatewaySubnet
+      tags:
+        deployment: terraform
+        source: Azure Landing Zones Accelerator
     private_dns_zones:
       is_primary: true
-      resource_group_name: rg-hub-dns-${starter_location_01}
+      resource_group_name: ${connectivity_resource_group_dns}
     virtual_network_gateways:
       express_route:
         ip_configurations:
@@ -108,16 +111,19 @@ hub_and_spoke_vnet_virtual_networks:
       location: ${starter_location_02}
       name: vnet-hub-${starter_location_02}
       resource_group_creation_enabled: false
-      resource_group_name: rg-hub-${starter_location_02}
+      resource_group_name: ${connectivity_resource_group_vnet_secondary}
       subnets:
         virtual_network_gateway:
           address_prefixes:
             - 10.1.1.0/24
           assign_generated_route_table: false
           name: GatewaySubnet
+      tags:
+        deployment: terraform
+        source: Azure Landing Zones Accelerator
     private_dns_zones:
       is_primary: false
-      resource_group_name: rg-hub-dns-${starter_location_01}
+      resource_group_name: ${connectivity_resource_group_dns}
     virtual_network_gateways:
       express_route:
         ip_configurations:
@@ -152,10 +158,10 @@ management_settings_es:
         azurerm_resource_group:
           ddos:
             ${starter_location_01}:
-              name: rg-hub-ddos-${starter_location_01}
+              name: ${connectivity_resource_group_ddos}
           dns:
             ${starter_location_01}:
-              name: rg-hub-dns-${starter_location_01}
+              name: ${connectivity_resource_group_dns}
     settings:
       ddos_protection_plan:
         config:
@@ -189,4 +195,3 @@ management_settings_es:
   subscription_id_connectivity: ${subscription_id_connectivity}
   subscription_id_identity: ${subscription_id_identity}
   subscription_id_management: ${subscription_id_management}
-management_use_avm: false
diff --git a/docs/wiki/examples/starter-module-config/complete-multi-region/config-hub-and-spoke-vnet-single-region.yaml b/docs/wiki/examples/starter-module-config/complete-multi-region/config-hub-and-spoke-vnet-single-region.yaml
index 4c574b7..5cfd57b 100644
--- a/docs/wiki/examples/starter-module-config/complete-multi-region/config-hub-and-spoke-vnet-single-region.yaml
+++ b/docs/wiki/examples/starter-module-config/complete-multi-region/config-hub-and-spoke-vnet-single-region.yaml
@@ -26,7 +26,7 @@ hub_and_spoke_vnet_settings:
   ddos_protection_plan:
     location: ${starter_location_01}
     name: ddos-hub-${starter_location_01}
-    resource_group_name: rg-hub-ddos-${starter_location_01}
+    resource_group_name: ${connectivity_resource_group_ddos}
 hub_and_spoke_vnet_virtual_networks:
   primary:
     hub_virtual_network:
@@ -50,16 +50,19 @@ hub_and_spoke_vnet_virtual_networks:
       location: ${starter_location_01}
       name: vnet-hub-${starter_location_01}
       resource_group_creation_enabled: false
-      resource_group_name: rg-hub-${starter_location_01}
+      resource_group_name: ${connectivity_resource_group_vnet_primary}
       subnets:
         virtual_network_gateway:
           address_prefixes:
             - 10.0.1.0/24
           assign_generated_route_table: false
           name: GatewaySubnet
+      tags:
+        deployment: terraform
+        source: Azure Landing Zones Accelerator
     private_dns_zones:
       is_primary: true
-      resource_group_name: rg-hub-dns-${starter_location_01}
+      resource_group_name: ${connectivity_resource_group_dns}
     virtual_network_gateways:
       express_route:
         ip_configurations:
@@ -94,10 +97,10 @@ management_settings_es:
         azurerm_resource_group:
           ddos:
             ${starter_location_01}:
-              name: rg-hub-ddos-${starter_location_01}
+              name: ${connectivity_resource_group_ddos}
           dns:
             ${starter_location_01}:
-              name: rg-hub-dns-${starter_location_01}
+              name: ${connectivity_resource_group_dns}
     settings:
       ddos_protection_plan:
         config:
@@ -131,4 +134,3 @@ management_settings_es:
   subscription_id_connectivity: ${subscription_id_connectivity}
   subscription_id_identity: ${subscription_id_identity}
   subscription_id_management: ${subscription_id_management}
-management_use_avm: false
diff --git a/docs/wiki/examples/starter-module-config/complete-multi-region/config-virtual-wan-multi-region.yaml b/docs/wiki/examples/starter-module-config/complete-multi-region/config-virtual-wan-multi-region.yaml
index 351d4e1..4f8ce3d 100644
--- a/docs/wiki/examples/starter-module-config/complete-multi-region/config-virtual-wan-multi-region.yaml
+++ b/docs/wiki/examples/starter-module-config/complete-multi-region/config-virtual-wan-multi-region.yaml
@@ -35,14 +35,14 @@ management_settings_es:
         azurerm_network_ddos_protection_plan:
           ddos:
             ${starter_location_01}:
-              name: ddos-${starter_location_01}
+              name: ddos-hub-${starter_location_01}
         azurerm_resource_group:
           ddos:
             ${starter_location_01}:
-              name: rg-ddos-${starter_location_01}
+              name: ${connectivity_resource_group_ddos}
           dns:
             ${starter_location_01}:
-              name: rg-dns-${starter_location_01}
+              name: ${connectivity_resource_group_dns}
     settings:
       ddos_protection_plan:
         config:
@@ -76,15 +76,14 @@ management_settings_es:
   subscription_id_connectivity: ${subscription_id_connectivity}
   subscription_id_identity: ${subscription_id_identity}
   subscription_id_management: ${subscription_id_management}
-management_use_avm: false
 virtual_wan_settings:
   ddos_protection_plan:
     location: ${starter_location_01}
     name: ddos-hub-${starter_location_01}
-    resource_group_name: rg-hub-ddos-${starter_location_01}
+    resource_group_name: ${connectivity_resource_group_ddos}
   location: ${starter_location_01}
   name: vwan-hub-${starter_location_01}
-  resource_group_name: rg-vwan-${starter_location_01}
+  resource_group_name: ${connectivity_resource_group_vwan}
 virtual_wan_virtual_hubs:
   primary:
     firewall:
@@ -98,21 +97,21 @@ virtual_wan_virtual_hubs:
       address_prefix: 10.0.0.0/16
       location: ${starter_location_01}
       name: vwan-hub-${starter_location_01}
-      resource_group_name: rg-vwan-hub-${starter_location_01}
+      resource_group_name: ${connectivity_resource_group_vnet_primary}
     private_dns_zones:
       is_primary: true
       networking:
         private_dns_resolver:
           name: pdr-hub-dns-${starter_location_01}
-          resource_group_name: rg-vwan-hub-${starter_location_01}
+          resource_group_name: ${connectivity_resource_group_vnet_primary}
         virtual_network:
           address_space: 10.10.0.0/24
           name: vnet-hub-dns-${starter_location_01}
           private_dns_resolver_subnet:
             address_prefix: 10.10.0.0/28
             name: subnet-hub-dns-${starter_location_01}
-          resource_group_name: rg-vwan-hub-${starter_location_01}
-      resource_group_name: rg-hub-dns-${starter_location_01}
+          resource_group_name: ${connectivity_resource_group_vnet_primary}
+      resource_group_name: ${connectivity_resource_group_dns}
   secondary:
     firewall:
       firewall_policy:
@@ -125,18 +124,18 @@ virtual_wan_virtual_hubs:
       address_prefix: 10.1.0.0/16
       location: ${starter_location_02}
       name: vwan-hub-${starter_location_02}
-      resource_group_name: rg-vwan-hub-${starter_location_02}
+      resource_group_name: ${connectivity_resource_group_vnet_secondary}
     private_dns_zones:
       is_primary: false
       networking:
         private_dns_resolver:
           name: pdr-hub-dns-${starter_location_02}
-          resource_group_name: rg-vwan-hub-${starter_location_02}
+          resource_group_name: ${connectivity_resource_group_vnet_secondary}
         virtual_network:
           address_space: 10.11.0.0/24
           name: vnet-hub-dns-${starter_location_02}
           private_dns_resolver_subnet:
             address_prefix: 10.11.0.0/28
             name: subnet-hub-dns-${starter_location_02}
-          resource_group_name: rg-vwan-hub-${starter_location_02}
-      resource_group_name: rg-hub-dns-${starter_location_01}
+          resource_group_name: ${connectivity_resource_group_vnet_secondary}
+      resource_group_name: ${connectivity_resource_group_dns}
diff --git a/docs/wiki/examples/starter-module-config/complete-multi-region/config-virtual-wan-single-region.yaml b/docs/wiki/examples/starter-module-config/complete-multi-region/config-virtual-wan-single-region.yaml
index 570f128..6d90fa7 100644
--- a/docs/wiki/examples/starter-module-config/complete-multi-region/config-virtual-wan-single-region.yaml
+++ b/docs/wiki/examples/starter-module-config/complete-multi-region/config-virtual-wan-single-region.yaml
@@ -32,14 +32,14 @@ management_settings_es:
         azurerm_network_ddos_protection_plan:
           ddos:
             ${starter_location_01}:
-              name: ddos-${starter_location_01}
+              name: ddos-hub-${starter_location_01}
         azurerm_resource_group:
           ddos:
             ${starter_location_01}:
-              name: rg-ddos-${starter_location_01}
+              name: ${connectivity_resource_group_ddos}
           dns:
             ${starter_location_01}:
-              name: rg-dns-${starter_location_01}
+              name: ${connectivity_resource_group_dns}
     settings:
       ddos_protection_plan:
         config:
@@ -73,15 +73,14 @@ management_settings_es:
   subscription_id_connectivity: ${subscription_id_connectivity}
   subscription_id_identity: ${subscription_id_identity}
   subscription_id_management: ${subscription_id_management}
-management_use_avm: false
 virtual_wan_settings:
   ddos_protection_plan:
     location: ${starter_location_01}
     name: ddos-hub-${starter_location_01}
-    resource_group_name: rg-hub-ddos-${starter_location_01}
+    resource_group_name: ${connectivity_resource_group_ddos}
   location: ${starter_location_01}
   name: vwan-hub-${starter_location_01}
-  resource_group_name: rg-vwan-${starter_location_01}
+  resource_group_name: ${connectivity_resource_group_vwan}
 virtual_wan_virtual_hubs:
   primary:
     firewall:
@@ -95,18 +94,18 @@ virtual_wan_virtual_hubs:
       address_prefix: 10.0.0.0/16
       location: ${starter_location_01}
       name: vwan-hub-${starter_location_01}
-      resource_group_name: rg-vwan-hub-${starter_location_01}
+      resource_group_name: ${connectivity_resource_group_vnet_primary}
     private_dns_zones:
       is_primary: true
       networking:
         private_dns_resolver:
           name: pdr-hub-dns-${starter_location_01}
-          resource_group_name: rg-vwan-hub-${starter_location_01}
+          resource_group_name: ${connectivity_resource_group_vnet_primary}
         virtual_network:
           address_space: 10.10.0.0/24
           name: vnet-hub-dns-${starter_location_01}
           private_dns_resolver_subnet:
             address_prefix: 10.10.0.0/28
             name: subnet-hub-dns-${starter_location_01}
-          resource_group_name: rg-vwan-hub-${starter_location_01}
-      resource_group_name: rg-hub-dns-${starter_location_01}
+          resource_group_name: ${connectivity_resource_group_vnet_primary}
+      resource_group_name: ${connectivity_resource_group_dns}