diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 7d61532c..00000000
--- a/Dockerfile
+++ /dev/null
@@ -1,61 +0,0 @@
-FROM ghcr.io/kzrl/ubuntu:lucid
-
-# Set environment variables.
-ENV HOME /root
-
-# Define working directory.
-WORKDIR /root
-
-RUN sed -i 's/archive/old-releases/' /etc/apt/sources.list
-
-
-RUN apt-get update
-RUN apt-get -y upgrade
-
-# Install apache, PHP, and supplimentary programs. curl and lynx-cur are for debugging the container.
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install apache2 libapache2-mod-php5 php5-mysql php5-gd php-pear php-apc php5-curl php5-imap
-
-# Enable apache mods.
-#RUN php5enmod openssl
-RUN a2enmod php5
-RUN a2enmod rewrite
-RUN a2enmod headers
-
-
-# Update the PHP.ini file, enable <? ?> tags and quieten logging.
-# RUN sed -i "s/short_open_tag = Off/short_open_tag = On/" /etc/php5/apache2/php.ini
-#RUN sed -i "s/error_reporting = .*$/error_reporting = E_ERROR | E_WARNING | E_PARSE/" /etc/php5/apache2/php.ini
-
-ADD conf/php.ini /etc/php5/apache2/php.ini
-
-# Manually set up the apache environment variables
-ENV APACHE_RUN_USER www-data
-ENV APACHE_RUN_GROUP www-data
-ENV APACHE_LOG_DIR /var/log/apache2
-ENV APACHE_LOCK_DIR /var/lock/apache2
-ENV APACHE_PID_FILE /var/run/apache2.pid
-
-ARG COMMIT
-ENV COMMIT_SHA=${COMMIT}
-
-EXPOSE 80
-
-# Update the default apache site with the config we created.
-ADD conf/apache-vhost.conf /etc/apache2/sites-available/cmc-sales
-ADD conf/ripmime /bin/ripmime
-
-RUN chmod +x /bin/ripmime
-RUN a2dissite 000-default
-RUN a2ensite cmc-sales
-
-RUN mkdir -p /var/www/cmc-sales/app/tmp/logs
-RUN chmod -R 755 /var/www/cmc-sales/app/tmp
-
-# Copy site into place.
-ADD . /var/www/cmc-sales
-RUN chmod +x /var/www/cmc-sales/run_vault.sh
-RUN chmod +x /var/www/cmc-sales/run_update_invoices.sh
-
-
-# By default, simply start apache.
-CMD /usr/sbin/apache2ctl -D FOREGROUND
diff --git a/Dockerfile.go b/Dockerfile.local.go
similarity index 100%
rename from Dockerfile.go
rename to Dockerfile.local.go
diff --git a/Dockerfile.prod b/Dockerfile.prod.php
similarity index 100%
rename from Dockerfile.prod
rename to Dockerfile.prod.php
diff --git a/Dockerfile_stg b/Dockerfile.stg.php
similarity index 97%
rename from Dockerfile_stg
rename to Dockerfile.stg.php
index 98bc5f06..32da5e7d 100644
--- a/Dockerfile_stg
+++ b/Dockerfile.stg.php
@@ -56,8 +56,8 @@ RUN chmod +x /bin/ripmime \
 # Copy site into place.
 ADD . /var/www/cmc-sales
 ADD app/config/database_stg.php /var/www/cmc-sales/app/config/database.php
-RUN mkdir /var/www/cmc-sales/app/tmp
-RUN mkdir /var/www/cmc-sales/app/tmp/logs
+RUN mkdir -p /var/www/cmc-sales/app/tmp
+RUN mkdir -p /var/www/cmc-sales/app/tmp/logs
 RUN chmod -R 755 /var/www/cmc-sales/app/tmp
 RUN chmod +x /var/www/cmc-sales/run_vault.sh
 
diff --git a/conf/nginx-site.conf b/conf/nginx-site.conf
index 1765f6f2..0940883b 100644
--- a/conf/nginx-site.conf
+++ b/conf/nginx-site.conf
@@ -3,7 +3,7 @@ server {
         auth_basic_user_file /etc/nginx/userpasswd;
         auth_basic "Restricted";
         location /go/ {
-             proxy_pass http://cmc-prod-go:8082;
+             proxy_pass http://cmc-go:8080;
              proxy_read_timeout 300s;
              proxy_set_header Host $host;
              proxy_set_header X-Real-IP $remote_addr;
@@ -11,7 +11,7 @@ server {
              proxy_set_header X-Forwarded-Proto $scheme;
         }
         location / {
-             proxy_pass http://cmc-prod-php:80;
+             proxy_pass http://cmc-php:80;
              proxy_read_timeout 300s;
              proxy_set_header Host $host;
              proxy_set_header X-Real-IP $remote_addr;
diff --git a/docker-compose.stg.yml b/docker-compose.stg.yml
index 67477ef4..c240c1ad 100644
--- a/docker-compose.stg.yml
+++ b/docker-compose.stg.yml
@@ -17,7 +17,7 @@ services:
   cmc-stg-php:
     build:
       context: .
-      dockerfile: Dockerfile_stg
+      dockerfile: Dockerfile.stg.php
     container_name: cmc-stg-php
     environment:
       MAIL_HOST: mailpit
diff --git a/docker-compose.yml b/docker-compose.yml
index cee90e0c..a2ae4abd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
   cmc-php:
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile.stg.php
     platform: linux/amd64
     container_name: cmc-php
     depends_on:
@@ -60,7 +60,7 @@ services:
   cmc-go:
     build:
       context: .
-      dockerfile: Dockerfile.go
+      dockerfile: Dockerfile.local.go
     container_name: cmc-go
     environment:
       DB_HOST: db