diff --git a/packages/components/package.json b/packages/components/package.json
index 56d4648e0e..b02e6043e6 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -11,14 +11,11 @@
     "access": "public"
   },
   "main": "dist/index.cjs.js",
-  "module": "dist/index.js",
-  "es2015": "dist/esm/index.js",
-  "es2017": "dist/esm/index.js",
-  "jsnext:main": "dist/esm/index.js",
+  "module": "dist/custom-elements/index.js",
+  "unpkg": "dist/scale-components/scale-components.esm.js",
   "types": "dist/types/components.d.ts",
   "collection": "dist/collection/collection-manifest.json",
   "collection:main": "dist/collection/index.js",
-  "unpkg": "dist/scale-components/scale-components.esm.js",
   "files": [
     "assets/",
     "dist/",
@@ -43,7 +40,6 @@
     "@babel/plugin-transform-react-jsx": "7.10.1",
     "@nowseemee/vue-output-target": "0.0.4",
     "@stencil/angular-output-target": "^0.0.5",
-    "@stencil/core": "~2.3.0",
     "@stencil/postcss": "^2.0.0",
     "@stencil/react-output-target": "^0.0.9",
     "@types/classnames": "2.2.8",
@@ -72,6 +68,7 @@
   "dependencies": {
     "@duetds/date-picker": "1.2.0",
     "@proyecto26/animatable-component": "^1.1.8",
+    "@stencil/core": "~2.3.0",
     "@telekom/scale-design-tokens": "^3.0.0-beta.12",
     "classnames": "^2.2.6",
     "stencil-inline-svg": "^1.0.1",
diff --git a/packages/components/stencil.config.ts b/packages/components/stencil.config.ts
index 6ada577cd5..7508bee2f9 100644
--- a/packages/components/stencil.config.ts
+++ b/packages/components/stencil.config.ts
@@ -48,6 +48,9 @@ export const config: Config = {
         { src: '.npmignore', warn: true },
       ],
     },
+    {
+      type: 'dist-custom-elements-bundle',
+    },
     {
       type: 'www',
       serviceWorker: null, // disable service workers