Added Openshift Support