diff --git a/Akka.Persistence.SqlServer.sln b/Akka.Persistence.SqlServer.sln
index 5ba3e2f..3675782 100644
--- a/Akka.Persistence.SqlServer.sln
+++ b/Akka.Persistence.SqlServer.sln
@@ -8,6 +8,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{D8BAD8E8
 		build.cmd = build.cmd
 		build.fsx = build.fsx
 		build.sh = build.sh
+		src\Directory.Build.props = src\Directory.Build.props
+		src\Directory.Packages.props = src\Directory.Packages.props
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{85A25CFE-0B51-45FC-9C5E-271F9557F8D3}"
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 10e65a7..d83f8de 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
-#### 1.5.0-beta3 February 27 2023 ####
+#### 1.5.0 March 02 2023 ####
+
+* [Update Akka.NET to v1.5.0](https://github.com/akkadotnet/akka.net/releases/tag/1.5.0)
+
 
 * [Update Akka.NET to v1.5.0-beta3](https://github.com/akkadotnet/akka.net/releases/tag/1.5.0-beta3)
diff --git a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerAllEventsSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerAllEventsSpec.cs
index a977b1e..cd95930 100644
--- a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerAllEventsSpec.cs
+++ b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerAllEventsSpec.cs
@@ -5,7 +5,6 @@
 // -----------------------------------------------------------------------
 
 using System;
-using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -16,7 +15,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Batching
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerAllEventsSpec : AllEventsSpec
+    public class BatchingSqlServerAllEventsSpec : AllEventsSpec, IDisposable
     {
         public BatchingSqlServerAllEventsSpec(ITestOutputHelper output, SqlServerFixture fixture) : base(
             InitConfig(fixture),
@@ -43,11 +42,15 @@ class = ""Akka.Persistence.SqlServer.Journal.BatchingSqlServerJournal, Akka.Pers
                 .WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        public override Task DisposeAsync()
+        protected void Dispose(bool disposing)
         {
-            GC.SuppressFinalize(this);
             DbUtils.Clean();
-            return base.DisposeAsync();
+        }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentAllEventsSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentAllEventsSpec.cs
index 59385cd..9e5d586 100644
--- a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentAllEventsSpec.cs
+++ b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentAllEventsSpec.cs
@@ -5,7 +5,6 @@
 // -----------------------------------------------------------------------
 
 using System;
-using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -16,7 +15,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Batching
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerCurrentAllEventsSpec : CurrentAllEventsSpec
+    public class BatchingSqlServerCurrentAllEventsSpec : CurrentAllEventsSpec, IDisposable
     {
         public BatchingSqlServerCurrentAllEventsSpec(ITestOutputHelper output, SqlServerFixture fixture) : base(
             InitConfig(fixture),
@@ -43,11 +42,15 @@ class = ""Akka.Persistence.SqlServer.Journal.BatchingSqlServerJournal, Akka.Pers
                 .WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        public override Task DisposeAsync()
+        protected void Dispose(bool disposing)
         {
-            GC.SuppressFinalize(this);
             DbUtils.Clean();
-            return base.DisposeAsync();
+        }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentEventsByPersistenceIdSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentEventsByPersistenceIdSpec.cs
index 552a95c..4c195a5 100644
--- a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentEventsByPersistenceIdSpec.cs
+++ b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentEventsByPersistenceIdSpec.cs
@@ -5,7 +5,6 @@
 // -----------------------------------------------------------------------
 
 using System;
-using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -16,7 +15,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Batching
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerCurrentEventsByPersistenceIdSpec : CurrentEventsByPersistenceIdSpec
+    public class BatchingSqlServerCurrentEventsByPersistenceIdSpec : CurrentEventsByPersistenceIdSpec, IDisposable
     {
         public BatchingSqlServerCurrentEventsByPersistenceIdSpec(ITestOutputHelper output, SqlServerFixture fixture)
             : base(InitConfig(fixture), nameof(BatchingSqlServerCurrentEventsByPersistenceIdSpec), output)
@@ -45,11 +44,15 @@ class = ""Akka.Persistence.SqlServer.Journal.BatchingSqlServerJournal, Akka.Pers
             return conf.WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        public override Task DisposeAsync()
+        protected void Dispose(bool disposing)
         {
-            GC.SuppressFinalize(this);
             DbUtils.Clean();
-            return base.DisposeAsync();
+        }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentEventsByTagSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentEventsByTagSpec.cs
index 564815b..1ce7704 100644
--- a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentEventsByTagSpec.cs
+++ b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentEventsByTagSpec.cs
@@ -5,7 +5,6 @@
 // -----------------------------------------------------------------------
 
 using System;
-using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -16,7 +15,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Batching
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerCurrentEventsByTagSpec : EventsByTagSpec
+    public class BatchingSqlServerCurrentEventsByTagSpec : EventsByTagSpec, IDisposable
     {
         public BatchingSqlServerCurrentEventsByTagSpec(ITestOutputHelper output, SqlServerFixture fixture)
             : base(InitConfig(fixture), nameof(BatchingSqlServerCurrentEventsByTagSpec), output)
@@ -51,11 +50,15 @@ class = ""Akka.Persistence.SqlServer.Journal.SqlServerJournal, Akka.Persistence.
             return conf.WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        public override Task DisposeAsync()
+        protected void Dispose(bool disposing)
         {
-            GC.SuppressFinalize(this);
             DbUtils.Clean();
-            return base.DisposeAsync();
+        }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentPersistenceIdsSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentPersistenceIdsSpec.cs
index 6c4b866..772bf4e 100644
--- a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentPersistenceIdsSpec.cs
+++ b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerCurrentPersistenceIdsSpec.cs
@@ -5,7 +5,6 @@
 // -----------------------------------------------------------------------
 
 using System;
-using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -16,7 +15,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Batching
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerCurrentPersistenceIdsSpec : CurrentPersistenceIdsSpec
+    public class BatchingSqlServerCurrentPersistenceIdsSpec : CurrentPersistenceIdsSpec, IDisposable
     {
         public BatchingSqlServerCurrentPersistenceIdsSpec(ITestOutputHelper output, SqlServerFixture fixture)
             : base(InitConfig(fixture), nameof(BatchingSqlServerCurrentPersistenceIdsSpec), output)
@@ -45,11 +44,15 @@ class = ""Akka.Persistence.SqlServer.Journal.BatchingSqlServerJournal, Akka.Pers
             return conf.WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        public override Task DisposeAsync()
+        protected void Dispose(bool disposing)
         {
-            GC.SuppressFinalize(this);
             DbUtils.Clean();
-            return base.DisposeAsync();
+        }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerEventsByPersistenceIdSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerEventsByPersistenceIdSpec.cs
index 4e0a76d..3386226 100644
--- a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerEventsByPersistenceIdSpec.cs
+++ b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerEventsByPersistenceIdSpec.cs
@@ -5,7 +5,6 @@
 // -----------------------------------------------------------------------
 
 using System;
-using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -16,7 +15,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Batching
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerEventsByPersistenceIdSpec : EventsByPersistenceIdSpec
+    public class BatchingSqlServerEventsByPersistenceIdSpec : EventsByPersistenceIdSpec, IDisposable
     {
         public BatchingSqlServerEventsByPersistenceIdSpec(ITestOutputHelper output, SqlServerFixture fixture)
             : base(InitConfig(fixture), nameof(BatchingSqlServerEventsByPersistenceIdSpec), output)
@@ -45,11 +44,15 @@ class = ""Akka.Persistence.SqlServer.Journal.BatchingSqlServerJournal, Akka.Pers
             return conf.WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        public override Task DisposeAsync()
+        protected void Dispose(bool disposing)
         {
-            GC.SuppressFinalize(this);
             DbUtils.Clean();
-            return base.DisposeAsync();
+        }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerEventsByTagSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerEventsByTagSpec.cs
index a3e09ed..921de1d 100644
--- a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerEventsByTagSpec.cs
+++ b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerEventsByTagSpec.cs
@@ -5,7 +5,6 @@
 // -----------------------------------------------------------------------
 
 using System;
-using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -16,7 +15,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Batching
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerEventsByTagSpec : EventsByTagSpec
+    public class BatchingSqlServerEventsByTagSpec : EventsByTagSpec, IDisposable
     {
         public BatchingSqlServerEventsByTagSpec(ITestOutputHelper output, SqlServerFixture fixture)
             : base(InitConfig(fixture), nameof(BatchingSqlServerEventsByTagSpec), output)
@@ -51,11 +50,15 @@ class = ""Akka.Persistence.SqlServer.Journal.SqlServerJournal, Akka.Persistence.
             return conf.WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        public override Task DisposeAsync()
+        protected void Dispose(bool disposing)
         {
-            GC.SuppressFinalize(this);
             DbUtils.Clean();
-            return base.DisposeAsync();
+        }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerJournalPerfSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerJournalPerfSpec.cs
index 32ddd71..170a3f9 100644
--- a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerJournalPerfSpec.cs
+++ b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerJournalPerfSpec.cs
@@ -5,7 +5,6 @@
 // -----------------------------------------------------------------------
 
 using System;
-using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.TestKit.Performance;
 using Xunit;
@@ -14,7 +13,7 @@
 namespace Akka.Persistence.SqlServer.Tests
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerJournalPerfSpec : JournalPerfSpec
+    public class BatchingSqlServerJournalPerfSpec : JournalPerfSpec, IDisposable
     {
         public BatchingSqlServerJournalPerfSpec(ITestOutputHelper output, SqlServerFixture fixture)
             : base(InitConfig(fixture), "BatchingSqlServerJournalPerfSpec", output)
@@ -48,11 +47,15 @@ class = ""Akka.Persistence.SqlServer.Journal.BatchingSqlServerJournal, Akka.Pers
             return ConfigurationFactory.ParseString(specString);
         }
 
-        public override Task DisposeAsync()
+        protected void Dispose(bool disposing)
         {
-            GC.SuppressFinalize(this);
             DbUtils.Clean();
-            return base.DisposeAsync();
+        }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerPersistenceIdsSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerPersistenceIdsSpec.cs
index f959ab5..2a384ad 100644
--- a/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerPersistenceIdsSpec.cs
+++ b/src/Akka.Persistence.SqlServer.Tests/Batching/BatchingSqlServerPersistenceIdsSpec.cs
@@ -5,7 +5,6 @@
 // -----------------------------------------------------------------------
 
 using System;
-using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -16,7 +15,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Batching
 {
     [Collection("SqlServerSpec")]
-    public class BatchingSqlServerPersistenceIdsSpec : PersistenceIdsSpec
+    public class BatchingSqlServerPersistenceIdsSpec : PersistenceIdsSpec, IDisposable
     {
         public BatchingSqlServerPersistenceIdsSpec(ITestOutputHelper output, SqlServerFixture fixture)
             : base(InitConfig(fixture), nameof(BatchingSqlServerPersistenceIdsSpec), output)
@@ -45,11 +44,15 @@ class = ""Akka.Persistence.SqlServer.Journal.BatchingSqlServerJournal, Akka.Pers
             return conf.WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        public override Task DisposeAsync()
+        protected void Dispose(bool disposing)
         {
-            GC.SuppressFinalize(this);
             DbUtils.Clean();
-            return base.DisposeAsync();
+        }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerAllEventsSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerAllEventsSpec.cs
index 23b86fb..9a0dd86 100644
--- a/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerAllEventsSpec.cs
+++ b/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerAllEventsSpec.cs
@@ -5,7 +5,6 @@
 // -----------------------------------------------------------------------
 
 using System;
-using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -16,7 +15,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Query
 {
     [Collection("SqlServerSpec")]
-    public class SqlServerAllEventsSpec : AllEventsSpec
+    public class SqlServerAllEventsSpec : AllEventsSpec, IDisposable
     {
         public SqlServerAllEventsSpec(ITestOutputHelper output, SqlServerFixture fixture) : base(InitConfig(fixture),
             nameof(SqlServerAllEventsSpec), output)
@@ -49,11 +48,15 @@ class = ""Akka.Persistence.SqlServer.Journal.SqlServerJournal, Akka.Persistence.
                 .WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        public override Task DisposeAsync()
+        protected void Dispose(bool disposing)
         {
-            GC.SuppressFinalize(this);
             DbUtils.Clean();
-            return base.DisposeAsync();
+        }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerCurrentAllEventsSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerCurrentAllEventsSpec.cs
index ba4f6e2..ab2bd37 100644
--- a/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerCurrentAllEventsSpec.cs
+++ b/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerCurrentAllEventsSpec.cs
@@ -5,7 +5,6 @@
 // -----------------------------------------------------------------------
 
 using System;
-using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -16,7 +15,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Query
 {
     [Collection("SqlServerSpec")]
-    public class SqlServerCurrentAllEventsSpec : CurrentAllEventsSpec
+    public class SqlServerCurrentAllEventsSpec : CurrentAllEventsSpec, IDisposable
     {
         public SqlServerCurrentAllEventsSpec(ITestOutputHelper output, SqlServerFixture fixture) : base(
             InitConfig(fixture),
@@ -50,11 +49,15 @@ class = ""Akka.Persistence.SqlServer.Journal.SqlServerJournal, Akka.Persistence.
                 .WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        public override Task DisposeAsync()
+        protected void Dispose(bool disposing)
         {
-            GC.SuppressFinalize(this);
             DbUtils.Clean();
-            return base.DisposeAsync();
+        }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerCurrentEventsByPersistenceIdSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerCurrentEventsByPersistenceIdSpec.cs
index 4135189..f18f485 100644
--- a/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerCurrentEventsByPersistenceIdSpec.cs
+++ b/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerCurrentEventsByPersistenceIdSpec.cs
@@ -5,7 +5,6 @@
 // -----------------------------------------------------------------------
 
 using System;
-using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -16,7 +15,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Query
 {
     [Collection("SqlServerSpec")]
-    public class SqlServerCurrentEventsByPersistenceIdSpec : CurrentEventsByPersistenceIdSpec
+    public class SqlServerCurrentEventsByPersistenceIdSpec : CurrentEventsByPersistenceIdSpec, IDisposable
     {
         public SqlServerCurrentEventsByPersistenceIdSpec(ITestOutputHelper output, SqlServerFixture fixture) : base(
             InitConfig(fixture), nameof(SqlServerCurrentEventsByPersistenceIdSpec), output)
@@ -43,11 +42,15 @@ class = ""Akka.Persistence.SqlServer.Journal.SqlServerJournal, Akka.Persistence.
                 .WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        public override Task DisposeAsync()
+        protected void Dispose(bool disposing)
         {
-            GC.SuppressFinalize(this);
             DbUtils.Clean();
-            return base.DisposeAsync();
+        }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerCurrentEventsByTagSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerCurrentEventsByTagSpec.cs
index e3d91ba..7278306 100644
--- a/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerCurrentEventsByTagSpec.cs
+++ b/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerCurrentEventsByTagSpec.cs
@@ -5,7 +5,6 @@
 // -----------------------------------------------------------------------
 
 using System;
-using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -16,7 +15,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Query
 {
     [Collection("SqlServerSpec")]
-    public class SqlServerCurrentEventsByTagSpec : CurrentEventsByTagSpec
+    public class SqlServerCurrentEventsByTagSpec : CurrentEventsByTagSpec, IDisposable
     {
         public SqlServerCurrentEventsByTagSpec(ITestOutputHelper output, SqlServerFixture fixture) : base(
             InitConfig(fixture),
@@ -50,11 +49,15 @@ class = ""Akka.Persistence.SqlServer.Journal.SqlServerJournal, Akka.Persistence.
                 .WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        public override Task DisposeAsync()
+        protected void Dispose(bool disposing)
         {
-            GC.SuppressFinalize(this);
             DbUtils.Clean();
-            return base.DisposeAsync();
+        }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerCurrentPersistenceIdsSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerCurrentPersistenceIdsSpec.cs
index 3089c53..038662a 100644
--- a/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerCurrentPersistenceIdsSpec.cs
+++ b/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerCurrentPersistenceIdsSpec.cs
@@ -5,7 +5,6 @@
 // -----------------------------------------------------------------------
 
 using System;
-using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -16,7 +15,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Query
 {
     [Collection("SqlServerSpec")]
-    public class SqlServerCurrentPersistenceIdsSpec : CurrentPersistenceIdsSpec
+    public class SqlServerCurrentPersistenceIdsSpec : CurrentPersistenceIdsSpec, IDisposable
     {
         public SqlServerCurrentPersistenceIdsSpec(ITestOutputHelper output, SqlServerFixture fixture)
             : base(InitConfig(fixture), nameof(SqlServerCurrentPersistenceIdsSpec), output)
@@ -43,11 +42,15 @@ class = ""Akka.Persistence.SqlServer.Journal.SqlServerJournal, Akka.Persistence.
                 .WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        public override Task DisposeAsync()
+        protected void Dispose(bool disposing)
         {
-            GC.SuppressFinalize(this);
             DbUtils.Clean();
-            return base.DisposeAsync();
+        }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerEventsByPersistenceIdSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerEventsByPersistenceIdSpec.cs
index 5bcce03..dc332e8 100644
--- a/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerEventsByPersistenceIdSpec.cs
+++ b/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerEventsByPersistenceIdSpec.cs
@@ -5,7 +5,6 @@
 // -----------------------------------------------------------------------
 
 using System;
-using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -16,7 +15,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Query
 {
     [Collection("SqlServerSpec")]
-    public class SqlServerEventsByPersistenceIdSpec : EventsByPersistenceIdSpec
+    public class SqlServerEventsByPersistenceIdSpec : EventsByPersistenceIdSpec, IDisposable
     {
         public SqlServerEventsByPersistenceIdSpec(ITestOutputHelper output, SqlServerFixture fixture) : base(
             InitConfig(fixture), nameof(SqlServerEventsByPersistenceIdSpec), output)
@@ -43,11 +42,15 @@ class = ""Akka.Persistence.SqlServer.Journal.SqlServerJournal, Akka.Persistence.
                 .WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        public override Task DisposeAsync()
+        protected void Dispose(bool disposing)
         {
-            GC.SuppressFinalize(this);
             DbUtils.Clean();
-            return base.DisposeAsync();
+        }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerEventsByTagSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerEventsByTagSpec.cs
index 823b72f..653186f 100644
--- a/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerEventsByTagSpec.cs
+++ b/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerEventsByTagSpec.cs
@@ -5,7 +5,6 @@
 // -----------------------------------------------------------------------
 
 using System;
-using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -16,7 +15,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Query
 {
     [Collection("SqlServerSpec")]
-    public class SqlServerEventsByTagSpec : EventsByTagSpec
+    public class SqlServerEventsByTagSpec : EventsByTagSpec, IDisposable
     {
         public SqlServerEventsByTagSpec(ITestOutputHelper output, SqlServerFixture fixture) : base(InitConfig(fixture),
             nameof(SqlServerEventsByTagSpec), output)
@@ -49,11 +48,15 @@ class = ""Akka.Persistence.SqlServer.Journal.SqlServerJournal, Akka.Persistence.
                 .WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        public override Task DisposeAsync()
+        protected void Dispose(bool disposing)
         {
-            GC.SuppressFinalize(this);
             DbUtils.Clean();
-            return base.DisposeAsync();
+        }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerPersistenceIdsSpec.cs b/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerPersistenceIdsSpec.cs
index e218e7c..db7a136 100644
--- a/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerPersistenceIdsSpec.cs
+++ b/src/Akka.Persistence.SqlServer.Tests/Query/SqlServerPersistenceIdsSpec.cs
@@ -5,7 +5,6 @@
 // -----------------------------------------------------------------------
 
 using System;
-using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.Query;
 using Akka.Persistence.Query.Sql;
@@ -16,7 +15,7 @@
 namespace Akka.Persistence.SqlServer.Tests.Query
 {
     [Collection("SqlServerSpec")]
-    public class SqlServerPersistenceIdsSpec : PersistenceIdsSpec
+    public class SqlServerPersistenceIdsSpec : PersistenceIdsSpec, IDisposable
     {
         public SqlServerPersistenceIdsSpec(ITestOutputHelper output, SqlServerFixture fixture)
             : base(InitConfig(fixture), nameof(SqlServerPersistenceIdsSpec), output)
@@ -43,11 +42,15 @@ class = ""Akka.Persistence.SqlServer.Journal.SqlServerJournal, Akka.Persistence.
                 .WithFallback(SqlReadJournal.DefaultConfiguration());
         }
 
-        public override Task DisposeAsync()
+        protected void Dispose(bool disposing)
         {
-            GC.SuppressFinalize(this);
             DbUtils.Clean();
-            return base.DisposeAsync();
+        }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Akka.Persistence.SqlServer.Tests/SqlServerJournalPerfSpec.cs b/src/Akka.Persistence.SqlServer.Tests/SqlServerJournalPerfSpec.cs
index 35cce4c..d4f8f47 100644
--- a/src/Akka.Persistence.SqlServer.Tests/SqlServerJournalPerfSpec.cs
+++ b/src/Akka.Persistence.SqlServer.Tests/SqlServerJournalPerfSpec.cs
@@ -5,7 +5,6 @@
 // -----------------------------------------------------------------------
 
 using System;
-using System.Threading.Tasks;
 using Akka.Configuration;
 using Akka.Persistence.TestKit.Performance;
 using Xunit;
@@ -14,7 +13,7 @@
 namespace Akka.Persistence.SqlServer.Tests
 {
     [Collection("SqlServerSpec")]
-    public class SqlServerJournalPerfSpec : JournalPerfSpec
+    public class SqlServerJournalPerfSpec : JournalPerfSpec, IDisposable
     {
         public SqlServerJournalPerfSpec(ITestOutputHelper output, SqlServerFixture fixture)
             : base(InitConfig(fixture), "SqlServerJournalPerfSpec", output)
@@ -48,11 +47,15 @@ class = ""Akka.Persistence.SqlServer.Journal.SqlServerJournal, Akka.Persistence.
             return ConfigurationFactory.ParseString(specString);
         }
 
-        public override Task DisposeAsync()
+        protected void Dispose(bool disposing)
         {
-            GC.SuppressFinalize(this);
             DbUtils.Clean();
-            return base.DisposeAsync();
+        }
+
+        public void Dispose()
+        {
+            GC.SuppressFinalize(this);
+            Dispose(true);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index ae65323..92bd371 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -6,12 +6,12 @@
     <PackageIconUrl>http://getakka.net/images/akkalogo.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/akkadotnet/Akka.Persistence.SqlServer</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/akkadotnet/Akka.Persistence.SqlServer/blob/master/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>[Update Akka.NET to v1.5.0-beta1](https://github.com/akkadotnet/akka.net/releases/tag/1.5.0-beta1)</PackageReleaseNotes>
+    <PackageReleaseNotes>[Update Akka.NET to v1.5.0](https://github.com/akkadotnet/akka.net/releases/tag/1.5.0)</PackageReleaseNotes>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
     <XunitVersion>2.4.2</XunitVersion>
-    <AkkaVersion>1.5.0-beta3</AkkaVersion>
+    <AkkaVersion>1.5.0-beta2</AkkaVersion>
     <TestSdkVersion>17.4.1</TestSdkVersion>
     <NetCoreTestVersion>net6.0</NetCoreTestVersion>
     <NetFrameworkTestVersion>net48</NetFrameworkTestVersion>