Make add-on available for both team and individual Bitbucket accounts

At the moment developers are supposed to use one of the add-on contexts in the descriptor: account or individual. It determines whether the add-on can be installed either in a team account or in a personal account.

We have 2 add-ons for Bitbucket Cloud, Awesome Graphs and File Viewer. And we need to make them available for both types of accounts.

Each of them has one add-on key with the individual context at the moment.

For File Viewer we also made a descriptor with the 'account' context to make it possible to install the add-on in a team account by inserting the descriptor URL on the 'Custom add-ons' page in the Team settings.

But this workaround is not a good solution. Because users first try installing the add-on by selecting it in the listing of available add-ons in Bitbucket Cloud and realize it doesn't work for teams. To get it to work, they are supposed to contact us and get the descriptor URL.

We'd like to make it possible for users to install our add-ons both in individual and team accounts by adding them in the 'Find integrations and add-ons' section in Bitbucket Cloud settings without inserting the descriptor URL.

It is not a problem to make 2 versions of the same add-on (one with account context, and the other with individual). Can Bitbucket be checking the type of the account a user is using to access the listing of add-ons in settings and based on that display the relevant version of the add-on?