Adding OpenShift compatibility updates