Openshift related changes