diff --git a/packages/docusaurus/src/webpack/base.ts b/packages/docusaurus/src/webpack/base.ts
index 039e03c532..b25ce03c7b 100644
--- a/packages/docusaurus/src/webpack/base.ts
+++ b/packages/docusaurus/src/webpack/base.ts
@@ -81,6 +81,20 @@ export function createBaseConfig(
         cacheGroups: {
           // disable the built-in cacheGroups
           default: false,
+          vendor: {
+            test: /[\\/]node_modules[\\/]/,
+            priority: 30,
+            minSize: 250000,
+            name(module) {
+              // get the package name. E.g. node_modules/packageName/not/this/part
+              const packageName = module.context.match(
+                /[\\/]node_modules[\\/](.*?)([\\/]|$)/,
+              )[1];
+
+              // some servers don't like @ symbols as filename
+              return `${packageName.replace('@', '')}`;
+            },
+          },
           vendors: {
             test: /[\\/]node_modules[\\/]/,
             name: 'vendors',
@@ -90,7 +104,6 @@ export function createBaseConfig(
           },
           common: {
             name: 'common',
-            chunks: 'all',
             minChunks: 2,
             priority: 10,
             reuseExistingChunk: true,