From 3dc2204a02796f5a4720a0f75dc9b4f8f362f183 Mon Sep 17 00:00:00 2001
From: Jack Morris <13438569+rudolphjacksonm@users.noreply.github.com>
Date: Tue, 14 Jul 2026 20:15:45 +0100
Subject: [PATCH 1/2] Update backup.tf

---
 templates/workspaces/base/terraform/backup/backup.tf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/workspaces/base/terraform/backup/backup.tf b/templates/workspaces/base/terraform/backup/backup.tf
index 8273b31110..dcda7ce339 100644
--- a/templates/workspaces/base/terraform/backup/backup.tf
+++ b/templates/workspaces/base/terraform/backup/backup.tf
@@ -4,7 +4,6 @@ resource "azurerm_recovery_services_vault" "vault" {
   location            = var.location
   resource_group_name = var.resource_group_name
   sku                 = "Standard"
-  soft_delete_enabled = false
   storage_mode_type   = "ZoneRedundant" #  Possible values are "GeoRedundant", "LocallyRedundant" and "ZoneRedundant". Defaults to "GeoRedundant".
   tags                = var.tre_workspace_tags
 

From 39d620b50aba8835cc8c481d708dba5da60922bd Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 15 Jul 2026 14:35:32 +0000
Subject: [PATCH 2/2] Update CHANGELOG.md and bump base workspace version to
 2.8.4 for #4967

---
 CHANGELOG.md                          | 1 +
 templates/workspaces/base/porter.yaml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf85fb127f..b8f57bcb0f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ BUG FIXES:
 * Fix spelling in docs using codespell ([#4954](https://github.com/microsoft/AzureTRE/issues/4954))
 * Replace deprecated yaspell with codespell and add pre-commit hook installer to devcontainer. ([#4953](https://github.com/microsoft/AzureTRE/issues/4953))
 * Fix Guacamole Windows VM image selections by aligning schema enums/defaults with supported image options in Windows and review VM templates. ([#4963](https://github.com/microsoft/AzureTRE/issues/4963))
+* Remove deprecated `soft_delete_enabled` setting from `azurerm_recovery_services_vault` in base workspace template. ([#4967](https://github.com/microsoft/AzureTRE/issues/4967))
 
 ## (0.28.0) (March 2, 2026)
 **BREAKING CHANGES**
diff --git a/templates/workspaces/base/porter.yaml b/templates/workspaces/base/porter.yaml
index 368df54022..22cb6cdfc3 100644
--- a/templates/workspaces/base/porter.yaml
+++ b/templates/workspaces/base/porter.yaml
@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-workspace-base
-version: 2.8.3
+version: 2.8.4
 description: "A base Azure TRE workspace"
 dockerfile: Dockerfile.tmpl
 registry: azuretre