Further OpenShift tweaks