diff --git a/master-docker-nonstandard-2/master.cfg b/master-docker-nonstandard-2/master.cfg
index a4710a02..7395b0bc 100644
--- a/master-docker-nonstandard-2/master.cfg
+++ b/master-docker-nonstandard-2/master.cfg
@@ -766,7 +766,7 @@ def add_test_steps(factory, test_types):
                         ),
                     ),
                 ],
-                timeout=10800,
+                timeout=3600,
                 dbpool=mtrDbPool,
                 parallel=mtrJobsMultiplier,
                 env=MTR_ENV,
@@ -902,7 +902,7 @@ f_without_server.addStep(
 f_without_server.addStep(
     steps.ShellCommand(
         name="save_packages",
-        timeout=7200,
+        timeout=3600,
         haltOnFailure=True,
         command=util.Interpolate(
             "mkdir -p "
@@ -1213,7 +1213,7 @@ f_bintar.addStep(
 f_bintar.addStep(
     steps.ShellCommand(
         name="save_packages",
-        timeout=7200,
+        timeout=3600,
         haltOnFailure=True,
         command=util.Interpolate(
             "mkdir -p "
diff --git a/master-docker-nonstandard/master.cfg b/master-docker-nonstandard/master.cfg
index 9422a83b..360b87db 100644
--- a/master-docker-nonstandard/master.cfg
+++ b/master-docker-nonstandard/master.cfg
@@ -1013,7 +1013,7 @@ def add_test_steps(factory, test_types):
                         ),
                     ),
                 ],
-                timeout=10800,
+                timeout=3600,
                 dbpool=mtrDbPool,
                 parallel=mtrJobsMultiplier,
                 env=MTR_ENV,
@@ -1149,7 +1149,7 @@ f_without_server.addStep(
 f_without_server.addStep(
     steps.ShellCommand(
         name="save_packages",
-        timeout=7200,
+        timeout=3600,
         haltOnFailure=True,
         command=util.Interpolate(
             "mkdir -p "
@@ -1461,7 +1461,7 @@ f_bintar.addStep(
 f_bintar.addStep(
     steps.ShellCommand(
         name="save_packages",
-        timeout=7200,
+        timeout=3600,
         haltOnFailure=True,
         command=util.Interpolate(
             "mkdir -p "