Added OpenShift Support