diff --git a/src/routes/index.js b/src/routes/index.js
index b088109c12..2fc0dde2d8 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -171,6 +171,7 @@ function addCoreRoutes(app, router, middleware, mounts) {
 	const statics = [
 		{ route: '/dist', path: path.join(__dirname, '../../dist') },
 		{ route: '/assets', path: path.join(__dirname, '../../build/public') },
+		{ route: '/assets', path: path.join(__dirname, '../../build/webpack') }, // todo: messy; relocate in v3
 		{ route: '/assets', path: path.join(__dirname, '../../public') },
 		{ route: '/plugins', path: path.join(__dirname, '../../build/public/plugins') },
 	];
diff --git a/src/views/partials/footer/js.tpl b/src/views/partials/footer/js.tpl
index 0e2d84f944..a0b8668f4c 100644
--- a/src/views/partials/footer/js.tpl
+++ b/src/views/partials/footer/js.tpl
@@ -1,4 +1,4 @@
-<script defer src="{relative_path}/dist/app.bundle.js?{config.cache-buster}"></script>
+<script defer src="{relative_path}/assets/nodebb.min.js?{config.cache-buster}"></script>
 
 {{{each scripts}}}
 <script defer type="text/javascript" src="{scripts.src}"></script>
diff --git a/webpack.common.js b/webpack.common.js
index 1acc79df9e..70d471f0a1 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -23,13 +23,13 @@ module.exports = {
 		new CleanWebpackPlugin(), // cleans dist folder
 	],
 	entry: {
-		app: './public/src/app.js',
+		nodebb: './public/src/app.js',
 		admin: './public/src/admin/admin.js',
 	},
 	output: {
-		filename: '[name].bundle.js',
-		path: path.resolve(__dirname, 'dist'),
-		publicPath: `${relativePath}/dist/`,
+		filename: '[name].min.js',
+		path: path.resolve(__dirname, 'build/webpack'),
+		publicPath: `${relativePath}/assets/`,
 	},
 	watchOptions: {
 		poll: 500,