new version that works with OpenShift