diff --git a/Makefile b/Makefile
index 1d4552496d..7f92e918a6 100644
--- a/Makefile
+++ b/Makefile
@@ -977,6 +977,28 @@ clean-elk:
 psql-container:
 	docker run -it --net tools_default --rm postgres:9.4.1 sh -c 'exec psql -h "postgres" -p "5432" -U postgres'
 
-docker-production-build: dist/ansible-tower.tar.gz
-	docker build -t ansible/tower_web -f packaging/docker/Dockerfile .
-	docker build -t ansible/tower_task -f packaging/docker/Dockerfile.celery .
+# Openshift placeholders
+openshift-production-build: dist/ansible-tower.tar.gz
+	docker build -t ansible/tower_web -f installer/openshift/Dockerfile .
+	docker build -t ansible/tower_task -f installer/openshift/Dockerfile.celery .
+
+openshift-production-tag: openshift-production-build
+	docker tag ansible/tower_web:latest 172.30.1.1:5000/tower/tower_web:latest
+	docker tag ansible/tower_task:latest 172.30.1.1:5000/tower/tower_task:latest
+
+openshift-image-push: openshift-production-tag
+	oc login -u developer && \
+	docker login -u developer -p ${oc whoami -t} 172.30.1.1:5000 && \
+	docker push 172.30.1.1:5000/tower/tower_web:latest && \
+	docker push 172.30.1.1:5000/tower/tower_task:latest
+
+openshift-deploy: openshift-image-push
+	oc login -u developer && \
+	oc new-project tower && \
+	oc adm policy add-role-to-user admin developer -n tower && \
+	oc new-app --template=postgresql-persistent -e MEMORY_LIMIT=512Mi -e NAMESPACE=openshift -e DATABASE_SERVICE_NAME=postgresql -e POSTGRESQL_USER=tower -e POSTGRESQL_PASSWORD=password123 -e POSTGRESQL_DATABASE=tower -e VOLUME_CAPACITY=1Gi -e POSTGRESQL_VERSION=9.5 -n tower && \
+	oc apply -f installer/openshift/config/configmap.yml && \
+	oc apply -f installer/openshift/config/deployment.yml
+
+openshift-delete:
+	oc delete -f installer/openshift/config/deployment.yml
diff --git a/installer/openshift/Dockerfile b/installer/openshift/Dockerfile
index 1e6b9e1b9c..aa294fc8dd 100644
--- a/installer/openshift/Dockerfile
+++ b/installer/openshift/Dockerfile
@@ -38,10 +38,10 @@ COPY dist/ansible-tower-3.2.0.tar.gz /tmp/ansible-tower-3.2.0.tar.gz
 RUN pip install /tmp/ansible-tower-3.2.0.tar.gz
 # TODO: Replace this with the actual version
 RUN echo "3.2.0" > /var/lib/awx/.tower_version
-ADD packaging/docker/nginx.conf /etc/nginx/nginx.conf
-ADD packaging/docker/supervisor.conf /supervisor.conf
-ADD packaging/docker/launch_tower.sh /usr/bin/launch_tower.sh
-ADD packaging/docker/settings.py /etc/tower/settings.py
+ADD installer/openshift/nginx.conf /etc/nginx/nginx.conf
+ADD installer/openshift/supervisor.conf /supervisor.conf
+ADD installer/openshift/launch_tower.sh /usr/bin/launch_tower.sh
+ADD installer/openshift/settings.py /etc/tower/settings.py
 RUN yum -y remove gcc postgresql-devel libxml2-devel libxslt-devel cyrus-sasl-devel openldap-devel xmlsec1-devel krb5-devel xmlsec1-openssl-devel libtool-ltdl-devel gcc-c++ python-devel && yum -y clean all
 RUN rm -rf /root/.cache
 RUN chmod g+w /etc/passwd
diff --git a/installer/openshift/Dockerfile.celery b/installer/openshift/Dockerfile.celery
index 6852630b45..fac1ba9e21 100644
--- a/installer/openshift/Dockerfile.celery
+++ b/installer/openshift/Dockerfile.celery
@@ -38,10 +38,10 @@ COPY dist/ansible-tower-3.2.0.tar.gz /tmp/ansible-tower-3.2.0.tar.gz
 RUN pip install /tmp/ansible-tower-3.2.0.tar.gz
 # TODO: Replace this with the actual version
 RUN echo "3.2.0" > /var/lib/awx/.tower_version
-ADD packaging/docker/nginx.conf /etc/nginx/nginx.conf
-ADD packaging/docker/supervisor_task.conf /supervisor_task.conf
-ADD packaging/docker/launch_tower_task.sh /usr/bin/launch_tower_task.sh
-ADD packaging/docker/settings.py /etc/tower/settings.py
+ADD installer/openshift/nginx.conf /etc/nginx/nginx.conf
+ADD installer/openshift/supervisor_task.conf /supervisor_task.conf
+ADD installer/openshift/launch_tower_task.sh /usr/bin/launch_tower_task.sh
+ADD installer/openshift/settings.py /etc/tower/settings.py
 RUN yum -y remove gcc postgresql-devel libxml2-devel libxslt-devel cyrus-sasl-devel openldap-devel xmlsec1-devel krb5-devel xmlsec1-openssl-devel libtool-ltdl-devel gcc-c++ python-devel && yum -y clean all
 RUN rm -rf /root/.cache
 RUN chmod g+w /etc/passwd
diff --git a/installer/openshift/config/deployment.yml b/installer/openshift/config/deployment.yml
index b4d7dcaccf..1d464b20c6 100644
--- a/installer/openshift/config/deployment.yml
+++ b/installer/openshift/config/deployment.yml
@@ -27,13 +27,13 @@ spec:
               name: tower-application-config
           env:
             - name: DATABASE_USER
-              value: postgres
+              value: tower
             - name: DATABASE_NAME
               value: tower
             - name: DATABASE_HOST
               value: postgresql
             - name: DATABASE_PASSWORD
-              value: password
+              value: password123
         - name: tower-rabbit
           image: rabbitmq:3
           env: