Adapted for Openshift