COMMONS-341 Simplify the addon configuration