Changes for openShift