diff --git a/api_app/_version.py b/api_app/_version.py
index 7923a95d33..57a322dfc2 100644
--- a/api_app/_version.py
+++ b/api_app/_version.py
@@ -1 +1 @@
-__version__ = "0.25.16"
+__version__ = "0.25.17"
diff --git a/core/terraform/appgateway/appgateway.tf b/core/terraform/appgateway/appgateway.tf
index 5afcfbb8ab..e029acebba 100644
--- a/core/terraform/appgateway/appgateway.tf
+++ b/core/terraform/appgateway/appgateway.tf
@@ -7,7 +7,7 @@ resource "azurerm_public_ip" "appgwpip" {
   domain_name_label   = var.tre_id
   tags                = local.tre_core_tags
 
-  lifecycle { ignore_changes = [tags, zones] }
+  lifecycle { ignore_changes = [tags, zones, ip_tags] }
 }
 
 resource "azurerm_user_assigned_identity" "agw_id" {
diff --git a/core/terraform/firewall/firewall.tf b/core/terraform/firewall/firewall.tf
index 008fbfabbb..35337cf7a1 100644
--- a/core/terraform/firewall/firewall.tf
+++ b/core/terraform/firewall/firewall.tf
@@ -7,7 +7,7 @@ resource "azurerm_public_ip" "fwtransit" {
   sku                 = "Standard"
   tags                = var.tre_core_tags
 
-  lifecycle { ignore_changes = [tags, zones] }
+  lifecycle { ignore_changes = [tags, zones, ip_tags] }
 }
 
 moved {
diff --git a/core/version.txt b/core/version.txt
index 54ea27795b..12d80d0630 100644
--- a/core/version.txt
+++ b/core/version.txt
@@ -1 +1 @@
-__version__ = "0.16.16"
+__version__ = "0.16.17"
diff --git a/e2e_tests/conftest.py b/e2e_tests/conftest.py
index 39589e1696..10305a46b4 100644
--- a/e2e_tests/conftest.py
+++ b/e2e_tests/conftest.py
@@ -46,7 +46,8 @@ async def create_or_get_test_workspace(
             "display_name": f"E2E {description} workspace ({auth_type} AAD)",
             "description": f"{template_name} test workspace for E2E tests",
             "auth_type": auth_type,
-            "address_space_size": "small"
+            "address_space_size": "small",
+            "enable_backup": False
         }
     }
     if config.TEST_WORKSPACE_APP_PLAN != "":