diff --git a/config/awx-nginx.conf b/config/awx-nginx.conf
index 15e58678ba..759fc7eb5b 100644
--- a/config/awx-nginx.conf
+++ b/config/awx-nginx.conf
@@ -34,9 +34,24 @@ http {
         server 127.0.0.1:8051;
     }
 
+    server {
+        listen 80;
+        listen [::]:80;
+        server_name localhost 127.0.0.1;
+        keepalive_timeout 65;
+        location / {
+            # Add trailing / if missing
+            rewrite ^(.*[^/])$ $1/ permanent;
+            uwsgi_read_timeout 120s;
+            uwsgi_pass uwsgi;
+            include /etc/nginx/uwsgi_params;
+        }
+    }
+
     server {
         listen 80 default_server;
         listen [::]:80 default_server;
+        server_name _;
         return 301 https://$host$request_uri;
     }
 
diff --git a/tools/docker-compose/nginx.vh.default.conf b/tools/docker-compose/nginx.vh.default.conf
index 5cabf89bbb..fe3333dadf 100644
--- a/tools/docker-compose/nginx.vh.default.conf
+++ b/tools/docker-compose/nginx.vh.default.conf
@@ -6,9 +6,24 @@ upstream daphne {
     server localhost:8051;
 }
 
+server {
+    listen 8013;
+    listen [::]:8013;
+    server_name localhost 127.0.0.1;
+    keepalive_timeout 65;
+    location / {
+        # Add trailing / if missing
+        rewrite ^(.*[^/])$ $1/ permanent;
+        uwsgi_read_timeout 120s;
+        uwsgi_pass uwsgi;
+        include /etc/nginx/uwsgi_params;
+    }
+}
+
 server {
     listen 8013 default_server;
     listen [::]:8013 default_server;
+    server_name _;
     return 301 https://$host:8043$request_uri;
 }