diff --git a/src/NServiceBus.RavenDB.Tests/ApprovalFiles/APIApprovals.ApproveRavenDBPersistence.approved.txt b/src/NServiceBus.RavenDB.Tests/ApprovalFiles/APIApprovals.ApproveRavenDBPersistence.approved.txt
index ed617b58d..e7312cc89 100644
--- a/src/NServiceBus.RavenDB.Tests/ApprovalFiles/APIApprovals.ApproveRavenDBPersistence.approved.txt
+++ b/src/NServiceBus.RavenDB.Tests/ApprovalFiles/APIApprovals.ApproveRavenDBPersistence.approved.txt
@@ -27,7 +27,13 @@ namespace NServiceBus
 {
     public class static RavenDbGatewayDeduplicationSettingsExtensions
     {
+        [System.ObsoleteAttribute("RavenDB gateway persistence has been moved to the NServiceBus.Gateway.RavenDB ded" +
+            "icated package. Will be treated as an error from version 7.0.0. Will be removed " +
+            "in version 8.0.0.", false)]
         public static NServiceBus.PersistenceExtensions<NServiceBus.RavenDBPersistence> UseDocumentStoreForGatewayDeduplication(this NServiceBus.PersistenceExtensions<NServiceBus.RavenDBPersistence> cfg, Raven.Client.Documents.IDocumentStore documentStore) { }
+        [System.ObsoleteAttribute("RavenDB gateway persistence has been moved to the NServiceBus.Gateway.RavenDB ded" +
+            "icated package. Will be treated as an error from version 7.0.0. Will be removed " +
+            "in version 8.0.0.", false)]
         public static NServiceBus.PersistenceExtensions<NServiceBus.RavenDBPersistence> UseDocumentStoreForGatewayDeduplication(this NServiceBus.PersistenceExtensions<NServiceBus.RavenDBPersistence> cfg, System.Func<NServiceBus.Settings.ReadOnlySettings, Raven.Client.Documents.IDocumentStore> storeCreator) { }
     }
     public class static RavenDBOutboxExtensions
diff --git a/src/NServiceBus.RavenDB/Gateway/RavenDbGatewayDeduplicationSettingsExtensions.cs b/src/NServiceBus.RavenDB/Gateway/RavenDbGatewayDeduplicationSettingsExtensions.cs
index 7cf3fac38..f75beef0f 100644
--- a/src/NServiceBus.RavenDB/Gateway/RavenDbGatewayDeduplicationSettingsExtensions.cs
+++ b/src/NServiceBus.RavenDB/Gateway/RavenDbGatewayDeduplicationSettingsExtensions.cs
@@ -16,6 +16,10 @@ public static class RavenDbGatewayDeduplicationSettingsExtensions
         /// </summary>
         /// <param name="cfg"></param>
         /// <param name="documentStore">The document store to use</param>
+        [ObsoleteEx(
+            Message = "RavenDB gateway persistence has been moved to the NServiceBus.Gateway.RavenDB dedicated package.",
+            RemoveInVersion = "8.0.0",
+            TreatAsErrorFromVersion = "7.0.0")]
         public static PersistenceExtensions<RavenDBPersistence> UseDocumentStoreForGatewayDeduplication(this PersistenceExtensions<RavenDBPersistence> cfg, IDocumentStore documentStore)
         {
             DocumentStoreManager.SetDocumentStore<StorageType.GatewayDeduplication>(cfg.GetSettings(), documentStore);
@@ -27,10 +31,14 @@ public static PersistenceExtensions<RavenDBPersistence> UseDocumentStoreForGatew
         /// </summary>
         /// <param name="cfg"></param>
         /// <param name="storeCreator">A Func that will create the document store on NServiceBus initialization.</param>
+        [ObsoleteEx(
+            Message = "RavenDB gateway persistence has been moved to the NServiceBus.Gateway.RavenDB dedicated package.",
+            RemoveInVersion = "8.0.0",
+            TreatAsErrorFromVersion = "7.0.0")]
         public static PersistenceExtensions<RavenDBPersistence> UseDocumentStoreForGatewayDeduplication(this PersistenceExtensions<RavenDBPersistence> cfg, Func<ReadOnlySettings, IDocumentStore> storeCreator)
         {
             DocumentStoreManager.SetDocumentStore<StorageType.GatewayDeduplication>(cfg.GetSettings(), storeCreator);
             return cfg;
         }
     }
-}
\ No newline at end of file
+}