Final Fix for openshift