diff --git a/package.json b/package.json
index 5e4bf9e..57163ae 100644
--- a/package.json
+++ b/package.json
@@ -41,10 +41,10 @@
     "watchjs": "^0.0.0"
   },
   "scripts": {
-    "start": "dora --plugins \"proxy,webpack,webpack-hmr,browser-history?index=/src/index.html\"",
-    "dev": "dora --plugins \"webpack,webpack-hmr,browser-history?index=/src/index.html\"",
+    "start": "dora --plugins \"proxy,webpack?publicPath=/,webpack-hmr,browser-history?index=/src/index.html\"",
+    "dev": "dora --plugins \"webpack?publicPath=/,webpack-hmr,browser-history?index=/src/index.html\"",
     "lint": "eslint --fix --ext .js,.jsx src/components/layout",
-    "build": "atool-build"
+    "build": "atool-build --publicPath /"
   },
   "theme": "./src/theme.js",
   "standard": {
diff --git a/webpack.config.js b/webpack.config.js
index aeb0495..1b5b0e1 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -20,12 +20,6 @@ module.exports = function (webpackConfig, env) {
     webpackConfig.babel.plugins.push('dev-expression')
   }
 
-  webpackConfig.output = {
-    path: path.join(__dirname, '../dist'),
-    filename: '[name].js',
-    publicPath: '/'
-  }
-
   // Don't extract common.js and common.css
   webpackConfig.plugins = webpackConfig.plugins.filter(function (plugin) {
     return !(plugin instanceof webpack.optimize.CommonsChunkPlugin)