[UPDATE] Openshift Compliant