diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
index c697ddfb90..2b741aae74 100644
--- a/cypress/plugins/index.js
+++ b/cypress/plugins/index.js
@@ -16,7 +16,7 @@ const getCompareSnapshotsPlugin = require('cypress-visual-regression/dist/plugin
 const webpack = require('@cypress/webpack-preprocessor')
 const { startDevServer } = require('@cypress/webpack-dev-server')
 
-const webpackOptions = require('../../webpack.dev.js')
+const webpackOptions = require('../../webpack.config.js')
 webpackOptions.externals = {}
 
 const options = {
diff --git a/package.json b/package.json
index 03c80776eb..bb780303b7 100644
--- a/package.json
+++ b/package.json
@@ -13,9 +13,9 @@
 	"author": "John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>",
 	"license": "AGPL-3.0",
 	"scripts": {
-		"dev": "webpack --config webpack.dev.js",
-		"watch": "webpack --progress --watch --config webpack.dev.js",
-		"build": "NODE_ENV=production webpack --progress --config webpack.prod.js",
+		"dev": "webpack --node-env development --progress",
+		"watch": "webpack --node-env development --progress --watch",
+		"build": "webpack --node-env production --progress",
 		"l10n:extract": "node build/extract-l10n.js",
 		"lint": "eslint --ext .js,.vue src",
 		"lint:fix": "eslint --ext .js,.vue src --fix",
diff --git a/styleguide.config.js b/styleguide.config.js
index fa5778b26a..987ef0ec6a 100644
--- a/styleguide.config.js
+++ b/styleguide.config.js
@@ -1,6 +1,6 @@
 const path = require('path')
 const { merge } = require('webpack-merge')
-const webpackConfig = require('./webpack.dev.js')
+const webpackConfig = require('./webpack.config.js')
 
 const newConfig = Object.assign({}, webpackConfig, {
 	externals: {},
diff --git a/webpack.common.js b/webpack.config.js
similarity index 95%
rename from webpack.common.js
rename to webpack.config.js
index abbc5427f1..831de2964b 100644
--- a/webpack.common.js
+++ b/webpack.config.js
@@ -4,6 +4,9 @@ const glob = require('glob')
 const md5 = require('md5')
 const path = require('path')
 
+const buildMode = process.env.NODE_ENV
+const isDev = buildMode === 'development'
+
 const { DefinePlugin } = require('webpack')
 const { VueLoaderPlugin } = require('vue-loader')
 const BabelLoaderExcludeNodeModulesExcept = require('babel-loader-exclude-node-modules-except')
@@ -54,6 +57,13 @@ const translations = fs
 	})
 
 module.exports = {
+	mode: buildMode,
+	devtool: isDev ? false : 'source-map',
+	devServer: {
+		historyApiFallback: true,
+		noInfo: true,
+		overlay: true,
+	},
 	entry: {
 		ncvuecomponents: path.join(__dirname, 'src', 'index.js'),
 		...glob.sync('src/components/*/index.js').reduce((acc, item) => {
diff --git a/webpack.dev.js b/webpack.dev.js
deleted file mode 100644
index 39115ed721..0000000000
--- a/webpack.dev.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const { merge } = require('webpack-merge')
-const common = require('./webpack.common.js')
-
-module.exports = merge(common, {
-	mode: 'development',
-	devServer: {
-		historyApiFallback: true,
-		noInfo: true,
-		overlay: true,
-	},
-})
diff --git a/webpack.prod.js b/webpack.prod.js
deleted file mode 100644
index e301968e18..0000000000
--- a/webpack.prod.js
+++ /dev/null
@@ -1,7 +0,0 @@
-const { merge } = require('webpack-merge')
-const common = require('./webpack.common.js')
-
-module.exports = merge(common, {
-	mode: 'production',
-	devtool: 'source-map'
-})