diff --git a/src/app/base/sagas/http.ts b/src/app/base/sagas/http.ts
index 45752fb446..3c5a4666e6 100644
--- a/src/app/base/sagas/http.ts
+++ b/src/app/base/sagas/http.ts
@@ -10,7 +10,6 @@ import type { Script } from "@/app/store/script/types";
 import { ScriptResultNames } from "@/app/store/scriptresult/types";
 import type { SimpleNode } from "@/app/store/types/node";
 import { getCookie } from "@/app/utils";
-import bakery from "@/bakery";
 
 type CSRFToken = string;
 
@@ -102,17 +101,19 @@ export const api = {
     },
     externalLogin: (): Promise<XMLHttpRequest["response"]> => {
       return new Promise((resolve, reject) => {
-        bakery.get(
-          BAKERY_LOGIN_API,
-          DEFAULT_HEADERS,
-          (_: unknown, response: XMLHttpRequest["response"]) => {
-            if (response.currentTarget.status !== 200) {
-              localStorage.clear();
-              reject(Error(response.currentTarget.responseText));
-            } else {
-              resolve({ response });
+        import("@/bakery").then(({ default: bakery }) =>
+          bakery.get(
+            BAKERY_LOGIN_API,
+            DEFAULT_HEADERS,
+            (_: unknown, response: XMLHttpRequest["response"]) => {
+              if (response.currentTarget.status !== 200) {
+                localStorage.clear();
+                reject(Error(response.currentTarget.responseText));
+              } else {
+                resolve({ response });
+              }
             }
-          }
+          )
         );
       });
     },
diff --git a/vite.config.ts b/vite.config.ts
index 293c366d01..cb88922d1e 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -4,6 +4,13 @@ import react from "@vitejs/plugin-react-swc";
 import * as path from "path";
 import eslint from "vite-plugin-eslint";
 
+const manualChunks = [
+  "@canonical/react-components",
+  "@canonical/maas-react-components",
+  "@canonical/macaroon-bakery",
+  "@/app/store/machine/slice",
+];
+
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
   const env = loadEnv(mode, "./");
@@ -20,6 +27,18 @@ export default defineConfig(({ mode }) => {
       rollupOptions: {
         output: {
           sanitizeFileName: false,
+          // Creates an object with sanitized camel-cased module names as keys and original module names as values.
+          // e.g.: { "canonicalReactComponents": ["@canonical/react-components"] }.
+          manualChunks: manualChunks.reduce((chunks, module) => {
+            const sanitizedModule = module
+              .replace(/(^|[-\/])(.)/g, (_, _separator, letter) =>
+                letter.toUpperCase()
+              )
+              .replace(/[^a-zA-Z0-9]/g, "")
+              .replace(/^./, (firstChar) => firstChar.toLowerCase());
+            chunks[sanitizedModule] = [module];
+            return chunks;
+          }, {}),
         },
       },
       sourcemap: true,