diff --git a/Dockerfile.cabotage b/Dockerfile.cabotage
index 35f237620..881c6bc78 100644
--- a/Dockerfile.cabotage
+++ b/Dockerfile.cabotage
@@ -1,4 +1,5 @@
 FROM python:3.9-bullseye
+COPY --from=ewdurbin/nginx-static:1.25.x /usr/bin/nginx /usr/bin/nginx
 ENV PYTHONUNBUFFERED=1
 ENV PYTHONDONTWRITEBYTECODE=1
 RUN mkdir /code
diff --git a/Procfile b/Procfile
index 1c0dd9dc1..651bc19b8 100644
--- a/Procfile
+++ b/Procfile
@@ -1,2 +1,2 @@
 release: python manage.py migrate --noinput
-web: gunicorn -c gunicorn.conf pydotorg.wsgi
+web: bin/start-nginx gunicorn -c gunicorn.conf pydotorg.wsgi
diff --git a/bin/start-nginx b/bin/start-nginx
new file mode 100755
index 000000000..91df97b18
--- /dev/null
+++ b/bin/start-nginx
@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+
+psmgr=/tmp/nginx-buildpack-wait
+rm -f $psmgr
+mkfifo $psmgr
+
+# Evaluate config to get $PORT
+erb config/nginx.conf.erb > config/nginx.conf
+
+n=1
+while getopts :f option ${@:1:2}
+do
+  case "${option}"
+  in
+    f) FORCE=$OPTIND; n=$((n+1));;
+  esac
+done
+
+# Initialize log directory.
+mkdir -p logs/nginx
+touch logs/nginx/access.log logs/nginx/error.log
+echo 'buildpack=nginx at=logs-initialized'
+
+# Start log redirection.
+(
+  # Redirect nginx logs to stdout.
+  tail -qF -n 0 logs/nginx/*.log
+  echo 'logs' >$psmgr
+) &
+
+# Start App Server
+(
+  # Take the command passed to this bin and start it.
+  # E.g. bin/start-nginx bundle exec unicorn -c config/unicorn.rb
+  COMMAND=${@:$n}
+  echo "buildpack=nginx at=start-app cmd=$COMMAND"
+  $COMMAND
+  echo 'app' >$psmgr
+) &
+
+if [[ -z "$FORCE" ]]
+then
+  FILE="/tmp/app-initialized"
+
+  # We block on app-initialized so that when nginx binds to $PORT
+  # are app is ready for traffic.
+  while [[ ! -f "$FILE" ]]
+  do
+    echo 'buildpack=nginx at=app-initialization'
+    sleep 1
+  done
+  echo 'buildpack=nginx at=app-initialized'
+fi
+
+# Start nginx
+(
+  # We expect nginx to run in foreground.
+  # We also expect a socket to be at /tmp/nginx.socket.
+  echo 'buildpack=nginx at=nginx-start'
+  /usr/bin/nginx -p . -c config/nginx.conf
+  echo 'nginx' >$psmgr
+) &
+
+# This read will block the process waiting on a msg to be put into the fifo.
+# If any of the processes defined above should exit,
+# a msg will be put into the fifo causing the read operation
+# to un-block. The process putting the msg into the fifo
+# will use it's process name as a msg so that we can print the offending
+# process to stdout.
+read exit_process <$psmgr
+echo "buildpack=nginx at=exit process=$exit_process"
+exit 1
diff --git a/config/nginx.conf.erb b/config/nginx.conf
similarity index 98%
rename from config/nginx.conf.erb
rename to config/nginx.conf
index 527fdc0df..68f841473 100644
--- a/config/nginx.conf.erb
+++ b/config/nginx.conf
@@ -1,6 +1,5 @@
 daemon off;
-#Heroku dynos have at least 4 cores.
-worker_processes <%= ENV['NGINX_WORKERS'] || 4 %>;
+worker_processes 2
 
 events {
 	use epoll;
@@ -33,7 +32,7 @@ http {
  	}
 
 	server {
-		listen <%= ENV["PORT"] %>;
+		listen unix:/var/run/cabotage/cabotage.sock;
 		server_name _;
 		keepalive_timeout 5;
 
diff --git a/gunicorn.conf b/gunicorn.conf
index 7c62a6136..49a0829e7 100644
--- a/gunicorn.conf
+++ b/gunicorn.conf
@@ -1,4 +1,4 @@
-bind = 'unix:/var/run/cabotage/cabotage.sock'
+bind = 'unix:/tmp/nginx.sock'
 backlog = 1024
 preload_app = True
 max_requests = 2048