Further OpenShift tweaks
Further OpenShift tweaks