diff --git a/MareSynchronosServer/MareSynchronosServer/Program.cs b/MareSynchronosServer/MareSynchronosServer/Program.cs
index 1fc4102..e6dcfc9 100644
--- a/MareSynchronosServer/MareSynchronosServer/Program.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Program.cs
@@ -21,7 +21,9 @@ public class Program
 
             if (options.IsMain)
             {
+                context.Database.SetCommandTimeout(TimeSpan.FromMinutes(10));
                 context.Database.Migrate();
+                context.Database.SetCommandTimeout(TimeSpan.FromSeconds(30));
                 context.SaveChanges();
 
                 // clean up residuals
diff --git a/MareSynchronosServer/MareSynchronosServer/Startup.cs b/MareSynchronosServer/MareSynchronosServer/Startup.cs
index 4fd2159..71bb0f8 100644
--- a/MareSynchronosServer/MareSynchronosServer/Startup.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Startup.cs
@@ -258,7 +258,6 @@ public class Startup
             {
                 builder.MigrationsHistoryTable("_efmigrationshistory", "public");
                 builder.MigrationsAssembly("MareSynchronosShared");
-                builder.CommandTimeout(5 * 60);
             }).UseSnakeCaseNamingConvention();
             options.EnableThreadSafetyChecks(false);
         });