LPS-42880 Follow existing dir patterns