WIP Infra - Use openshift for service not origin