Updated for openshift