Changes for Openshift