Changes to work with OpenShift host