diff --git a/packages/strapi-generate-plugin/json/package.json.js b/packages/strapi-generate-plugin/json/package.json.js
index e4973985ef..fd358ba6be 100755
--- a/packages/strapi-generate-plugin/json/package.json.js
+++ b/packages/strapi-generate-plugin/json/package.json.js
@@ -31,7 +31,7 @@ module.exports = scope => {
       'postinstall': 'npm run build:dll',
       'prebuild': 'npm run build:clean && npm run test',
       'build': 'node_modules/strapi-helper-plugin/node_modules/cross-env/bin/cross-env.js NODE_ENV=production node_modules/strapi-helper-plugin/node_modules/webpack/bin/webpack.js --config node_modules/strapi-helper-plugin/lib/internals/webpack/webpack.prod.babel.js --color -p --progress',
-      'build:clean': 'node_modules/strapi-helper-plugin/node_modules/rimraf/bin.js build',
+      'build:clean': 'node_modules/strapi-helper-plugin/node_modules/rimraf/bin.js admin/build',
       'build:dll': 'node node_modules/strapi-helper-plugin/lib/internals/scripts/dependencies.js',
       'start': 'node_modules/strapi-helper-plugin/node_modules/cross-env/bin/cross-env.js NODE_ENV=development node node_modules/strapi-helper-plugin/lib/server',
       'generate': 'node_modules/strapi-helper-plugin/node_modules/plop/plop.js --plopfile node_modules/strapi-helper-plugin/lib/internals/generators/index.js',
diff --git a/packages/strapi-helper-plugin/lib/internals/webpack/webpack.base.babel.js b/packages/strapi-helper-plugin/lib/internals/webpack/webpack.base.babel.js
index 13d8934cd8..99056ee964 100644
--- a/packages/strapi-helper-plugin/lib/internals/webpack/webpack.base.babel.js
+++ b/packages/strapi-helper-plugin/lib/internals/webpack/webpack.base.babel.js
@@ -9,7 +9,7 @@ const webpack = require('webpack');
 module.exports = (options) => ({
   entry: options.entry,
   output: Object.assign({ // Compile into js/build.js
-    path: path.resolve(process.cwd(), 'build'),
+    path: path.resolve(process.cwd(), 'admin', 'build'),
     publicPath: '/',
   }, options.output), // Merge with env dependent settings
   module: {
diff --git a/packages/strapi-plugin-content-manager/package.json b/packages/strapi-plugin-content-manager/package.json
index 38612ca733..990b96ce7a 100644
--- a/packages/strapi-plugin-content-manager/package.json
+++ b/packages/strapi-plugin-content-manager/package.json
@@ -34,7 +34,7 @@
     "postinstall": "npm run build:dll",
     "prebuild": "npm run build:clean && npm run test",
     "build": "node_modules/strapi-helper-plugin/node_modules/cross-env/bin/cross-env.js NODE_ENV=production node_modules/strapi-helper-plugin/node_modules/webpack/bin/webpack.js --config node_modules/strapi-helper-plugin/lib/internals/webpack/webpack.prod.babel.js --color -p --progress",
-    "build:clean": "node_modules/strapi-helper-plugin/node_modules/rimraf/bin.js build",
+    "build:clean": "node_modules/strapi-helper-plugin/node_modules/rimraf/bin.js admin/build",
     "build:dll": "node node_modules/strapi-helper-plugin/lib/internals/scripts/dependencies.js",
     "start": "node_modules/strapi-helper-plugin/node_modules/cross-env/bin/cross-env.js NODE_ENV=development node node_modules/strapi-helper-plugin/lib/server",
     "generate": "node_modules/strapi-helper-plugin/node_modules/plop/plop.js --plopfile node_modules/strapi-helper-plugin/lib/internals/generators/index.js",