Updated for OpenShift