Index: Bugzilla/DaemonControl.pm
===================================================================
--- Bugzilla/DaemonControl.pm
+++ Bugzilla/DaemonControl.pm
@@ -176,7 +176,7 @@
 
 sub assert_httpd {
   my $loop   = IO::Async::Loop->new;
-  my $port   = $ENV{PORT} // 8000;
+  my $port   = $ENV{PORT} // 3000;
   my $repeat = repeat {
     $loop->delay_future(after => 0.25)->then(
       sub {
Index: Bugzilla/Util.pm
===================================================================
--- Bugzilla/Util.pm
+++ Bugzilla/Util.pm
@@ -978,7 +978,7 @@
     || Bugzilla->memcached->get_data({key => $key});
 
   unless ($versions) {
-    my $ua = Mojo::UserAgent->new(request_timeout => 30, connect_timeout => 5);
+    my $ua = Mojo::UserAgent->new(request_timeout => 30, connect_timeout => 30);
     if (my $proxy_url = Bugzilla->params->{'proxy_url'}) {
       $ua->proxy->http($proxy_url);
     }
Index: bugzilla.pl
===================================================================
--- bugzilla.pl
+++ bugzilla.pl
@@ -14,7 +14,5 @@
 }
 use Mojolicious::Commands;
 
-$ENV{MOJO_LISTEN} ||= $ENV{PORT} ? "http://*:$ENV{PORT}" : "http://*:3001";
-
 # Start command line interface for application
 Mojolicious::Commands->start_app('Bugzilla::App');
Index: docker-compose.yml
===================================================================
--- docker-compose.yml
+++ docker-compose.yml
@@ -5,7 +5,17 @@
 version: '3.4'
 
 services:
+
   bmo.test:
+    image: nginx:alpine
+    volumes:
+      - ./docker/nginx/site.conf:/etc/nginx/conf.d/default.conf:ro
+    restart: on-failure
+    depends_on:
+      - bmo.web
+      - tinyproxy
+
+  bmo.web:
     build: &bmo_build
       context: .
       dockerfile: Dockerfile
@@ -32,8 +42,6 @@
       - HTTP_BACKEND=morbo
       - LOCALCONFIG_ENV=1
       - LOG4PERL_CONFIG_FILE=log4perl-docker.conf
-      - MOJO_LISTEN=http://*:80
-      - PORT=80
     depends_on:
       - bmo.db
       - memcached
Index: docker/nginx/site.conf
===================================================================
--- docker/nginx/site.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-server {
-  server_name bmo.test;
-  location / {
-    proxy_pass http://bmo.web:3000;
-    proxy_set_header Host $host;
-  }
-}