OpenShift refactor