diff --git a/lib/common/nuxt.config.js b/lib/common/nuxt.config.js
index 0841309a01..55b678f290 100644
--- a/lib/common/nuxt.config.js
+++ b/lib/common/nuxt.config.js
@@ -46,11 +46,9 @@ export default {
     cache: false,
     publicPath: '/_nuxt/',
     filenames: {
-      app: '[name].[chunkhash].js',
-      chunk: '[name].[chunkhash].js',
-      // TODO: Use [name].[contenthash].css
-      // When this merge released: https://github.com/webpack/webpack/pull/6839
-      css: '[name].[chunkhash].css'
+      app: '[name].[contenthash].js',
+      chunk: '[name].[contenthash].js',
+      css: '[name].[contenthash].css'
     },
     styleResources: {},
     plugins: [],
diff --git a/package.json b/package.json
index 6a7a68e8ea..18af6256bf 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
     "css-loader": "^0.28.11",
     "debug": "^3.1.0",
     "es6-promise": "^4.2.4",
-    "esm": "^3.0.10",
+    "esm": "^3.0.12",
     "etag": "^1.8.1",
     "file-loader": "^1.1.11",
     "fresh": "^0.5.2",
@@ -97,7 +97,7 @@
     "lodash": "^4.17.5",
     "lru-cache": "^4.1.2",
     "memory-fs": "^0.4.1",
-    "mini-css-extract-plugin": "^0.2.0",
+    "mini-css-extract-plugin": "^0.3.0",
     "minimist": "^1.2.0",
     "opencollective": "^1.0.3",
     "ora": "^2.0.0",
diff --git a/yarn.lock b/yarn.lock
index a66d6a9b5f..914e9b8bb4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2532,9 +2532,9 @@ eslint@^4.19.1:
     table "4.0.2"
     text-table "~0.2.0"
 
-esm@^3.0.10:
-  version "3.0.10"
-  resolved "https://registry.yarnpkg.com/esm/-/esm-3.0.10.tgz#75d541a776b587427f942d31f66aea8f4c911702"
+esm@^3.0.12:
+  version "3.0.12"
+  resolved "https://registry.yarnpkg.com/esm/-/esm-3.0.12.tgz#c443d871a70100f3c1ec66008de7c84e3c1d6e3b"
 
 espree@^3.5.2, espree@^3.5.4:
   version "3.5.4"
@@ -4599,9 +4599,9 @@ mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
 
-mini-css-extract-plugin@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.2.0.tgz#7a16b0e1096c86de8e4d1c3b063aa1aeae88d41d"
+mini-css-extract-plugin@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.3.0.tgz#f8dc03abb3a8663f1a431143e232fb47fb4d9318"
   dependencies:
     loader-utils "^1.1.0"
     webpack-sources "^1.1.0"