refactor for openshift