ENYO-2938: factorize bundles definition