diff --git a/docs/wiki/Whats-new.md b/docs/wiki/Whats-new.md
index f3f77e9dcc..466bfdf6ee 100644
--- a/docs/wiki/Whats-new.md
+++ b/docs/wiki/Whats-new.md
@@ -49,6 +49,7 @@ Here's what's changed in Enterprise Scale/Azure Landing Zones:
 
 #### Tooling
 
+- Fixed a bug in the portal accelerator experience when deploying a VPN Gateway and Azure Firewall (Basic SKU) - IP address overlap error.
 - Added vWAN Hub Routing Intent support to Portal Accelerator for scenarios that include Azure Firewall deployment
 - Enhanced the ALZ Portal Accelerator to provide the ability to deploy the Azure VPN Gateway in Active/Active mode as per feedback from [#655](https://github.com/Azure/Enterprise-Scale/issues/655).
 
diff --git a/eslzArm/eslz-portal.json b/eslzArm/eslz-portal.json
index 23076d1d6a..b01544e088 100644
--- a/eslzArm/eslz-portal.json
+++ b/eslzArm/eslz-portal.json
@@ -1925,7 +1925,7 @@
                             "type": "Microsoft.Common.TextBox",
                             "label": "Subnet for Azure Firewall Mgmt (Optional Only for Basic SKU)",
                             "toolTip": "Provide address prefix in CIDR notation (e.g 10.100.0.0/26)",
-                            "defaultValue": "10.100.1.0/26",
+                            "defaultValue": "10.100.2.0/24",
                             "visible": "[and(equals(steps('connectivity').enableAzFw, 'Yes'), equals(steps('connectivity').firewallSku, 'Basic'), not(equals(steps('connectivity').enableHub, 'vwan')))]",
                             "constraints": {
                                 "required": true,
diff --git a/eslzArm/subscriptionTemplates/hubspoke-connectivity.json b/eslzArm/subscriptionTemplates/hubspoke-connectivity.json
index 9a0068fcd5..62e4c32f2f 100644
--- a/eslzArm/subscriptionTemplates/hubspoke-connectivity.json
+++ b/eslzArm/subscriptionTemplates/hubspoke-connectivity.json
@@ -548,7 +548,8 @@
                                             "dependsOn": [
                                                 "[concat('Microsoft.Network/firewallPolicies/', variables('azFwPolicyName'))]",
                                                 "[concat('Microsoft.Network/publicIpAddresses/', variables('azFwIpName'))]",
-                                                "[concat('Microsoft.Network/virtualNetworks/', variables('hubName'))]"
+                                                "[concat('Microsoft.Network/virtualNetworks/', variables('hubName'))]",
+                                                "[concat('Microsoft.Network/virtualNetworkGateways/', variables('vpngwname'))]"
                                             ],
                                             "properties": {
                                                 "sku": {