diff --git a/packages/server/webpack.config.js b/packages/server/webpack.config.js
index eb695e383..6316b39bb 100644
--- a/packages/server/webpack.config.js
+++ b/packages/server/webpack.config.js
@@ -6,6 +6,7 @@ const HappyPack = require("happypack");
 
 module.exports = merge({
 	devtool: "none",
+	mode: "development",
 	module: {
 		rules: [
 			{
@@ -56,6 +57,4 @@ module.exports = merge({
 			"process.env.CLI": `"${process.env.CLI ? "true" : "false"}"`,
 		}),
 	],
-}, require("../../scripts/webpack.general.config")(), {
-	mode: "development",
-});
+}, require("../../scripts/webpack.general.config")());
diff --git a/packages/web/webpack.common.config.js b/packages/web/webpack.common.config.js
index 7139f733f..40ce81aee 100644
--- a/packages/web/webpack.common.config.js
+++ b/packages/web/webpack.common.config.js
@@ -9,7 +9,6 @@ const vsFills = path.join(root, "packages/vscode/src/fill");
 const merge = require("webpack-merge");
 
 module.exports = merge({
-	devtool: "source-map",
 	entry: "./packages/web/src/index.ts",
 	output: {
 		chunkFilename: "[name]-[hash:6].bundle.js",
diff --git a/scripts/webpack.general.config.js b/scripts/webpack.general.config.js
index 533df2db1..3fadca261 100644
--- a/scripts/webpack.general.config.js
+++ b/scripts/webpack.general.config.js
@@ -1,6 +1,5 @@
 const path = require("path");
 const environment = process.env.NODE_ENV || "development";
-const isCi = typeof process.env.CI !== "undefined";
 const HappyPack = require("happypack");
 const webpack = require("webpack");
 const MiniCssExtractPlugin = require("mini-css-extract-plugin");
@@ -10,8 +9,6 @@ const root = path.join(__dirname, "..");
 module.exports = (options = {}) => ({
 	context: root,
 	devtool: "source-map",
-	// entry: "./packages/app/src/index.ts",
-	mode: isCi ? "production" : "development",
 	module: {
 		rules: [{
 			loader: "string-replace-loader",