diff --git a/packages/strapi-plugin-email/config/functions/bootstrap.js b/packages/strapi-plugin-email/config/functions/bootstrap.js
index fa2b34617b..7fb453ac7d 100644
--- a/packages/strapi-plugin-email/config/functions/bootstrap.js
+++ b/packages/strapi-plugin-email/config/functions/bootstrap.js
@@ -30,6 +30,20 @@ module.exports = async cb => {
         return _.startsWith(node_module, 'strapi-provider-email') || _.startsWith(node_module, 'strapi-email');
       });
 
+      node_modules.filter((node_module) => {
+        return node_module.startsWith('@');
+      })
+        .forEach((orga) => {
+          const node_modules = fs.readdirSync(path.join(basePath, 'node_modules', orga));
+
+          node_modules.forEach((node_module) => {
+            // DEPRECATED strapi-email-* will be remove in next version
+            if (_.startsWith(node_module, 'strapi-provider-email') || _.startsWith(node_module, 'strapi-email')) {
+              emails.push(`${orga}/${node_module}`);
+            }
+          });
+        });
+
       // mount all providers to get configs
       _.forEach(emails, (node_module) => {
         strapi.plugins.email.config.providers.push(
diff --git a/packages/strapi-plugin-upload/config/functions/bootstrap.js b/packages/strapi-plugin-upload/config/functions/bootstrap.js
index d437af25e2..fc8451c011 100644
--- a/packages/strapi-plugin-upload/config/functions/bootstrap.js
+++ b/packages/strapi-plugin-upload/config/functions/bootstrap.js
@@ -30,6 +30,20 @@ module.exports = async cb => {
         return _.startsWith(node_module, 'strapi-provider-upload') || _.startsWith(node_module, 'strapi-upload');
       });
 
+      node_modules.filter((node_module) => {
+        return node_module.startsWith('@');
+      })
+        .forEach((orga) => {
+          const node_modules = fs.readdirSync(path.join(basePath, 'node_modules', orga));
+
+          node_modules.forEach((node_module) => {
+            // DEPRECATED strapi-email-* will be remove in next version
+            if (_.startsWith(node_module, 'strapi-provider-upload') || _.startsWith(node_module, 'strapi-upload')) {
+              uploads.push(`${orga}/${node_module}`);
+            }
+          });
+        });
+
       // mount all providers to get configs
       _.forEach(uploads, (node_module) => {
         strapi.plugins.upload.config.providers.push(