diff --git a/Makefile b/Makefile
index 7f92e918a6..68deed43e6 100644
--- a/Makefile
+++ b/Makefile
@@ -977,7 +977,8 @@ 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'
 
-# Openshift placeholders
+# Openshift placeholders, these are good for bootstrapping a totally fresh Openshift Node but not for re-running
+# So you may want to pick and choose the functionality in these targets based on what you are doing
 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 .
@@ -988,15 +989,20 @@ openshift-production-tag: openshift-production-build
 
 openshift-image-push: openshift-production-tag
 	oc login -u developer && \
-	docker login -u developer -p ${oc whoami -t} 172.30.1.1:5000 && \
+	docker login -u developer -p $(shell 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
+openshift-preconfig:
+	oc login -u developer || true && \
+	oc new-project tower || true && \
+	oc adm policy add-role-to-user admin developer -n tower
+
+openshift-deploy: openshift-preconfig 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 && \
+	echo "Waiting for PG to come online" && \
+	sleep 15 && \
 	oc apply -f installer/openshift/config/configmap.yml && \
 	oc apply -f installer/openshift/config/deployment.yml