Openshift refactor