diff --git a/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/plugin.xml b/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/plugin.xml
index 178aa250fe..0c4a7619c5 100644
--- a/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/plugin.xml
+++ b/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/plugin.xml
@@ -57,7 +57,7 @@
   </conditions>
 
   <resources>
-    <script>plugins/scm-git-plugin.bundle.js</script>
+    <script>assets/scm-git-plugin.bundle.js</script>
   </resources>
   
 </plugin>
diff --git a/scm-plugins/scm-git-plugin/webpack.config.js b/scm-plugins/scm-git-plugin/webpack.config.js
index c9fed00b79..ff25222591 100644
--- a/scm-plugins/scm-git-plugin/webpack.config.js
+++ b/scm-plugins/scm-git-plugin/webpack.config.js
@@ -61,7 +61,7 @@ module.exports = {
     ]
   },
   output: {
-    path: path.join(__dirname, "target", "scm-git-plugin-2.0.0-SNAPSHOT", "webapp", "plugins"),
+    path: path.join(__dirname, "target", "scm-git-plugin-2.0.0-SNAPSHOT", "webapp", "assets"),
     filename: "[name].bundle.js",
     library: "scm-git-plugin",
     libraryTarget: "amd"
diff --git a/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/plugin.xml b/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/plugin.xml
index 2006f8df7b..ff2a45eac3 100644
--- a/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/plugin.xml
+++ b/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/plugin.xml
@@ -57,7 +57,7 @@ jo
   </conditions>
 
   <resources>
-    <script>plugins/scm-hg-plugin.bundle.js</script>
+    <script>assets/scm-hg-plugin.bundle.js</script>
   </resources>
 
 </plugin>
diff --git a/scm-plugins/scm-hg-plugin/webpack.config.js b/scm-plugins/scm-hg-plugin/webpack.config.js
index 6dd409e7b3..32c0b94f29 100644
--- a/scm-plugins/scm-hg-plugin/webpack.config.js
+++ b/scm-plugins/scm-hg-plugin/webpack.config.js
@@ -61,7 +61,7 @@ module.exports = {
     ]
   },
   output: {
-    path: path.join(__dirname, "target", "scm-hg-plugin-2.0.0-SNAPSHOT", "webapp", "plugins"),
+    path: path.join(__dirname, "target", "scm-hg-plugin-2.0.0-SNAPSHOT", "webapp", "assets"),
     filename: "[name].bundle.js",
     library: "scm-hg-plugin",
     libraryTarget: "amd"
diff --git a/scm-plugins/scm-legacy-plugin/src/main/resources/META-INF/scm/plugin.xml b/scm-plugins/scm-legacy-plugin/src/main/resources/META-INF/scm/plugin.xml
index 7992686f77..b9236845ca 100644
--- a/scm-plugins/scm-legacy-plugin/src/main/resources/META-INF/scm/plugin.xml
+++ b/scm-plugins/scm-legacy-plugin/src/main/resources/META-INF/scm/plugin.xml
@@ -56,7 +56,7 @@
   </conditions>
 
   <resources>
-    <script>plugins/scm-legacy-plugin.bundle.js</script>
+    <script>assets/scm-legacy-plugin.bundle.js</script>
   </resources>
 
 </plugin>
diff --git a/scm-plugins/scm-legacy-plugin/webpack.config.js b/scm-plugins/scm-legacy-plugin/webpack.config.js
index 4fd747400e..b7c69532e1 100644
--- a/scm-plugins/scm-legacy-plugin/webpack.config.js
+++ b/scm-plugins/scm-legacy-plugin/webpack.config.js
@@ -61,7 +61,7 @@ module.exports = {
     ]
   },
   output: {
-    path: path.join(__dirname, "target", "scm-legacy-plugin-2.0.0-SNAPSHOT", "webapp", "plugins"),
+    path: path.join(__dirname, "target", "scm-legacy-plugin-2.0.0-SNAPSHOT", "webapp", "assets"),
     filename: "[name].bundle.js",
     library: "scm-legacy-plugin",
     libraryTarget: "amd"
diff --git a/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/plugin.xml b/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/plugin.xml
index 39cb2b6aff..14e77b42a4 100644
--- a/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/plugin.xml
+++ b/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/plugin.xml
@@ -57,7 +57,7 @@
   </conditions>
 
   <resources>
-    <script>plugins/scm-svn-plugin.bundle.js</script>
+    <script>assets/scm-svn-plugin.bundle.js</script>
   </resources>
 
 </plugin>
diff --git a/scm-plugins/scm-svn-plugin/webpack.config.js b/scm-plugins/scm-svn-plugin/webpack.config.js
index f93d72c3d5..80ed431ff8 100644
--- a/scm-plugins/scm-svn-plugin/webpack.config.js
+++ b/scm-plugins/scm-svn-plugin/webpack.config.js
@@ -61,7 +61,7 @@ module.exports = {
     ]
   },
   output: {
-    path: path.join(__dirname, "target", "scm-svn-plugin-2.0.0-SNAPSHOT", "webapp", "plugins"),
+    path: path.join(__dirname, "target", "scm-svn-plugin-2.0.0-SNAPSHOT", "webapp", "assets"),
     filename: "[name].bundle.js",
     library: "scm-svn-plugin",
     libraryTarget: "amd"
diff --git a/scm-ui/pom.xml b/scm-ui/pom.xml
index cdee8ff9cf..a13be4d318 100644
--- a/scm-ui/pom.xml
+++ b/scm-ui/pom.xml
@@ -97,8 +97,8 @@
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <webResources>
             <resource>
-              <directory>target/bundles</directory>
-              <targetPath>bundles</targetPath>
+              <directory>target/assets</directory>
+              <targetPath>assets</targetPath>
             </resource>
             <resource>
               <directory>ui-webapp/public</directory>
diff --git a/scm-ui/scripts/webpack.config.js b/scm-ui/scripts/webpack.config.js
index 5cce9a2612..0d76b47139 100644
--- a/scm-ui/scripts/webpack.config.js
+++ b/scm-ui/scripts/webpack.config.js
@@ -58,7 +58,7 @@ module.exports = {
     ]
   },
   output: {
-    path: path.resolve(__dirname, "..", "target", "bundles"),
+    path: path.resolve(__dirname, "..", "target", "assets"),
     filename: "[name].bundle.js"
   },
   devServer: {
@@ -77,6 +77,6 @@ module.exports = {
       };
       app.use(createIndexMiddleware(templatePath, renderParams));
     },
