LPS-33545 Apply new pattern to selection of roles