diff --git a/AppController/lib/haproxy.rb b/AppController/lib/haproxy.rb
index 12aa7534f1..41cb5af4a8 100644
--- a/AppController/lib/haproxy.rb
+++ b/AppController/lib/haproxy.rb
@@ -288,15 +288,15 @@ def self.initialize_config
   # any Mongrel, not just the one that started the session
   option redispatch
 
-  # Timeout a request if the client did not read any data for 60 seconds
-  timeout client 60000
+  # Timeout a request if the client did not read any data for 600 seconds
+  timeout client 600000
 
-  # Timeout a request if Mongrel does not accept a connection for 60 seconds
-  timeout connect 60000
+  # Timeout a request if Mongrel does not accept a connection for 600 seconds
+  timeout connect 600000
 
   # Timeout a request if Mongrel does not accept the data on the connection,
-  # or does not send a response back in 1 minute.
-  timeout server 60000
+  # or does not send a response back in 10 minutes.
+  timeout server 600000
   
   # Enable the statistics page 
   stats enable
diff --git a/AppController/lib/nginx.rb b/AppController/lib/nginx.rb
index 9dd50f4d9e..216d79cd28 100644
--- a/AppController/lib/nginx.rb
+++ b/AppController/lib/nginx.rb
@@ -141,9 +141,9 @@ def self.write_app_config(app_name, http_port, https_port, my_public_ip,
       proxy_redirect off;
       proxy_pass http://gae_#{app_name};
       client_max_body_size 2G;
-      proxy_connect_timeout 60;
-      client_body_timeout 60;
-      proxy_read_timeout 60;
+      proxy_connect_timeout 600;
+      client_body_timeout 600;
+      proxy_read_timeout 600;
     }
 DEFAULT_CONFIG
     secure_default_location = default_location
@@ -196,7 +196,7 @@ def self.write_app_config(app_name, http_port, https_port, my_public_ip,
     location /reserved-channel-appscale-path {
       proxy_buffering off;
       tcp_nodelay on;
-      keepalive_timeout 55;
+      keepalive_timeout 600;
       proxy_pass http://#{login_ip}:#{CHANNELSERVER_PORT}/http-bind;
     }
 
@@ -237,7 +237,7 @@ def self.write_app_config(app_name, http_port, https_port, my_public_ip,
     location /reserved-channel-appscale-path {
       proxy_buffering off;
       tcp_nodelay on;
-      keepalive_timeout 55;
+      keepalive_timeout 600;
       proxy_pass http://#{login_ip}:#{CHANNELSERVER_PORT}/http-bind;
     }
 
@@ -299,9 +299,9 @@ def self.write_fullproxy_app_config(app_name, http_port, https_port,
       proxy_redirect off;
       proxy_pass http://gae_ssl_#{app_name};
       client_max_body_size 2G;
-      proxy_connect_timeout 60;
-      client_body_timeout 60;
-      proxy_read_timeout 60;
+      proxy_connect_timeout 600;
+      client_body_timeout 600;
+      proxy_read_timeout 600;
     }
 DEFAULT_CONFIG
     end
@@ -319,9 +319,9 @@ def self.write_fullproxy_app_config(app_name, http_port, https_port,
       proxy_redirect off;
       proxy_pass http://gae_#{app_name};
       client_max_body_size 2G;
-      proxy_connect_timeout 60;
-      client_body_timeout 60;
-      proxy_read_timeout 60;
+      proxy_connect_timeout 600;
+      client_body_timeout 600;
+      proxy_read_timeout 600;
     }
 DEFAULT_CONFIG
     end
@@ -375,7 +375,7 @@ def self.write_fullproxy_app_config(app_name, http_port, https_port,
     location /reserved-channel-appscale-path {
       proxy_buffering off;
       tcp_nodelay on;
-      keepalive_timeout 55;
+      keepalive_timeout 600;
       proxy_pass http://#{login_ip}:#{CHANNELSERVER_PORT}/http-bind;
     }
 
@@ -450,7 +450,7 @@ def self.write_fullproxy_app_config(app_name, http_port, https_port,
     location /reserved-channel-appscale-path {
       proxy_buffering off;
       tcp_nodelay on;
-      keepalive_timeout 55;
+      keepalive_timeout 600;
       proxy_pass http://#{login_ip}:#{CHANNELSERVER_PORT}/http-bind;
     }
 
@@ -537,9 +537,9 @@ def self.create_datastore_server_config(my_ip, proxy_port)
       proxy_redirect off;
       proxy_pass http://#{DatastoreServer::NAME};
       client_max_body_size 30M;
-      proxy_connect_timeout 60;
-      client_body_timeout 60;
-      proxy_read_timeout 60;
+      proxy_connect_timeout 600;
+      client_body_timeout 600;
+      proxy_read_timeout 600;
     }
 
 }
@@ -575,8 +575,8 @@ def self.create_datastore_server_config(my_ip, proxy_port)
       proxy_set_header Host $http_host;
       proxy_redirect off;
 
-      client_body_timeout 60;
-      proxy_read_timeout 60;
+      client_body_timeout 600;
+      proxy_read_timeout 600;
       #Increase file size so larger applications can be uploaded
       client_max_body_size 30M;
       # go to proxy
@@ -730,7 +730,7 @@ def self.initialize_config
     #tcp_nopush     on;
 
     #keepalive_timeout  0;
-    keepalive_timeout  60;
+    keepalive_timeout  600;
     tcp_nodelay        on;
     server_names_hash_bucket_size 128;