Update to work with Openshift