Updates for openshift