-    publicPath: '/bundles/'
+    publicPath: '/assets/'
   }
 };
diff --git a/scm-ui/ui-webapp/public/index.mustache b/scm-ui/ui-webapp/public/index.mustache
index c0087d50f3..6ab8ba8b07 100644
--- a/scm-ui/ui-webapp/public/index.mustache
+++ b/scm-ui/ui-webapp/public/index.mustache
@@ -34,7 +34,7 @@
     <script>
       window.ctxPath = "{{ contextPath }}";
     </script>
-    <script src="{{ contextPath }}/bundles/webapp.bundle.js"></script>
+    <script src="{{ contextPath }}/assets/webapp.bundle.js"></script>
 
     {{#liveReloadURL}}
     <script src="{{liveReloadURL}}"></script>
diff --git a/scm-ui/ui-webapp/src/containers/loadBundle.js b/scm-ui/ui-webapp/src/containers/loadBundle.js
index a9e231936d..d1f72804b0 100644
--- a/scm-ui/ui-webapp/src/containers/loadBundle.js
+++ b/scm-ui/ui-webapp/src/containers/loadBundle.js
@@ -10,6 +10,7 @@ import * as ReactI18Next from "react-i18next";
 import * as ClassNames from "classnames";
 import * as UIExtensions from "@scm-manager/ui-extensions";
 import * as UIComponents from "@scm-manager/ui-components";
+import { urls } from "@scm-manager/ui-components";
 
 /**
  credentials: "same-origin",
@@ -21,7 +22,7 @@ import * as UIComponents from "@scm-manager/ui-components";
 */
 
 SystemJS.config({
-  baseURL: "/plugins",
+  baseURL: urls.withContextPath("/assets"),
   meta: {
     "/*": {
       esModule: true,
diff --git a/scm-ui/ui-webapp/src/webpack-public-path.js b/scm-ui/ui-webapp/src/webpack-public-path.js
index bc64b48ebe..a0caeb0b6b 100644
--- a/scm-ui/ui-webapp/src/webpack-public-path.js
+++ b/scm-ui/ui-webapp/src/webpack-public-path.js
@@ -1,4 +1,4 @@
 // setup webpack public path:
 // https://stackoverflow.com/questions/39879680/example-of-setting-webpack-public-path-at-runtime
 // https://github.com/coryhouse/react-slingshot/pull/207/files
-__webpack_public_path__ = window.ctxPath + "/bundles/";
+__webpack_public_path__ = window.ctxPath + "/assets/";