diff --git a/server/src/FilterLists.Data/FilterLists.Data.csproj b/server/src/FilterLists.Data/FilterLists.Data.csproj
index 897d0e71b..013abc5ed 100644
--- a/server/src/FilterLists.Data/FilterLists.Data.csproj
+++ b/server/src/FilterLists.Data/FilterLists.Data.csproj
@@ -21,11 +21,11 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.DotNet.Analyzers.Compatibility" Version="0.2.12-alpha" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.2.6" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.0" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/server/src/FilterLists.Data/Seed/Extensions/SeedFilterListsDbContext.cs b/server/src/FilterLists.Data/Seed/Extensions/SeedFilterListsDbContext.cs
index 27664536d..875f19dc9 100644
--- a/server/src/FilterLists.Data/Seed/Extensions/SeedFilterListsDbContext.cs
+++ b/server/src/FilterLists.Data/Seed/Extensions/SeedFilterListsDbContext.cs
@@ -102,7 +102,7 @@ private static async Task InsertOnDuplicateKeyUpdate<TEntity>(DbContext dbContex
                 return;
             var columns = string.Join(", ", properties.Select(x => x.Name));
             var updates = CreateUpdates(properties);
-            var sql = "INSERT INTO " + entityType.Relational().TableName + " (" + columns + ") VALUES " + values +
+            var sql = "INSERT INTO " + entityType.GetTableName() + " (" + columns + ") VALUES " + values +
                       " ON DUPLICATE KEY UPDATE " + updates;
             await dbContext.Database.ExecuteSqlCommandAsync(sql);
         }
diff --git a/server/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs b/server/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs
index 70586cd70..572b0c19b 100644
--- a/server/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs
+++ b/server/src/FilterLists.Services/DependencyInjection/Extensions/ConfigureServicesCollection.cs
@@ -12,6 +12,9 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Pomelo.EntityFrameworkCore.MySql.Infrastructure;
+using Pomelo.EntityFrameworkCore.MySql.Storage;
+using System;
 
 namespace FilterLists.Services.DependencyInjection.Extensions
 {
@@ -22,7 +25,8 @@ public static void AddFilterListsApiServices(this IServiceCollection services, I
             services.AddSingleton(c => config);
             services.AddDbContextPool<FilterListsDbContext>(o =>
                     o.UseMySql(config.GetConnectionString("FilterListsConnection"),
-                        m => m.MigrationsAssembly("FilterLists.Api")));
+                        m => m.MigrationsAssembly("FilterLists.Api")
+                              .ServerVersion(new ServerVersion(new Version(10, 4, 12), ServerType.MariaDb))));
             services.TryAddScoped<FilterListService>();
             services.TryAddScoped<LanguageService>();
             services.TryAddScoped<LicenseService>();
diff --git a/server/src/FilterLists.Services/Seed/SeedService.cs b/server/src/FilterLists.Services/Seed/SeedService.cs
index 3ca63c3a6..4805e3e43 100644
--- a/server/src/FilterLists.Services/Seed/SeedService.cs
+++ b/server/src/FilterLists.Services/Seed/SeedService.cs
@@ -24,10 +24,11 @@ public async Task<IEnumerable<TSeedDto>> GetAllAsync<TEntity, TSeedDto>() where
         public async Task<IEnumerable<TSeedDto>> GetAllAsync<TEntity, TSeedDto>(PropertyInfo primarySort,
             PropertyInfo secondarySort)
             where TEntity : class =>
-            await DbContext.Set<TEntity>()
-                           .OrderBy(s => primarySort.GetValue(s, null))
-                           .ThenBy(s => secondarySort.GetValue(s, null))
-                           .ProjectTo<TSeedDto>(MapConfig)
-                           .ToListAsync();
+            (await DbContext.Set<TEntity>().ToListAsync())
+                        .AsQueryable()
+                        .OrderBy(s => primarySort.GetValue(s, null))
+                        .ThenBy(s => secondarySort.GetValue(s, null))
+                        .ProjectTo<TSeedDto>(MapConfig)
+                        .ToList();
     }
 }
\ No newline at end of file
diff --git a/server/tests/FilterLists.Agent.Tests/FilterLists.Agent.Tests.csproj b/server/tests/FilterLists.Agent.Tests/FilterLists.Agent.Tests.csproj
index 9c7307727..8e1991526 100644
--- a/server/tests/FilterLists.Agent.Tests/FilterLists.Agent.Tests.csproj
+++ b/server/tests/FilterLists.Agent.Tests/FilterLists.Agent.Tests.csproj
@@ -36,7 +36,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
diff --git a/server/tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj b/server/tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj
index 5325d8ab5..eb7f5580a 100644
--- a/server/tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj
+++ b/server/tests/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj
@@ -35,7 +35,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>