diff --git a/authentik/core/templates/if/admin.html b/authentik/core/templates/if/admin.html
index d0c4e0edd..1365ad969 100644
--- a/authentik/core/templates/if/admin.html
+++ b/authentik/core/templates/if/admin.html
@@ -4,7 +4,7 @@
 {% load i18n %}
 
 {% block head %}
-<script src="{% static 'dist/AdminInterface.js' %}" type="module"></script>
+<script src="{% static 'dist/admin/AdminInterface.js' %}" type="module"></script>
 {% endblock %}
 
 {% block body %}
diff --git a/authentik/core/templates/if/flow.html b/authentik/core/templates/if/flow.html
index f7d164325..e3bb042ec 100644
--- a/authentik/core/templates/if/flow.html
+++ b/authentik/core/templates/if/flow.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block head %}
-<script src="{% static 'dist/FlowInterface.js' %}" type="module"></script>
+<script src="{% static 'dist/flow/FlowInterface.js' %}" type="module"></script>
 <style>
 .pf-c-background-image::before {
     --ak-flow-background: url("{{ flow.background_url }}");
diff --git a/authentik/core/templates/if/user.html b/authentik/core/templates/if/user.html
index 2fbd2a3e9..d6cbe617a 100644
--- a/authentik/core/templates/if/user.html
+++ b/authentik/core/templates/if/user.html
@@ -4,7 +4,7 @@
 {% load i18n %}
 
 {% block head %}
-<script src="{% static 'dist/UserInterface.js' %}" type="module"></script>
+<script src="{% static 'dist/user/UserInterface.js' %}" type="module"></script>
 {% endblock %}
 
 {% block body %}
diff --git a/web/rollup.config.js b/web/rollup.config.js
index 6c2a930e2..e876fb6c5 100644
--- a/web/rollup.config.js
+++ b/web/rollup.config.js
@@ -46,6 +46,7 @@ const resources = [
 const isProdBuild = process.env.NODE_ENV === "production";
 // eslint-disable-next-line no-undef
 const apiBasePath = process.env.AK_API_BASE_PATH || "";
+
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 function manualChunks(id) {
     if (id.includes("@goauthentik/api")) {
@@ -64,6 +65,24 @@ function manualChunks(id) {
     }
 }
 
+const PLUGINS = [
+    cssimport(),
+    nodeResolve({ extensions, browser: true }),
+    commonjs(),
+    babel({
+        extensions,
+        babelHelpers: "runtime",
+        include: ["src/**/*"],
+    }),
+    replace({
+        "process.env.NODE_ENV": JSON.stringify(isProdBuild ? "production" : "development"),
+        "process.env.AK_API_BASE_PATH": JSON.stringify(apiBasePath),
+        "preventAssignment": true,
+    }),
+    sourcemaps(),
+    isProdBuild && terser(),
+].filter((p) => p);
+
 export default [
     // Polyfills (imported first)
     {
@@ -96,29 +115,12 @@ export default [
         output: [
             {
                 format: "es",
-                dir: "dist",
+                dir: "dist/flow",
                 sourcemap: true,
                 manualChunks: manualChunks,
-                chunkFileNames: "flow-[name].js",
             },
         ],
-        plugins: [
-            cssimport(),
-            nodeResolve({ extensions, browser: true }),
-            commonjs(),
-            babel({
-                extensions,
-                babelHelpers: "runtime",
-                include: ["src/**/*"],
-            }),
-            replace({
-                "process.env.NODE_ENV": JSON.stringify(isProdBuild ? "production" : "development"),
-                "process.env.AK_API_BASE_PATH": JSON.stringify(apiBasePath),
-                "preventAssignment": true,
-            }),
-            sourcemaps(),
-            isProdBuild && terser(),
-        ].filter((p) => p),
+        plugins: PLUGINS,
         watch: {
             clearScreen: false,
         },
@@ -130,29 +132,12 @@ export default [
         output: [
             {
                 format: "es",
-                dir: "dist",
+                dir: "dist/admin",
                 sourcemap: true,
                 manualChunks: manualChunks,
-                chunkFileNames: "admin-[name].js",
             },
         ],
-        plugins: [
-            cssimport(),
-            nodeResolve({ extensions, browser: true }),
-            commonjs(),
-            babel({
-                extensions,
-                babelHelpers: "runtime",
-                include: ["src/**/*"],
-            }),
-            replace({
-                "process.env.NODE_ENV": JSON.stringify(isProdBuild ? "production" : "development"),
-                "process.env.AK_API_BASE_PATH": JSON.stringify(apiBasePath),
-                "preventAssignment": true,
-            }),
-            sourcemaps(),
-            isProdBuild && terser(),
-        ].filter((p) => p),
+        plugins: PLUGINS,
         watch: {
             clearScreen: false,
         },
@@ -164,29 +149,12 @@ export default [
         output: [
             {
                 format: "es",
-                dir: "dist",
+                dir: "dist/user",
                 sourcemap: true,
                 manualChunks: manualChunks,
-                chunkFileNames: "user-[name].js",
             },
         ],
-        plugins: [
-            cssimport(),
-            nodeResolve({ extensions, browser: true }),
-            commonjs(),
-            babel({
-                extensions,
-                babelHelpers: "runtime",
-                include: ["src/**/*"],
-            }),
-            replace({
-                "process.env.NODE_ENV": JSON.stringify(isProdBuild ? "production" : "development"),
-                "process.env.AK_API_BASE_PATH": JSON.stringify(apiBasePath),
-                "preventAssignment": true,
-            }),
-            sourcemaps(),
-            isProdBuild && terser(),
-        ].filter((p) => p),
+        plugins: PLUGINS,
         watch: {
             clearScreen: false,
         },