diff --git a/JSMR.Api/Startup/ServiceCollectionExtensions.cs b/JSMR.Api/Startup/ServiceCollectionExtensions.cs
index 1ed30ad..c32a8fc 100644
--- a/JSMR.Api/Startup/ServiceCollectionExtensions.cs
+++ b/JSMR.Api/Startup/ServiceCollectionExtensions.cs
@@ -22,8 +22,11 @@ public static class ServiceCollectionExtensions
                  ?? throw new InvalidOperationException("Missing ConnectionStrings:AppDb");
 
         services.AddDbContextFactory<AppDbContext>(opt =>
-            opt.UseMySql(connectionString, ServerVersion.AutoDetect(connectionString))
-               .EnableSensitiveDataLogging(false));
+            opt.UseMySql(connectionString, ServerVersion.AutoDetect(connectionString), mySqlOptions =>
+            {
+                mySqlOptions.CommandTimeout(120);
+            })
+            .EnableSensitiveDataLogging(false));
 
         services.AddControllers();
 
diff --git a/JSMR.Worker/Program.cs b/JSMR.Worker/Program.cs
index 731803d..ef42905 100644
--- a/JSMR.Worker/Program.cs
+++ b/JSMR.Worker/Program.cs
@@ -59,7 +59,10 @@ builder.Services
 
 builder.Services.AddDbContextFactory<AppDbContext>(optionsBuilder =>
     optionsBuilder
-        .UseMySql(connectionString, ServerVersion.AutoDetect(connectionString))
+        .UseMySql(connectionString, ServerVersion.AutoDetect(connectionString), mySqlOptions =>
+        {
+            mySqlOptions.CommandTimeout(120);
+        })
         .EnableSensitiveDataLogging(false));
 
 // Worker services