diff --git a/src/terraform/modules/bastion/main.tf b/src/terraform/modules/bastion/main.tf
index 7d880835f..77205bd0c 100644
--- a/src/terraform/modules/bastion/main.tf
+++ b/src/terraform/modules/bastion/main.tf
@@ -23,6 +23,7 @@ resource "azurerm_public_ip" "bastion_host_pip" {
   resource_group_name = data.azurerm_resource_group.bastion_host_rg.name
   allocation_method   = "Static"
   sku                 = "Standard"
+  availability_zone   = "No-Zone"
   tags                = var.tags
 }
 
diff --git a/src/terraform/modules/firewall/main.tf b/src/terraform/modules/firewall/main.tf
index 702b84463..88f20ca6b 100644
--- a/src/terraform/modules/firewall/main.tf
+++ b/src/terraform/modules/firewall/main.tf
@@ -27,6 +27,7 @@ resource "azurerm_public_ip" "fw_client_pip" {
   resource_group_name = data.azurerm_resource_group.hub.name
   allocation_method   = "Static"
   sku                 = "Standard"
+  availability_zone   = "No-Zone"
   tags                = var.tags
 }
 
@@ -36,6 +37,7 @@ resource "azurerm_public_ip" "fw_mgmt_pip" {
   resource_group_name = data.azurerm_resource_group.hub.name
   allocation_method   = "Static"
   sku                 = "Standard"
+  availability_zone   = "No-Zone"
   tags                = var.tags
 }