AUI-1649 - Rengerate build-modules