diff --git a/blueprints/networking/ha-vpn-over-interconnect/README.md b/blueprints/networking/ha-vpn-over-interconnect/README.md
index db89d87e..a4b29ca1 100644
--- a/blueprints/networking/ha-vpn-over-interconnect/README.md
+++ b/blueprints/networking/ha-vpn-over-interconnect/README.md
@@ -32,7 +32,7 @@ The two Dedicated Interconnect connections should already exist, either in the s
 | [overlay_config](variables.tf#L24) | Configuration for the overlay resources. | <code title="object&#40;&#123;&#10;  gcp_bgp &#61; object&#40;&#123;&#10;    asn       &#61; number&#10;    name      &#61; optional&#40;string&#41;&#10;    keepalive &#61; optional&#40;number&#41;&#10;    custom_advertise &#61; optional&#40;object&#40;&#123;&#10;      all_subnets &#61; bool&#10;      ip_ranges   &#61; map&#40;string&#41;&#10;    &#125;&#41;&#41;&#10;  &#125;&#41;&#10;  onprem_vpn_gateway &#61; object&#40;&#123;&#10;    redundancy_type &#61; optional&#40;string, &#34;TWO_IPS_REDUNDANCY&#34;&#41;&#10;    interfaces      &#61; list&#40;string&#41;&#10;  &#125;&#41;&#10;  gateways &#61; map&#40;map&#40;object&#40;&#123;&#10;    bgp_peer &#61; object&#40;&#123;&#10;      address        &#61; string&#10;      asn            &#61; number&#10;      route_priority &#61; optional&#40;number, 1000&#41;&#10;      custom_advertise &#61; optional&#40;object&#40;&#123;&#10;        all_subnets          &#61; bool&#10;        all_vpc_subnets      &#61; bool&#10;        all_peer_vpc_subnets &#61; bool&#10;        ip_ranges            &#61; map&#40;string&#41;&#10;      &#125;&#41;&#41;&#10;    &#125;&#41;&#10;    bgp_session_range               &#61; string&#10;    ike_version                     &#61; optional&#40;number, 2&#41;&#10;    peer_external_gateway_interface &#61; optional&#40;number&#41;&#10;    peer_gateway                    &#61; optional&#40;string, &#34;default&#34;&#41;&#10;    router                          &#61; optional&#40;string&#41;&#10;    shared_secret                   &#61; optional&#40;string&#41;&#10;    vpn_gateway_interface           &#61; number&#10;    &#125;&#41;&#41;&#10;  &#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> | ✓ |  |
 | [project_id](variables.tf#L66) | The project id. | <code>string</code> | ✓ |  |
 | [region](variables.tf#L71) | GCP Region. | <code>string</code> | ✓ |  |
-| [underlay_config](variables.tf#L76) | Configuration for the underlay resources. | <code title="object&#40;&#123;&#10;  attachments &#61; map&#40;object&#40;&#123;&#10;    bandwidth              &#61; optional&#40;string, &#34;BPS_10G&#34;&#41;&#10;    base_name              &#61; optional&#40;string, &#34;encrypted-vlan-attachment&#34;&#41;&#10;    bgp_range              &#61; string&#10;    interconnect_self_link &#61; string&#10;    onprem_asn             &#61; number&#10;    vlan_tag               &#61; number&#10;    vpn_gateways_ip_range  &#61; string&#10;  &#125;&#41;&#41;&#10;  gcp_bgp &#61; object&#40;&#123;&#10;    asn &#61; number&#10;  &#125;&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> | ✓ |  |
+| [underlay_config](variables.tf#L76) | Configuration for the underlay resources. | <code title="object&#40;&#123;&#10;  attachments &#61; map&#40;object&#40;&#123;&#10;    bandwidth              &#61; optional&#40;string, &#34;BPS_10G&#34;&#41;&#10;    base_name              &#61; optional&#40;string, &#34;encrypted-vlan-attachment&#34;&#41;&#10;    bgp_range              &#61; string&#10;    interconnect_self_link &#61; string&#10;    onprem_asn             &#61; number&#10;    vlan_tag               &#61; number&#10;    vpn_gateways_ip_range  &#61; string&#10;  &#125;&#41;&#41;&#10;  gcp_bgp &#61; object&#40;&#123;&#10;    asn &#61; number&#10;  &#125;&#41;&#10;  interconnect_type &#61; optional&#40;string, &#34;DEDICATED&#34;&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> | ✓ |  |
 
 ## Outputs
 
diff --git a/blueprints/networking/ha-vpn-over-interconnect/underlay.tf b/blueprints/networking/ha-vpn-over-interconnect/underlay.tf
index 6ad9c450..bb8709cc 100644
--- a/blueprints/networking/ha-vpn-over-interconnect/underlay.tf
+++ b/blueprints/networking/ha-vpn-over-interconnect/underlay.tf
@@ -38,13 +38,16 @@ module "va-a" {
     create = false
     name   = google_compute_router.encrypted-interconnect-underlay-router.name
   }
-  dedicated_interconnect_config = {
+  vpn_gateways_ip_range = var.underlay_config.attachments.a.vpn_gateways_ip_range
+  dedicated_interconnect_config = var.underlay_config.interconnect_type != "DEDICATED" ? null : {
     bandwidth    = var.underlay_config.attachments.a.bandwidth
     bgp_range    = var.underlay_config.attachments.a.bgp_range
     interconnect = var.underlay_config.attachments.a.interconnect_self_link
     vlan_tag     = var.underlay_config.attachments.a.vlan_tag
   }
-  vpn_gateways_ip_range = var.underlay_config.attachments.a.vpn_gateways_ip_range
+  partner_interconnect_config = var.underlay_config.interconnect_type != "PARTNER" ? null : {
+    edge_availability_domain = "zone1"
+  }
 }
 
 module "va-b" {
@@ -59,11 +62,14 @@ module "va-b" {
     create = false
     name   = google_compute_router.encrypted-interconnect-underlay-router.name
   }
-  dedicated_interconnect_config = {
+  vpn_gateways_ip_range = var.underlay_config.attachments.b.vpn_gateways_ip_range
+  dedicated_interconnect_config = var.underlay_config.interconnect_type != "DEDICATED" ? null : {
     bandwidth    = var.underlay_config.attachments.b.bandwidth
     bgp_range    = var.underlay_config.attachments.b.bgp_range
     interconnect = var.underlay_config.attachments.b.interconnect_self_link
     vlan_tag     = var.underlay_config.attachments.b.vlan_tag
   }
-  vpn_gateways_ip_range = var.underlay_config.attachments.b.vpn_gateways_ip_range
+  partner_interconnect_config = var.underlay_config.interconnect_type != "PARTNER" ? null : {
+    edge_availability_domain = "zone2"
+  }
 }
diff --git a/blueprints/networking/ha-vpn-over-interconnect/variables.tf b/blueprints/networking/ha-vpn-over-interconnect/variables.tf
index 163ea1ac..196ef269 100644
--- a/blueprints/networking/ha-vpn-over-interconnect/variables.tf
+++ b/blueprints/networking/ha-vpn-over-interconnect/variables.tf
@@ -88,5 +88,10 @@ variable "underlay_config" {
     gcp_bgp = object({
       asn = number
     })
+    interconnect_type = optional(string, "DEDICATED")
   })
+  validation {
+    condition     = var.underlay_config.interconnect_type == "DEDICATED" || var.underlay_config.interconnect_type == "PARTNER"
+    error_message = "var.underlay_config.interconnect_type must by either \"DEDICATED\" or \"PARTNER\""
+  }
 }