diff --git a/.gitignore b/.gitignore
index f124971429..f5794babbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 cjs/
 esm/
 types/
+build/
 
 # Logs
 logs
diff --git a/packages/app/src/plugins.ts b/packages/app/src/plugins.ts
index 3c757a59c9..4a85a47cbf 100644
--- a/packages/app/src/plugins.ts
+++ b/packages/app/src/plugins.ts
@@ -1,3 +1,4 @@
 /* eslint-disable notice/notice */
-export { default as HomePagePlugin } from '@backstage/plugin-home-page';
-export { default as WelcomePlugin } from '@backstage/plugin-welcome';
+import { default as HomePagePlugin } from '@backstage/plugin-home-page';
+import { default as WelcomePlugin } from '@backstage/plugin-welcome';
+export { HomePagePlugin, WelcomePlugin };
diff --git a/packages/cli/src/commands/plugin/build.ts b/packages/cli/src/commands/plugin/build.ts
index 1cbfd72413..591762618f 100644
--- a/packages/cli/src/commands/plugin/build.ts
+++ b/packages/cli/src/commands/plugin/build.ts
@@ -18,13 +18,15 @@ const rollup = require('rollup'); // "import" is not working for some reason...
 import rollupConfig from './rollup.config';
 
 export default async () => {
-  const inputOptions = {
-    input: rollupConfig.input,
-    plugins: rollupConfig.plugins,
-  };
-  const outputOptions = rollupConfig.output;
+  for (const config of rollupConfig) {
+    const inputOptions = {
+      input: config.input,
+      plugins: config.plugins,
+    };
+    const outputOptions = config.output;
 
-  const bundle = await rollup.rollup(inputOptions);
-  await bundle.generate(outputOptions);
-  await bundle.write(outputOptions);
+    const bundle = await rollup.rollup(inputOptions);
+    await bundle.generate(outputOptions);
+    await bundle.write(outputOptions);
+  }
 };
diff --git a/packages/cli/src/commands/plugin/rollup.config.ts b/packages/cli/src/commands/plugin/rollup.config.ts
index 85287ae752..fd2ae756bd 100644
--- a/packages/cli/src/commands/plugin/rollup.config.ts
+++ b/packages/cli/src/commands/plugin/rollup.config.ts
@@ -21,23 +21,34 @@ import resolve from '@rollup/plugin-node-resolve';
 import postcss from 'rollup-plugin-postcss';
 import image from 'rollup-plugin-image-files';
 
-export default {
-  input: 'src/index.ts',
-  output: {
-    file: 'build/index.esm.js',
-    format: 'esm',
-    sourcemap: true,
-  },
+const plugins = [
+  peerDepsExternal(),
+  resolve(),
+  commonjs({
+    include: ['node_modules/**', '../../node_modules/**'],
+    exclude: ['**/*.stories.js'],
+  }),
+  postcss(),
+  image(),
+  typescript(),
+];
 
-  plugins: [
-    peerDepsExternal(),
-    resolve(),
-    commonjs({
-      include: ['node_modules/**', '../../node_modules/**'],
-      exclude: ['**/*.stories.js'],
-    }),
-    postcss(),
-    image(),
-    typescript(),
-  ],
-};
+export default [
+  {
+    input: 'src/index.ts',
+    output: {
+      file: 'build/index.esm.js',
+      format: 'esm',
+      sourcemap: true,
+    },
+    plugins,
+  },
+  {
+    input: 'src/index.ts',
+    output: {
+      file: 'build/index.cjs.js',
+      format: 'cjs',
+    },
+    plugins,
+  },
+];
diff --git a/plugins/home-page/package.json b/plugins/home-page/package.json
index cd755627bd..ae4da55df6 100644
--- a/plugins/home-page/package.json
+++ b/plugins/home-page/package.json
@@ -1,6 +1,7 @@
 {
   "name": "@backstage/plugin-home-page",
   "version": "0.1.1-alpha.0",
+  "main": "build/index.cjs.js",
   "module": "build/index.esm.js",
   "types": "build/index.d.ts",
   "license": "Apache-2.0",
diff --git a/plugins/welcome/package.json b/plugins/welcome/package.json
index 97a2a08772..a90d2e0a90 100644
--- a/plugins/welcome/package.json
+++ b/plugins/welcome/package.json
@@ -1,10 +1,11 @@
 {
   "name": "@backstage/plugin-welcome",
   "version": "0.1.1-alpha.0",
+  "main": "build/index.cjs.js",
   "module": "build/index.esm.js",
   "types": "build/index.d.ts",
-  "license": "Apache-2.0",
   "private": false,
+  "license": "Apache-2.0",
   "scripts": {
     "build": "backstage-cli build-cache -- backstage-cli plugin:build",
     "lint": "backstage-cli lint",