diff --git a/Snippets/ASP/ASTP_6/Usage.cs b/Snippets/ASP/ASTP_6/Usage.cs
index 9780c7ddcab..156da1938bc 100644
--- a/Snippets/ASP/ASTP_6/Usage.cs
+++ b/Snippets/ASP/ASTP_6/Usage.cs
@@ -62,6 +62,21 @@ void CustomizingAzurePersistenceSagas(EndpointConfiguration endpointConfiguratio
         #endregion
     }
 
+#pragma warning disable CS0618
+    void CustomizingAzurePersistenceSagasCompatibility(EndpointConfiguration endpointConfiguration)
+    {
+        #region AzurePersistenceSagasCompatibility
+
+        var persistence = endpointConfiguration.UsePersistence<AzureTablePersistence, StorageType.Sagas>();
+
+        var compatibility = persistence.Compatibility();
+        // e.g. Enable secondary index
+        compatibility.EnableSecondaryKeyLookupForSagasCorrelatedByProperties();
+
+        #endregion
+    }
+#pragma warning restore CS0618
+
     public void ConfigureCustomJsonSerializerSettings(EndpointConfiguration endpointConfiguration)
     {
         #region AzurePersistenceSagasJsonSerializerSettings
diff --git a/menu/menu.yaml b/menu/menu.yaml
index 6504fa4fe5d..6af22b20834 100644
--- a/menu/menu.yaml
+++ b/menu/menu.yaml
@@ -1125,8 +1125,8 @@
     Articles:
     - Title: Azure Table
       Articles:
-      - Url: persistence/upgrades/asp-5to6
-        Title: Version 5 to 6
+      - Url: persistence/upgrades/asp-6to7
+        Title: Version 6 to 7
       - Url: persistence/upgrades/asp-4to5
         Title: Version 4 to 5
       - Url: persistence/upgrades/asp-2to3
diff --git a/persistence/azure-table/configuration_compatibility_astp_[3,6).partial.md b/persistence/azure-table/configuration_compatibility_astp_[3,7).partial.md
similarity index 100%
rename from persistence/azure-table/configuration_compatibility_astp_[3,6).partial.md
rename to persistence/azure-table/configuration_compatibility_astp_[3,7).partial.md
diff --git a/persistence/upgrades/asp-5to6.md b/persistence/upgrades/asp-6to7.md
similarity index 73%
rename from persistence/upgrades/asp-5to6.md
rename to persistence/upgrades/asp-6to7.md
index 1aae8b8ff71..8d266a76942 100644
--- a/persistence/upgrades/asp-5to6.md
+++ b/persistence/upgrades/asp-6to7.md
@@ -1,7 +1,7 @@
 ---
-title: Azure Storage Persistence Upgrade Version 5 to 6
-summary: Instructions on how to migrate from Azure Table Persistence version 5 to 6
-reviewed: 2024-04-26
+title: Azure Storage Persistence Upgrade Version 6 to 7
+summary: Instructions on how to migrate from Azure Table Persistence version 6 to 7
+reviewed: 2025-09-10
 component: ASP
 related:
 - persistence/azure-table
@@ -9,8 +9,9 @@ redirects:
 isUpgradeGuide: true
 upgradeGuideCoreVersions:
 - 9
+- 10
 ---
 
 ## Saga compatibility mode
 
-[Configuring saga compatibility](/persistence/azure-table/configuration.md?version=astp_5#saga-compatibility-configuration) is no longer supported for saga instances persisted by NServiceBus.Persistence.AzureStorage versions 1 and 2. Legacy endpoint instances that have this configuration must be upgraded to remove it.
+[Configuring saga compatibility](/persistence/azure-table/configuration.md?version=astp_6#saga-compatibility-configuration) is no longer supported for saga instances persisted by NServiceBus.Persistence.AzureStorage versions 1 and 2. Legacy endpoint instances that have this configuration must be upgraded to remove it.