diff --git a/webpack.config.js b/webpack.config.js
index 3500fedcb62..9c0c6bbb9b6 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -40,7 +40,8 @@ module.exports = {
     },
     output: {
         path: path.join(__dirname, "webapp"),
-        filename: "[name].[chunkhash].js",
+        filename: "[hash]/[name].js",
+        chunkFilename: "[hash]/[name].js",
         devtoolModuleFilenameTemplate: function(info) {
             // Reading input source maps gives only relative paths here for
             // everything. Until I figure out how to fix this, this is a
@@ -79,7 +80,7 @@ module.exports = {
         }),
 
         new ExtractTextPlugin(
-            "[name].[contenthash].css",
+            "[hash]/[name].css",
             {
                 allChunks: true
             }