[#52117673] reduced the number of build to iterate through