diff --git a/conf/config.json b/conf/config.json
index 8fb8ddd..5ea577b 100644
--- a/conf/config.json
+++ b/conf/config.json
@@ -16,7 +16,7 @@
         "timeout": 60
     },
     "transcoder": {
-        "timeout": 600,
+        "timeout": 1200,
         "sizes": {
           "hd720": "720p",
           "hd480": "480p",
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 27fc1b2..98419f0 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -9,8 +9,8 @@ location __PATH__/ {
   # Set max upload size
   client_max_body_size 10G;
 
-  proxy_connect_timeout       600;
-  proxy_send_timeout          600;
-  proxy_read_timeout          600;
-  send_timeout                600;
+  proxy_connect_timeout       1200;
+  proxy_send_timeout          1200;
+  proxy_read_timeout          1200;
+  send_timeout                1200;
 }