Added OpenShift support