Merged with code to allow open shift deployment