diff --git a/umich-notebook/global_nbgrader_config.py b/umich-notebook/global_nbgrader_config.py
index 5ca30b1..e2b0eb1 100644
--- a/umich-notebook/global_nbgrader_config.py
+++ b/umich-notebook/global_nbgrader_config.py
@@ -10,5 +10,5 @@
 c.Exchange.path_includes_course = True
 c.Exchange.root = "/srv/nbgrader/exchange"
 
-c.ExecutePreprocessor.iopub_timeout=180
-c.ExecutePreprocessor.timeout=360
+c.ExecutePreprocessor.iopub_timeout=1800
+c.ExecutePreprocessor.timeout=3600