diff --git a/packages/cli/config/tsconfig.json b/packages/cli/config/tsconfig.json
index a70ede280b..32f83edc9d 100644
--- a/packages/cli/config/tsconfig.json
+++ b/packages/cli/config/tsconfig.json
@@ -6,7 +6,8 @@
     "noEmit": false,
     "declarationMap": true,
     "incremental": true,
-    "module": "es6",
+    "target": "ES2019",
+    "module": "ESNext",
     "resolveJsonModule": true,
     "esModuleInterop": true,
     "types": ["node", "jest"]
diff --git a/packages/cli/src/commands/plugin/rollup.config.ts b/packages/cli/src/commands/plugin/rollup.config.ts
index e267bb9582..95077e2df3 100644
--- a/packages/cli/src/commands/plugin/rollup.config.ts
+++ b/packages/cli/src/commands/plugin/rollup.config.ts
@@ -27,8 +27,8 @@ import { paths } from 'lib/paths';
 export default {
   input: 'src/index.ts',
   output: {
-    file: 'dist/index.cjs.js',
-    format: 'cjs',
+    file: 'dist/index.esm.js',
+    format: 'module',
   },
   plugins: [
     peerDepsExternal({
diff --git a/packages/cli/templates/default-app/plugins/welcome/package.json.hbs b/packages/cli/templates/default-app/plugins/welcome/package.json.hbs
index 0f2cb3e1d0..d936bb0784 100644
--- a/packages/cli/templates/default-app/plugins/welcome/package.json.hbs
+++ b/packages/cli/templates/default-app/plugins/welcome/package.json.hbs
@@ -1,7 +1,7 @@
 {
   "name": "plugin-welcome",
   "version": "0.0.0",
-  "main": "dist/index.cjs.js",
+  "main": "dist/index.esm.js",
   "types": "dist/index.d.ts",
   "private": true,
   "scripts": {
diff --git a/packages/cli/templates/default-plugin/package.json.hbs b/packages/cli/templates/default-plugin/package.json.hbs
index 7603d24618..dad663ce2c 100644
--- a/packages/cli/templates/default-plugin/package.json.hbs
+++ b/packages/cli/templates/default-plugin/package.json.hbs
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-{{id}}",
   "version": "{{version}}",
-  "main": "dist/index.cjs.js",
+  "main": "dist/index.esm.js",
   "types": "dist/index.d.ts",
   "license": "Apache-2.0",
   "private": true,
diff --git a/packages/core/package.json b/packages/core/package.json
index a5f7c35c16..1d4372f15c 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -16,7 +16,7 @@
     "backstage"
   ],
   "license": "Apache-2.0",
-  "main": "dist/index.cjs.js",
+  "main": "dist/index.esm.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "backstage-cli plugin:build",
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index 2a241f6a9a..bafbab2e32 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -16,7 +16,7 @@
     "backstage"
   ],
   "license": "Apache-2.0",
-  "main": "dist/index.cjs.js",
+  "main": "dist/index.esm.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "backstage-cli plugin:build",
diff --git a/packages/test-utils-core/package.json b/packages/test-utils-core/package.json
index 4d695f2d61..33c27dba62 100644
--- a/packages/test-utils-core/package.json
+++ b/packages/test-utils-core/package.json
@@ -16,7 +16,7 @@
     "backstage"
   ],
   "license": "Apache-2.0",
-  "main": "dist/index.cjs.js",
+  "main": "dist/index.esm.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "backstage-cli plugin:build",
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index 5326cc2e07..e34a750ae0 100644
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -16,7 +16,7 @@
     "backstage"
   ],
   "license": "Apache-2.0",
-  "main": "dist/index.cjs.js",
+  "main": "dist/index.esm.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "backstage-cli plugin:build",
diff --git a/packages/theme/package.json b/packages/theme/package.json
index 0a30f884e0..c3f7f6c57b 100644
--- a/packages/theme/package.json
+++ b/packages/theme/package.json
@@ -16,7 +16,7 @@
     "backstage"
   ],
   "license": "Apache-2.0",
-  "main": "dist/index.cjs.js",
+  "main": "dist/index.esm.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "backstage-cli plugin:build",
diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json
index 2db84d275a..086c639bc1 100644
--- a/plugins/graphiql/package.json
+++ b/plugins/graphiql/package.json
@@ -16,7 +16,7 @@
     "backstage"
   ],
   "license": "Apache-2.0",
-  "main": "dist/index.cjs.js",
+  "main": "dist/index.esm.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "backstage-cli plugin:build",
diff --git a/plugins/home-page/package.json b/plugins/home-page/package.json
index 17c973bd35..6bd38a265a 100644
--- a/plugins/home-page/package.json
+++ b/plugins/home-page/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-home-page",
   "version": "0.1.1-alpha.4",
-  "main": "dist/index.cjs.js",
+  "main": "dist/index.esm.js",
   "types": "dist/index.d.ts",
   "license": "Apache-2.0",
   "private": true,
diff --git a/plugins/inventory/package.json b/plugins/inventory/package.json
index 8a260d2778..85ebe7fc34 100644
--- a/plugins/inventory/package.json
+++ b/plugins/inventory/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-inventory",
   "version": "0.1.1-alpha.4",
-  "main": "dist/index.cjs.js",
+  "main": "dist/index.esm.js",
   "types": "dist/index.d.ts",
   "license": "Apache-2.0",
   "private": true,
diff --git a/plugins/lighthouse/package.json b/plugins/lighthouse/package.json
index 01e3e5c81b..852fe0f881 100644
--- a/plugins/lighthouse/package.json
+++ b/plugins/lighthouse/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-lighthouse",
   "version": "0.1.1-alpha.4",
-  "main": "dist/index.cjs.js",
+  "main": "dist/index.esm.js",
   "types": "dist/index.d.ts",
   "license": "Apache-2.0",
   "private": true,
diff --git a/plugins/tech-radar/package.json b/plugins/tech-radar/package.json
index dd1747b02d..3d51d2ef8d 100644
--- a/plugins/tech-radar/package.json
+++ b/plugins/tech-radar/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-tech-radar",
   "version": "0.1.1-alpha.4",
-  "main": "dist/index.cjs.js",
+  "main": "dist/index.esm.js",
   "types": "dist/index.d.ts",
   "license": "Apache-2.0",
   "private": true,
diff --git a/plugins/welcome/package.json b/plugins/welcome/package.json
index fd093f685b..007151e8dc 100644
--- a/plugins/welcome/package.json
+++ b/plugins/welcome/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-welcome",
   "version": "0.1.1-alpha.4",
-  "main": "dist/index.cjs.js",
+  "main": "dist/index.esm.js",
   "types": "dist/index.d.ts",
   "private": true,
   "license": "Apache-2.0",