diff --git a/services/Archival/FilterLists.Archival.Api/Program.cs b/services/Archival/FilterLists.Archival.Api/Program.cs
index 49b9e3e29..0fd0ec8f6 100644
--- a/services/Archival/FilterLists.Archival.Api/Program.cs
+++ b/services/Archival/FilterLists.Archival.Api/Program.cs
@@ -6,10 +6,10 @@ namespace FilterLists.Archival.Api;
 public static class Program
 {
     // TODO: migrate to new hosting model https://docs.microsoft.com/en-us/aspnet/core/migration/50-to-60?view=aspnetcore-6.0&tabs=visual-studio#new-hosting-model
-    public static async Task Main(string[] args)
+    public static Task Main(string[] args)
     {
         var host = CreateHostBuilder(args).Build();
-        await host.TryRunWithLoggingAsync();
+        return host.TryRunWithLoggingAsync();
     }
 
     public static IHostBuilder CreateHostBuilder(string[] args)
diff --git a/services/Directory/FilterLists.Directory.Api/Program.cs b/services/Directory/FilterLists.Directory.Api/Program.cs
index 4166fb42c..b1ec9dae1 100644
--- a/services/Directory/FilterLists.Directory.Api/Program.cs
+++ b/services/Directory/FilterLists.Directory.Api/Program.cs
@@ -7,10 +7,10 @@ namespace FilterLists.Directory.Api;
 public static class Program
 {
     // TODO: migrate to new hosting model https://docs.microsoft.com/en-us/aspnet/core/migration/50-to-60?view=aspnetcore-6.0&tabs=visual-studio#new-hosting-model
-    public static async Task Main(string[] args)
+    public static Task Main(string[] args)
     {
         var host = CreateHostBuilder(args).Build();
-        await host.TryRunWithLoggingAsync(async () => await host.MigrateAsync());
+        return host.TryRunWithLoggingAsync(() => host.MigrateAsync());
     }
 
     public static IHostBuilder CreateHostBuilder(string[] args)
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryContext.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryContext.cs
index ca9893c7d..02079097d 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryContext.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/Queries/Context/QueryContext.cs
@@ -12,9 +12,9 @@ public QueryContext(QueryDbContext dbContext)
         _dbContext = dbContext;
     }
 
-    public async ValueTask DisposeAsync()
+    public ValueTask DisposeAsync()
     {
-        await _dbContext.DisposeAsync();
+        return _dbContext.DisposeAsync();
     }
 
     public IQueryable<FilterList> FilterLists => _dbContext.FilterLists.AsNoTracking();
diff --git a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/SeedExtensions.cs b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/SeedExtensions.cs
index cdc120944..a47f0cfbc 100644
--- a/services/Directory/FilterLists.Directory.Infrastructure/Persistence/SeedExtensions.cs
+++ b/services/Directory/FilterLists.Directory.Infrastructure/Persistence/SeedExtensions.cs
@@ -9,11 +9,11 @@ namespace FilterLists.Directory.Infrastructure.Persistence;
 
 public static class SeedExtension
 {
-    public static async Task MigrateAsync(this IHost host)
+    public static Task MigrateAsync(this IHost host)
     {
         using var scope = host.Services.CreateScope();
         var db = scope.ServiceProvider.GetRequiredService<QueryDbContext>();
-        await db.Database.MigrateAsync();
+        return db.Database.MigrateAsync();
     }
 }