diff --git a/scm-ui/ui-scripts/src/createPluginConfig.js b/scm-ui/ui-scripts/src/createPluginConfig.js
index 4d64a88d12..3e210fa022 100644
--- a/scm-ui/ui-scripts/src/createPluginConfig.js
+++ b/scm-ui/ui-scripts/src/createPluginConfig.js
@@ -16,7 +16,7 @@ module.exports = function(mode) {
   return {
     context: root,
     entry: {
-      [name]: packageJSON.main || "src/main/js/index.js"
+      [name]: [path.resolve(__dirname, "webpack-public-path.js"), packageJSON.main || "src/main/js/index.js"]
     },
     mode,
     devtool: "source-map",
@@ -68,6 +68,7 @@ module.exports = function(mode) {
     output: {
       path: path.join(root, "target", name + "-" + packageJSON.version, "webapp", "assets"),
       filename: "[name].bundle.js",
+      chunkFilename: name + ".[name].chunk.js",
       library: name,
       libraryTarget: "amd"
     }
diff --git a/scm-ui/ui-webapp/src/webpack-public-path.ts b/scm-ui/ui-scripts/src/webpack-public-path.js
similarity index 100%
rename from scm-ui/ui-webapp/src/webpack-public-path.ts
rename to scm-ui/ui-scripts/src/webpack-public-path.js
diff --git a/scm-ui/ui-scripts/src/webpack.config.js b/scm-ui/ui-scripts/src/webpack.config.js
index 5313ec7a1e..c4cf6d609b 100644
--- a/scm-ui/ui-scripts/src/webpack.config.js
+++ b/scm-ui/ui-scripts/src/webpack.config.js
@@ -8,7 +8,11 @@ module.exports = [
   {
     context: root,
     entry: {
-      webapp: ["./ui-webapp/src/webpack-public-path.ts", "./ui-styles/src/scm.scss", "./ui-webapp/src/index.tsx"]
+      webapp: [
+        path.resolve(__dirname, "webpack-public-path.js"),
+        "./ui-styles/src/scm.scss",
+        "./ui-webapp/src/index.tsx"
+      ]
     },
     devtool: "cheap-module-eval-source-map",
     target: "web",