diff --git a/Makefile b/Makefile
index 8bf3766abd..27aa0419f2 100644
--- a/Makefile
+++ b/Makefile
@@ -406,7 +406,7 @@ uwsgi: collectstatic
 	@if [ "$(VENV_BASE)" ]; then \
 		. $(VENV_BASE)/tower/bin/activate; \
 	fi; \
-    uwsgi -b 32768 --socket :8050 --module=awx.wsgi:application --home=/venv/tower --chdir=/tower_devel/ --vacuum --processes=5 --harakiri=60 --master --no-orphans --py-autoreload 1 --max-requests=1000 --stats /tmp/stats.socket --master-fifo=/tmp/awxfifo --lazy-apps
+    uwsgi -b 32768 --socket :8050 --module=awx.wsgi:application --home=/venv/tower --chdir=/tower_devel/ --vacuum --processes=5 --harakiri=120 --master --no-orphans --py-autoreload 1 --max-requests=1000 --stats /tmp/stats.socket --master-fifo=/tmp/awxfifo --lazy-apps
 
 daphne:
 	@if [ "$(VENV_BASE)" ]; then \
diff --git a/config/awx-nginx.conf b/config/awx-nginx.conf
index eefb763834..30806cbfe8 100644
--- a/config/awx-nginx.conf
+++ b/config/awx-nginx.conf
@@ -23,8 +23,8 @@ http {
     }
 
     sendfile        on;
-    #tcp_nopush     on;
-    #gzip  on;
+    tcp_nopush      on;
+    tcp_nodelay     on;
  
     upstream uwsgi {
         server 127.0.0.1:8050;
@@ -45,7 +45,7 @@ http {
 
         # If you have a domain name, this is where to add it
         server_name _;
-        keepalive_timeout 60;
+        keepalive_timeout 65;
 
         ssl_certificate /etc/tower/tower.cert;
         ssl_certificate_key /etc/tower/tower.key;
@@ -87,8 +87,7 @@ http {
         }      
 
         location / {
-            uwsgi_read_timeout 30s;
-            uwsgi_send_timeout 30s;
+            uwsgi_read_timeout 120s;
             uwsgi_pass uwsgi;
             include /etc/nginx/uwsgi_params;
         }
diff --git a/tools/docker-compose/nginx.vh.default.conf b/tools/docker-compose/nginx.vh.default.conf
index 98c704671c..456b16953d 100644
--- a/tools/docker-compose/nginx.vh.default.conf
+++ b/tools/docker-compose/nginx.vh.default.conf
@@ -17,7 +17,7 @@ server {
 
 	# If you have a domain name, this is where to add it
     server_name _;
-	keepalive_timeout 60;
+	keepalive_timeout 65;
 
 	ssl_certificate /etc/nginx/nginx.crt;
 	ssl_certificate_key /etc/nginx/nginx.key;
@@ -64,9 +64,8 @@ server {
 	}      
 
 	location / {
-                uwsgi_read_timeout 30s;
-                uwsgi_send_timeout 30s;
-                uwsgi_pass uwsgi;
+        uwsgi_read_timeout 120s;
+        uwsgi_pass uwsgi;
 		include /etc/nginx/uwsgi_params;
 	}
 }