Added openshift support