diff --git a/Makefile b/Makefile
index 8cb02df323..e43cc3037a 100644
--- a/Makefile
+++ b/Makefile
@@ -449,6 +449,9 @@ factcacher:
 	fi; \
 	$(PYTHON) manage.py run_fact_cache_receiver
 
+nginx:
+	nginx -g "daemon off;"
+
 reports:
 	mkdir -p $@
 
diff --git a/Procfile b/Procfile
index 09dfe2411c..b30dfcad2b 100644
--- a/Procfile
+++ b/Procfile
@@ -1,3 +1,4 @@
+nginx:          make nginx
 runworker:      make runworker
 daphne:         make daphne
 celeryd:        make celeryd
diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile
index 2527b2bb35..834537858a 100644
--- a/tools/docker-compose/Dockerfile
+++ b/tools/docker-compose/Dockerfile
@@ -23,8 +23,8 @@ ADD tools/docker-compose/ansible-tower.egg-link /tmp/ansible-tower.egg-link
 ADD tools/docker-compose/tower-manage /usr/local/bin/tower-manage
 ADD tools/docker-compose/awx-manage /usr/local/bin/awx-manage
 ADD tools/docker-compose/ansible_tower.egg-info /tmp/ansible_tower.egg-info
-ADD tools/docker-compose/nginx.conf /etc/nginx/nginx.conf
-ADD tools/docker-compose/nginx.vh.default.conf /etc/nginx/conf.d/nginx.vh.default.conf
+RUN ln -Ffs /tower_devel/tools/docker-compose/nginx.conf /etc/nginx/nginx.conf
+RUN ln -Ffs /tower_devel/tools/docker-compose/nginx.vh.default.conf /etc/nginx/conf.d/nginx.vh.default.conf
 RUN ln -s /tower_devel/tools/docker-compose/start_development.sh /start_development.sh
 RUN openssl req -nodes -newkey rsa:2048 -keyout /etc/nginx/nginx.key -out /etc/nginx/nginx.csr -subj "/C=US/ST=North Carolina/L=Durham/O=Ansible/OU=Tower Development/CN=tower.localhost"
 RUN openssl x509 -req -days 365 -in /etc/nginx/nginx.csr -signkey /etc/nginx/nginx.key -out /etc/nginx/nginx.crt
diff --git a/tools/docker-compose/nginx.vh.default.conf b/tools/docker-compose/nginx.vh.default.conf
index 60073d4797..52780698f4 100644
--- a/tools/docker-compose/nginx.vh.default.conf
+++ b/tools/docker-compose/nginx.vh.default.conf
@@ -1,9 +1,9 @@
 upstream uwsgi {
-    server tower:8050;
+    server localhost:8050;
 }
 
 upstream daphne {
-    server tower:8051;
+    server localhost:8051;
 }
 
 server {
diff --git a/tools/docker-compose/start_development.sh b/tools/docker-compose/start_development.sh
index 01fa0a9dcd..e2db66c3e4 100755
--- a/tools/docker-compose/start_development.sh
+++ b/tools/docker-compose/start_development.sh
@@ -40,8 +40,5 @@ make version_file
 make migrate
 make init
 
-# Start nginx
-nginx
-
 # Start the service
 make honcho