Making it OpenShift Compatible