diff --git a/.github/workflows/standalone-networking.json b/.github/workflows/standalone-networking.json
index 0243fe4723..b8fa6a9247 100644
--- a/.github/workflows/standalone-networking.json
+++ b/.github/workflows/standalone-networking.json
@@ -1,5 +1,14 @@
 {
   "config_files": [
+    "networking/app_gateway/100-simple-app-gateway",
+    "networking/app_gateway/101-private-public",
+    "networking/app_gateway/102-waf-policy",
+    "networking/app_gateway/103-public-only",
+    "networking/app_gateway/209-agw-with-keyvault-ssl-policy",
+    "networking/app_gateway/210-agw-with-keyvault",
+    "networking/app_gateway/211-agw-with-ssl-redirect",
+    "networking/app_gateway/301-agw-v1",
+    "networking/app_gateway/302-listener-ssl-policy",
     "networking/bastion/100-bastion-with-vm",
     "networking/cdn/100-simple-cdn",
     "networking/dns_zones/100-simple-dns_zone",
diff --git a/.github/workflows/standalone-scenarios.json b/.github/workflows/standalone-scenarios.json
index e4762f6090..29104fbbc0 100644
--- a/.github/workflows/standalone-scenarios.json
+++ b/.github/workflows/standalone-scenarios.json
@@ -2,14 +2,6 @@
   "config_files": [
     "app_config/100-simple",
     "app_config/101-private-link",
-    "app_gateway/100-simple-app-gateway",
-    "app_gateway/101-private-public",
-    "app_gateway/102-waf-policy",
-    "app_gateway/103-public-only",
-    "app_gateway/210-agw-with-keyvault",
-    "app_gateway/211-agw-with-ssl-redirect",
-    "app_gateway/301-agw-v1",
-    "app_gateway/302-listener-ssl-policy",
     "app_insights/100-all-attributes",
     "app_insights/100-simple",
     "app_insights/102-workspace-based-central-logs",
diff --git a/examples/app_gateway/100-simple-app-gateway/application.tfvars b/examples/networking/app_gateway/100-simple-app-gateway/application.tfvars
similarity index 100%
rename from examples/app_gateway/100-simple-app-gateway/application.tfvars
rename to examples/networking/app_gateway/100-simple-app-gateway/application.tfvars
diff --git a/examples/app_gateway/100-simple-app-gateway/configuration.tfvars b/examples/networking/app_gateway/100-simple-app-gateway/configuration.tfvars
similarity index 100%
rename from examples/app_gateway/100-simple-app-gateway/configuration.tfvars
rename to examples/networking/app_gateway/100-simple-app-gateway/configuration.tfvars
diff --git a/examples/app_gateway/100-simple-app-gateway/network_security_group_definition.tfvars b/examples/networking/app_gateway/100-simple-app-gateway/network_security_group_definition.tfvars
similarity index 100%
rename from examples/app_gateway/100-simple-app-gateway/network_security_group_definition.tfvars
rename to examples/networking/app_gateway/100-simple-app-gateway/network_security_group_definition.tfvars
diff --git a/examples/app_gateway/101-private-public/application.tfvars b/examples/networking/app_gateway/101-private-public/application.tfvars
similarity index 100%
rename from examples/app_gateway/101-private-public/application.tfvars
rename to examples/networking/app_gateway/101-private-public/application.tfvars
diff --git a/examples/app_gateway/101-private-public/application_gateways.tfvars b/examples/networking/app_gateway/101-private-public/application_gateways.tfvars
similarity index 100%
rename from examples/app_gateway/101-private-public/application_gateways.tfvars
rename to examples/networking/app_gateway/101-private-public/application_gateways.tfvars
diff --git a/examples/app_gateway/101-private-public/configuration.tfvars b/examples/networking/app_gateway/101-private-public/configuration.tfvars
similarity index 100%
rename from examples/app_gateway/101-private-public/configuration.tfvars
rename to examples/networking/app_gateway/101-private-public/configuration.tfvars
diff --git a/examples/app_gateway/101-private-public/network_security_group_definition.tfvars b/examples/networking/app_gateway/101-private-public/network_security_group_definition.tfvars
similarity index 100%
rename from examples/app_gateway/101-private-public/network_security_group_definition.tfvars
rename to examples/networking/app_gateway/101-private-public/network_security_group_definition.tfvars
diff --git a/examples/app_gateway/101-private-public/virtual_network.tfvars b/examples/networking/app_gateway/101-private-public/virtual_network.tfvars
similarity index 100%
rename from examples/app_gateway/101-private-public/virtual_network.tfvars
rename to examples/networking/app_gateway/101-private-public/virtual_network.tfvars
diff --git a/examples/app_gateway/102-waf-policy/application.tfvars b/examples/networking/app_gateway/102-waf-policy/application.tfvars
similarity index 100%
rename from examples/app_gateway/102-waf-policy/application.tfvars
rename to examples/networking/app_gateway/102-waf-policy/application.tfvars
diff --git a/examples/app_gateway/102-waf-policy/application_gateway.tfvars b/examples/networking/app_gateway/102-waf-policy/application_gateway.tfvars
similarity index 100%
rename from examples/app_gateway/102-waf-policy/application_gateway.tfvars
rename to examples/networking/app_gateway/102-waf-policy/application_gateway.tfvars
diff --git a/examples/app_gateway/102-waf-policy/configuration.tfvars b/examples/networking/app_gateway/102-waf-policy/configuration.tfvars
similarity index 100%
rename from examples/app_gateway/102-waf-policy/configuration.tfvars
rename to examples/networking/app_gateway/102-waf-policy/configuration.tfvars
diff --git a/examples/app_gateway/102-waf-policy/network_security_group_definition.tfvars b/examples/networking/app_gateway/102-waf-policy/network_security_group_definition.tfvars
similarity index 100%
rename from examples/app_gateway/102-waf-policy/network_security_group_definition.tfvars
rename to examples/networking/app_gateway/102-waf-policy/network_security_group_definition.tfvars
diff --git a/examples/app_gateway/102-waf-policy/waf.tfvars b/examples/networking/app_gateway/102-waf-policy/waf.tfvars
similarity index 100%
rename from examples/app_gateway/102-waf-policy/waf.tfvars
rename to examples/networking/app_gateway/102-waf-policy/waf.tfvars
diff --git a/examples/app_gateway/103-public-only/application.tfvars b/examples/networking/app_gateway/103-public-only/application.tfvars
similarity index 100%
rename from examples/app_gateway/103-public-only/application.tfvars
rename to examples/networking/app_gateway/103-public-only/application.tfvars
diff --git a/examples/app_gateway/103-public-only/configuration.tfvars b/examples/networking/app_gateway/103-public-only/configuration.tfvars
similarity index 100%
rename from examples/app_gateway/103-public-only/configuration.tfvars
rename to examples/networking/app_gateway/103-public-only/configuration.tfvars
diff --git a/examples/app_gateway/103-public-only/network_security_group_definition.tfvars b/examples/networking/app_gateway/103-public-only/network_security_group_definition.tfvars
similarity index 100%
rename from examples/app_gateway/103-public-only/network_security_group_definition.tfvars
rename to examples/networking/app_gateway/103-public-only/network_security_group_definition.tfvars
diff --git a/examples/app_gateway/210-agw-with-keyvault/application.tfvars b/examples/networking/app_gateway/209-agw-with-keyvault-ssl-policy/application.tfvars
similarity index 100%
rename from examples/app_gateway/210-agw-with-keyvault/application.tfvars
rename to examples/networking/app_gateway/209-agw-with-keyvault-ssl-policy/application.tfvars
diff --git a/examples/networking/app_gateway/209-agw-with-keyvault-ssl-policy/application_gateways.tfvars b/examples/networking/app_gateway/209-agw-with-keyvault-ssl-policy/application_gateways.tfvars
new file mode 100644
index 0000000000..791788628c
--- /dev/null
+++ b/examples/networking/app_gateway/209-agw-with-keyvault-ssl-policy/application_gateways.tfvars
@@ -0,0 +1,65 @@
+application_gateways = {
+  agw1_az1 = {
+    resource_group_key = "rg_region1"
+    name               = "app_gateway_example"
+    vnet_key           = "vnet_region1"
+    subnet_key         = "app_gateway_private"
+    sku_name           = "Standard_v2"
+    sku_tier           = "Standard_v2"
+    capacity = {
+      autoscale = {
+        minimum_scale_unit = 0
+        maximum_scale_unit = 10
+      }
+    }
+    zones        = ["1"]
+    enable_http2 = true
+
+    identity = {
+      managed_identity_keys = [
+        "apgw_keyvault_secrets"
+      ]
+    }
+
+    # Force TLSv1.2 minimum and secure cyphers
+    # https://docs.microsoft.com/en-us/azure/application-gateway/application-gateway-ssl-policy-overview#predefined-tls-policy
+    ssl_policy = {
+      policy_type = "Predefined"
+      policy_name = "AppGwSslPolicy20170401S"
+    }
+
+    front_end_ip_configurations = {
+      public = {
+        name          = "public"
+        public_ip_key = "example_agw_pip1_rg1"
+        subnet_key    = "app_gateway_public"
+      }
+      private = {
+        name                          = "private"
+        vnet_key                      = "vnet_region1"
+        subnet_key                    = "app_gateway_private"
+        subnet_cidr_index             = 0 # It is possible to have more than one cidr block per subnet
+        private_ip_offset             = 4 # e.g. cidrhost(10.10.0.0/25,4) = 10.10.0.4 => AGW private IP address
+        private_ip_address_allocation = "Static"
+      }
+    }
+
+    front_end_ports = {
+      80 = {
+        name     = "http-80"
+        port     = 80
+        protocol = "Http"
+      }
+      443 = {
+        name     = "https-443"
+        port     = 443
+        protocol = "Https"
+      }
+      4431 = {
+        name     = "https-4431"
+        port     = 4431
+        protocol = "Https"
+      }
+    }
+  }
+}
diff --git a/examples/app_gateway/210-agw-with-keyvault/certificates.tfvars b/examples/networking/app_gateway/209-agw-with-keyvault-ssl-policy/certificates.tfvars
similarity index 100%
rename from examples/app_gateway/210-agw-with-keyvault/certificates.tfvars
rename to examples/networking/app_gateway/209-agw-with-keyvault-ssl-policy/certificates.tfvars
diff --git a/examples/app_gateway/210-agw-with-keyvault/configuration.tfvars b/examples/networking/app_gateway/209-agw-with-keyvault-ssl-policy/configuration.tfvars
similarity index 100%
rename from examples/app_gateway/210-agw-with-keyvault/configuration.tfvars
rename to examples/networking/app_gateway/209-agw-with-keyvault-ssl-policy/configuration.tfvars
diff --git a/examples/app_gateway/210-agw-with-keyvault/keyvaults.tfvars b/examples/networking/app_gateway/209-agw-with-keyvault-ssl-policy/keyvaults.tfvars
similarity index 100%
rename from examples/app_gateway/210-agw-with-keyvault/keyvaults.tfvars
rename to examples/networking/app_gateway/209-agw-with-keyvault-ssl-policy/keyvaults.tfvars
diff --git a/examples/app_gateway/210-agw-with-keyvault/managed_identities.tfvars b/examples/networking/app_gateway/209-agw-with-keyvault-ssl-policy/managed_identities.tfvars
similarity index 100%
rename from examples/app_gateway/210-agw-with-keyvault/managed_identities.tfvars
rename to examples/networking/app_gateway/209-agw-with-keyvault-ssl-policy/managed_identities.tfvars
diff --git a/examples/app_gateway/210-agw-with-keyvault/nsg_definition.tfvars b/examples/networking/app_gateway/209-agw-with-keyvault-ssl-policy/nsg_definition.tfvars
similarity index 100%
rename from examples/app_gateway/210-agw-with-keyvault/nsg_definition.tfvars
rename to examples/networking/app_gateway/209-agw-with-keyvault-ssl-policy/nsg_definition.tfvars
diff --git a/examples/app_gateway/210-agw-with-keyvault/public_ip_addresses.tfvars b/examples/networking/app_gateway/209-agw-with-keyvault-ssl-policy/public_ip_addresses.tfvars
similarity index 100%
rename from examples/app_gateway/210-agw-with-keyvault/public_ip_addresses.tfvars
rename to examples/networking/app_gateway/209-agw-with-keyvault-ssl-policy/public_ip_addresses.tfvars
diff --git a/examples/app_gateway/210-agw-with-keyvault/virtual_network.tfvars b/examples/networking/app_gateway/209-agw-with-keyvault-ssl-policy/virtual_network.tfvars
similarity index 100%
rename from examples/app_gateway/210-agw-with-keyvault/virtual_network.tfvars
rename to examples/networking/app_gateway/209-agw-with-keyvault-ssl-policy/virtual_network.tfvars
diff --git a/examples/networking/app_gateway/210-agw-with-keyvault/application.tfvars b/examples/networking/app_gateway/210-agw-with-keyvault/application.tfvars
new file mode 100644
index 0000000000..228eac8d78
--- /dev/null
+++ b/examples/networking/app_gateway/210-agw-with-keyvault/application.tfvars
@@ -0,0 +1,73 @@
+application_gateway_applications = {
+  demo_app1_az1_agw1 = {
+
+    name                    = "demoapp1"
+    application_gateway_key = "agw1_az1"
+
+    listeners = {
+      private = {
+        name                           = "demoapp1-80-private"
+        front_end_ip_configuration_key = "private"
+        front_end_port_key             = "80"
+        host_name                      = "demoapp1.cafdemo.com"
+        request_routing_rule_key       = "default0"
+      }
+      private_ssl = {
+        name                           = "demoapp1-443-private"
+        front_end_ip_configuration_key = "private"
+        front_end_port_key             = "443"
+        host_name                      = "demoapp1.cafdemo.com"
+        request_routing_rule_key       = "default1"
+        keyvault_certificate = {
+          certificate_key = "demoapp1.cafdemo.com"
+          // To use manual uploaded cert
+          # certificate_name = "testkhairi"
+          # keyvault_key     = "certificates"
+          #  keyvault_id     = "/subscriptions/97958dac-xxxx-xxxx-xxxx-9f436fa73bd4/resourceGroups/jmtv-rg-example-app-gateway-re1/providers/Microsoft.KeyVault/vaults/jmtv-kv-certs"
+        }
+      }
+      public_ssl = {
+        name                           = "demoapp1-4431-public"
+        front_end_ip_configuration_key = "public"
+        front_end_port_key             = "4431"
+        host_name                      = "demoapp1.cafdemo.com"
+        request_routing_rule_key       = "default2"
+        keyvault_certificate = {
+          certificate_key = "demoapp1.cafdemo.com"
+          // To use manual uploaded cert
+          # certificate_name = "testkhairi"
+          # keyvault_id     = "/subscriptions/97958dac-xxxx-xxxx-xxxx-9f436fa73bd4/resourceGroups/jmtv-rg-example-app-gateway-re1/providers/Microsoft.KeyVault/vaults/jmtv-kv-certs"
+        }
+      }
+    }
+
+
+    request_routing_rules = {
+      default0 = {
+        rule_type = "Basic"
+        priority  = 10
+      }
+      default1 = {
+        rule_type = "Basic"
+        priority  = 11
+      }
+      default2 = {
+        rule_type = "Basic"
+        priority  = 12
+      }
+    }
+
+    backend_http_setting = {
+      port                                = 443
+      protocol                            = "Https"
+      pick_host_name_from_backend_address = true
+    }
+
+    backend_pool = {
+      fqdns = [
+        "cafdemo.appserviceenvironment.net"
+      ]
+    }
+
+  }
+}
\ No newline at end of file
diff --git a/examples/app_gateway/210-agw-with-keyvault/application_gateways.tfvars b/examples/networking/app_gateway/210-agw-with-keyvault/application_gateways.tfvars
similarity index 100%
rename from examples/app_gateway/210-agw-with-keyvault/application_gateways.tfvars
rename to examples/networking/app_gateway/210-agw-with-keyvault/application_gateways.tfvars
diff --git a/examples/app_gateway/211-agw-with-ssl-redirect/certificates.tfvars b/examples/networking/app_gateway/210-agw-with-keyvault/certificates.tfvars
similarity index 100%
rename from examples/app_gateway/211-agw-with-ssl-redirect/certificates.tfvars
rename to examples/networking/app_gateway/210-agw-with-keyvault/certificates.tfvars
diff --git a/examples/app_gateway/211-agw-with-ssl-redirect/configuration.tfvars b/examples/networking/app_gateway/210-agw-with-keyvault/configuration.tfvars
similarity index 100%
rename from examples/app_gateway/211-agw-with-ssl-redirect/configuration.tfvars
rename to examples/networking/app_gateway/210-agw-with-keyvault/configuration.tfvars
diff --git a/examples/app_gateway/211-agw-with-ssl-redirect/keyvaults.tfvars b/examples/networking/app_gateway/210-agw-with-keyvault/keyvaults.tfvars
similarity index 100%
rename from examples/app_gateway/211-agw-with-ssl-redirect/keyvaults.tfvars
rename to examples/networking/app_gateway/210-agw-with-keyvault/keyvaults.tfvars
diff --git a/examples/app_gateway/211-agw-with-ssl-redirect/managed_identities.tfvars b/examples/networking/app_gateway/210-agw-with-keyvault/managed_identities.tfvars
similarity index 100%
rename from examples/app_gateway/211-agw-with-ssl-redirect/managed_identities.tfvars
rename to examples/networking/app_gateway/210-agw-with-keyvault/managed_identities.tfvars
diff --git a/examples/app_gateway/211-agw-with-ssl-redirect/nsg_definition.tfvars b/examples/networking/app_gateway/210-agw-with-keyvault/nsg_definition.tfvars
similarity index 100%
rename from examples/app_gateway/211-agw-with-ssl-redirect/nsg_definition.tfvars
rename to examples/networking/app_gateway/210-agw-with-keyvault/nsg_definition.tfvars
diff --git a/examples/app_gateway/211-agw-with-ssl-redirect/public_ip_addresses.tfvars b/examples/networking/app_gateway/210-agw-with-keyvault/public_ip_addresses.tfvars
similarity index 100%
rename from examples/app_gateway/211-agw-with-ssl-redirect/public_ip_addresses.tfvars
rename to examples/networking/app_gateway/210-agw-with-keyvault/public_ip_addresses.tfvars
diff --git a/examples/app_gateway/211-agw-with-ssl-redirect/virtual_network.tfvars b/examples/networking/app_gateway/210-agw-with-keyvault/virtual_network.tfvars
similarity index 100%
rename from examples/app_gateway/211-agw-with-ssl-redirect/virtual_network.tfvars
rename to examples/networking/app_gateway/210-agw-with-keyvault/virtual_network.tfvars
diff --git a/examples/app_gateway/211-agw-with-ssl-redirect/application.tfvars b/examples/networking/app_gateway/211-agw-with-ssl-redirect/application.tfvars
similarity index 100%
rename from examples/app_gateway/211-agw-with-ssl-redirect/application.tfvars
rename to examples/networking/app_gateway/211-agw-with-ssl-redirect/application.tfvars
diff --git a/examples/app_gateway/211-agw-with-ssl-redirect/application_gateways.tfvars b/examples/networking/app_gateway/211-agw-with-ssl-redirect/application_gateways.tfvars
similarity index 100%
rename from examples/app_gateway/211-agw-with-ssl-redirect/application_gateways.tfvars
rename to examples/networking/app_gateway/211-agw-with-ssl-redirect/application_gateways.tfvars
diff --git a/examples/networking/app_gateway/211-agw-with-ssl-redirect/certificates.tfvars b/examples/networking/app_gateway/211-agw-with-ssl-redirect/certificates.tfvars
new file mode 100644
index 0000000000..a33e22dd73
--- /dev/null
+++ b/examples/networking/app_gateway/211-agw-with-ssl-redirect/certificates.tfvars
@@ -0,0 +1,85 @@
+keyvault_certificates = {
+  "demoapp1.cafdemo.com" = {
+
+    keyvault_key = "certificates"
+
+    # may only contain alphanumeric characters and dashes
+    name = "demoapp1-cafdemo-com"
+
+    subject            = "CN=demoapp1"
+    validity_in_months = 12
+
+    subject_alternative_names = {
+      #  A list of alternative DNS names (FQDNs) identified by the Certificate.
+      # Changing this forces a new resource to be created.
+      dns_names = [
+        "demoapp1.cafdemo.com"
+      ]
+
+      # A list of email addresses identified by this Certificate.
+      # Changing this forces a new resource to be created.
+      # emails = []
+
+      # A list of User Principal Names identified by the Certificate.
+      # Changing this forces a new resource to be created.
+      # upns = []
+    }
+
+    tags = {
+      type = "SelfSigned"
+    }
+
+    # Possible values include Self (for self-signed certificate),
+    # or Unknown (for a certificate issuing authority like Let's Encrypt
+    # and Azure direct supported ones).
+    # Changing this forces a new resource to be created
+    issuer_parameters = "Self"
+
+    exportable = true
+
+    # Possible values include 2048 and 4096.
+    # Changing this forces a new resource to be created.
+    key_size  = 4096
+    key_type  = "RSA"
+    reuse_key = true
+
+    # The Type of action to be performed when the lifetime trigger is triggered.
+    # Possible values include AutoRenew and EmailContacts.
+    # Changing this forces a new resource to be created.
+    action_type = "AutoRenew"
+
+    # The number of days before the Certificate expires that the action
+    # associated with this Trigger should run.
+    # Changing this forces a new resource to be created.
+    # Conflicts with lifetime_percentage
+    days_before_expiry = 30
+
+
+    # The percentage at which during the Certificates Lifetime the action
+    # associated with this Trigger should run.
+    # Changing this forces a new resource to be created.
+    # Conflicts with days_before_expiry
+    # lifetime_percentage = 90
+
+    # The Content-Type of the Certificate, such as application/x-pkcs12 for a PFX
+    # or application/x-pem-file for a PEM.
+    # Changing this forces a new resource to be created.
+    content_type = "application/x-pkcs12"
+
+    # A list of uses associated with this Key.
+    # Possible values include
+    # cRLSign, dataEncipherment, decipherOnly,
+    # digitalSignature, encipherOnly, keyAgreement, keyCertSign,
+    # keyEncipherment and nonRepudiation
+    # and are case-sensitive.
+    # Changing this forces a new resource to be created
+    key_usage = [
+      "cRLSign",
+      "dataEncipherment",
+      "digitalSignature",
+      "keyAgreement",
+      "keyCertSign",
+      "keyEncipherment",
+    ]
+  }
+}
\ No newline at end of file
diff --git a/examples/networking/app_gateway/211-agw-with-ssl-redirect/configuration.tfvars b/examples/networking/app_gateway/211-agw-with-ssl-redirect/configuration.tfvars
new file mode 100644
index 0000000000..6f633de8db
--- /dev/null
+++ b/examples/networking/app_gateway/211-agw-with-ssl-redirect/configuration.tfvars
@@ -0,0 +1,17 @@
+
+global_settings = {
+  default_region = "region1"
+  regions = {
+    region1 = "australiaeast"
+  }
+}
+
+resource_groups = {
+  rg_region1 = {
+    name = "example-app-gateway-re1"
+  }
+}
+
+
+
+
diff --git a/examples/networking/app_gateway/211-agw-with-ssl-redirect/keyvaults.tfvars b/examples/networking/app_gateway/211-agw-with-ssl-redirect/keyvaults.tfvars
new file mode 100644
index 0000000000..de7fd97830
--- /dev/null
+++ b/examples/networking/app_gateway/211-agw-with-ssl-redirect/keyvaults.tfvars
@@ -0,0 +1,26 @@
+keyvaults = {
+  certificates = {
+    name               = "certs"
+    resource_group_key = "rg_region1"
+    sku_name           = "standard"
+
+    enabled_for_deployment = true
+
+    creation_policies = {
+      logged_in_user = {
+        certificate_permissions = ["Get", "List", "Update", "Create", "Import", "Delete", "Purge", "Recover"]
+        secret_permissions      = ["Set", "Get", "List", "Delete", "Purge", "Recover"]
+      }
+    }
+  }
+}
+
+keyvault_access_policies = {
+  certificates = {
+    apgw_keyvault_secrets = {
+      managed_identity_key    = "apgw_keyvault_secrets"
+      certificate_permissions = ["Get"]
+      secret_permissions      = ["Get"]
+    }
+  }
+}
\ No newline at end of file
diff --git a/examples/networking/app_gateway/211-agw-with-ssl-redirect/managed_identities.tfvars b/examples/networking/app_gateway/211-agw-with-ssl-redirect/managed_identities.tfvars
new file mode 100644
index 0000000000..494522294e
--- /dev/null
+++ b/examples/networking/app_gateway/211-agw-with-ssl-redirect/managed_identities.tfvars
@@ -0,0 +1,6 @@
+managed_identities = {
+  apgw_keyvault_secrets = {
+    name               = "agw-secrets-msi"
+    resource_group_key = "rg_region1"
+  }
+}
diff --git a/examples/networking/app_gateway/211-agw-with-ssl-redirect/nsg_definition.tfvars b/examples/networking/app_gateway/211-agw-with-ssl-redirect/nsg_definition.tfvars
new file mode 100644
index 0000000000..ea615f13ee
--- /dev/null
+++ b/examples/networking/app_gateway/211-agw-with-ssl-redirect/nsg_definition.tfvars
@@ -0,0 +1,65 @@
+#
+# Definition of the networking security groups
+#
+network_security_group_definition = {
+  # This entry is applied to all subnets with no NSG defined
+  empty_nsg = {
+    nsg = []
+  }
+
+  application_gateway = {
+
+    nsg = [
+      {
+        name                       = "Inbound-HTTP",
+        priority                   = "120"
+        direction                  = "Inbound"
+        access                     = "Allow"
+        protocol                   = "*"
+        source_port_range          = "*"
+        destination_port_range     = "80-82"
+        source_address_prefix      = "*"
+        destination_address_prefix = "*"
+      },
+      {
+        name                       = "Inbound-HTTPs",
+        priority                   = "130"
+        direction                  = "Inbound"
+        access                     = "Allow"
+        protocol                   = "*"
+        source_port_range          = "*"
+        destination_port_range     = "443"
+        source_address_prefix      = "*"
+        destination_address_prefix = "*"
+      },
+      {
+        name                       = "Inbound-AGW",
+        priority                   = "140"
+        direction                  = "Inbound"
+        access                     = "Allow"
+        protocol                   = "*"
+        source_port_range          = "*"
+        destination_port_range     = "65200-65535"
+        source_address_prefix      = "*"
+        destination_address_prefix = "*"
+      },
+    ]
+  }
+
+  application_gateway_public_ingress = {
+
+    nsg = [
+      {
+        name                       = "Inbound-HTTPs",
+        priority                   = "130"
+        direction                  = "Inbound"
+        access                     = "Allow"
+        protocol                   = "*"
+        source_port_range          = "*"
+        destination_port_range     = "443"
+        source_address_prefix      = "*"
+        destination_address_prefix = "*"
+      },
+    ]
+  }
+}
diff --git a/examples/networking/app_gateway/211-agw-with-ssl-redirect/public_ip_addresses.tfvars b/examples/networking/app_gateway/211-agw-with-ssl-redirect/public_ip_addresses.tfvars
new file mode 100644
index 0000000000..6faf3d6afa
--- /dev/null
+++ b/examples/networking/app_gateway/211-agw-with-ssl-redirect/public_ip_addresses.tfvars
@@ -0,0 +1,12 @@
+public_ip_addresses = {
+  example_agw_pip1_rg1 = {
+    name                    = "example_agw_pip1"
+    resource_group_key      = "rg_region1"
+    sku                     = "Standard"
+    allocation_method       = "Static"
+    ip_version              = "IPv4"
+    zones                   = ["1"]
+    idle_timeout_in_minutes = "4"
+
+  }
+}
\ No newline at end of file
diff --git a/examples/networking/app_gateway/211-agw-with-ssl-redirect/virtual_network.tfvars b/examples/networking/app_gateway/211-agw-with-ssl-redirect/virtual_network.tfvars
new file mode 100644
index 0000000000..3d770565d1
--- /dev/null
+++ b/examples/networking/app_gateway/211-agw-with-ssl-redirect/virtual_network.tfvars
@@ -0,0 +1,23 @@
+vnets = {
+  vnet_region1 = {
+    resource_group_key = "rg_region1"
+    vnet = {
+      name          = "app_gateway"
+      address_space = ["10.100.100.0/24"]
+    }
+    specialsubnets = {}
+    subnets = {
+      app_gateway_private = {
+        name    = "app_gateway-private"
+        cidr    = ["10.100.100.0/25"]
+        nsg_key = "application_gateway"
+      }
+      app_gateway_public = {
+        name    = "app_gateway-public"
+        cidr    = ["10.100.100.128/25"]
+        nsg_key = "application_gateway_public_ingress"
+      }
+    }
+
+  }
+}
\ No newline at end of file
diff --git a/examples/app_gateway/301-agw-v1/agw_application.tfvars b/examples/networking/app_gateway/301-agw-v1/agw_application.tfvars
similarity index 100%
rename from examples/app_gateway/301-agw-v1/agw_application.tfvars
rename to examples/networking/app_gateway/301-agw-v1/agw_application.tfvars
diff --git a/examples/app_gateway/301-agw-v1/agw_platform.tfvars b/examples/networking/app_gateway/301-agw-v1/agw_platform.tfvars
similarity index 100%
rename from examples/app_gateway/301-agw-v1/agw_platform.tfvars
rename to examples/networking/app_gateway/301-agw-v1/agw_platform.tfvars
diff --git a/examples/app_gateway/301-agw-v1/certificates.tfvars b/examples/networking/app_gateway/301-agw-v1/certificates.tfvars
similarity index 100%
rename from examples/app_gateway/301-agw-v1/certificates.tfvars
rename to examples/networking/app_gateway/301-agw-v1/certificates.tfvars
diff --git a/examples/app_gateway/301-agw-v1/configuration.tfvars b/examples/networking/app_gateway/301-agw-v1/configuration.tfvars
similarity index 100%
rename from examples/app_gateway/301-agw-v1/configuration.tfvars
rename to examples/networking/app_gateway/301-agw-v1/configuration.tfvars
diff --git a/examples/app_gateway/301-agw-v1/keyvaults.tfvars b/examples/networking/app_gateway/301-agw-v1/keyvaults.tfvars
similarity index 100%
rename from examples/app_gateway/301-agw-v1/keyvaults.tfvars
rename to examples/networking/app_gateway/301-agw-v1/keyvaults.tfvars
diff --git a/examples/app_gateway/301-agw-v1/managed_identities.tfvars b/examples/networking/app_gateway/301-agw-v1/managed_identities.tfvars
similarity index 100%
rename from examples/app_gateway/301-agw-v1/managed_identities.tfvars
rename to examples/networking/app_gateway/301-agw-v1/managed_identities.tfvars
diff --git a/examples/app_gateway/301-agw-v1/network_security_group_definition.tfvars b/examples/networking/app_gateway/301-agw-v1/network_security_group_definition.tfvars
similarity index 100%
rename from examples/app_gateway/301-agw-v1/network_security_group_definition.tfvars
rename to examples/networking/app_gateway/301-agw-v1/network_security_group_definition.tfvars
diff --git a/examples/app_gateway/301-agw-v1/networking.tfvars b/examples/networking/app_gateway/301-agw-v1/networking.tfvars
similarity index 100%
rename from examples/app_gateway/301-agw-v1/networking.tfvars
rename to examples/networking/app_gateway/301-agw-v1/networking.tfvars
diff --git a/examples/app_gateway/302-listener-ssl-policy/agw_application.tfvars b/examples/networking/app_gateway/302-listener-ssl-policy/agw_application.tfvars
similarity index 100%
rename from examples/app_gateway/302-listener-ssl-policy/agw_application.tfvars
rename to examples/networking/app_gateway/302-listener-ssl-policy/agw_application.tfvars
diff --git a/examples/app_gateway/302-listener-ssl-policy/agw_platform.tfvars b/examples/networking/app_gateway/302-listener-ssl-policy/agw_platform.tfvars
similarity index 100%
rename from examples/app_gateway/302-listener-ssl-policy/agw_platform.tfvars
rename to examples/networking/app_gateway/302-listener-ssl-policy/agw_platform.tfvars
diff --git a/examples/app_gateway/302-listener-ssl-policy/certificates.tfvars b/examples/networking/app_gateway/302-listener-ssl-policy/certificates.tfvars
similarity index 100%
rename from examples/app_gateway/302-listener-ssl-policy/certificates.tfvars
rename to examples/networking/app_gateway/302-listener-ssl-policy/certificates.tfvars
diff --git a/examples/app_gateway/302-listener-ssl-policy/configuration.tfvars b/examples/networking/app_gateway/302-listener-ssl-policy/configuration.tfvars
similarity index 100%
rename from examples/app_gateway/302-listener-ssl-policy/configuration.tfvars
rename to examples/networking/app_gateway/302-listener-ssl-policy/configuration.tfvars
diff --git a/examples/app_gateway/302-listener-ssl-policy/keyvaults.tfvars b/examples/networking/app_gateway/302-listener-ssl-policy/keyvaults.tfvars
similarity index 100%
rename from examples/app_gateway/302-listener-ssl-policy/keyvaults.tfvars
rename to examples/networking/app_gateway/302-listener-ssl-policy/keyvaults.tfvars
diff --git a/examples/app_gateway/302-listener-ssl-policy/managed_identities.tfvars b/examples/networking/app_gateway/302-listener-ssl-policy/managed_identities.tfvars
similarity index 100%
rename from examples/app_gateway/302-listener-ssl-policy/managed_identities.tfvars
rename to examples/networking/app_gateway/302-listener-ssl-policy/managed_identities.tfvars
diff --git a/examples/app_gateway/302-listener-ssl-policy/network_security_group_definition.tfvars b/examples/networking/app_gateway/302-listener-ssl-policy/network_security_group_definition.tfvars
similarity index 100%
rename from examples/app_gateway/302-listener-ssl-policy/network_security_group_definition.tfvars
rename to examples/networking/app_gateway/302-listener-ssl-policy/network_security_group_definition.tfvars
diff --git a/examples/app_gateway/302-listener-ssl-policy/networking.tfvars b/examples/networking/app_gateway/302-listener-ssl-policy/networking.tfvars
similarity index 100%
rename from examples/app_gateway/302-listener-ssl-policy/networking.tfvars
rename to examples/networking/app_gateway/302-listener-ssl-policy/networking.tfvars
diff --git a/examples/app_gateway/README.md b/examples/networking/app_gateway/README.md
similarity index 100%
rename from examples/app_gateway/README.md
rename to examples/networking/app_gateway/README.md
diff --git a/examples/app_gateway/main.tf b/examples/networking/app_gateway/main.tf
similarity index 100%
rename from examples/app_gateway/main.tf
rename to examples/networking/app_gateway/main.tf