Changes for openshift