diff --git a/Makefile b/Makefile
index 05c4d76ba..f5af04dd1 100644
--- a/Makefile
+++ b/Makefile
@@ -37,24 +37,24 @@ deploy-init:
 deploy-appbundle:
 	cp \
 		$(BUILD_DIR)/app.bundle.min.js \
-		$(BUILD_DIR)/app.bundle.min.map \
+		$(BUILD_DIR)/app.bundle.min.js.map \
 		$(BUILD_DIR)/do_external_connect.min.js \
-		$(BUILD_DIR)/do_external_connect.min.map \
+		$(BUILD_DIR)/do_external_connect.min.js.map \
 		$(BUILD_DIR)/external_api.min.js \
-		$(BUILD_DIR)/external_api.min.map \
+		$(BUILD_DIR)/external_api.min.js.map \
 		$(BUILD_DIR)/flacEncodeWorker.min.js \
-		$(BUILD_DIR)/flacEncodeWorker.min.map \
+		$(BUILD_DIR)/flacEncodeWorker.min.js.map \
 		$(BUILD_DIR)/dial_in_info_bundle.min.js \
-		$(BUILD_DIR)/dial_in_info_bundle.min.map \
+		$(BUILD_DIR)/dial_in_info_bundle.min.js.map \
 		$(BUILD_DIR)/alwaysontop.min.js \
-		$(BUILD_DIR)/alwaysontop.min.map \
+		$(BUILD_DIR)/alwaysontop.min.js.map \
 		$(OUTPUT_DIR)/analytics-ga.js \
 		$(BUILD_DIR)/analytics-ga.min.js \
-		$(BUILD_DIR)/analytics-ga.min.map \
+		$(BUILD_DIR)/analytics-ga.min.js.map \
 		$(DEPLOY_DIR)
 	cp \
 		$(BUILD_DIR)/close3.min.js \
-		$(BUILD_DIR)/close3.min.map \
+		$(BUILD_DIR)/close3.min.js.map \
 		$(DEPLOY_DIR) || true
 
 deploy-lib-jitsi-meet:
@@ -85,12 +85,12 @@ deploy-rnnoise-binary:
 deploy-tflite:
 	cp \
 		$(TFLITE_WASM)/*.wasm \
-		$(DEPLOY_DIR)		
+		$(DEPLOY_DIR)
 
 deploy-meet-models:
 	cp \
 		$(MEET_MODELS_DIR)/*.tflite \
-		$(DEPLOY_DIR)	
+		$(DEPLOY_DIR)
 
 deploy-css:
 	$(NODE_SASS) $(STYLES_MAIN) $(STYLES_BUNDLE) && \
diff --git a/webpack.config.js b/webpack.config.js
index eca92f12b..eeb77685f 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -203,7 +203,7 @@ function getConfig(options = {}) {
             filename: `[name]${minimize ? '.min' : ''}.js`,
             path: `${__dirname}/build`,
             publicPath: '/libs/',
-            sourceMapFilename: `[name].${minimize ? 'min' : 'js'}.map`
+            sourceMapFilename: '[file].map'
         },
         plugins: [
             detectCircularDeps
@@ -243,6 +243,7 @@ function getConfig(options = {}) {
  * Webpack 5 because only one devServer entry is supported, so we attach it to
  * the main bundle.
  *
+
  * @returns {Object} the dev server configuration.
  */
 function getDevServerConfig() {
@@ -255,6 +256,7 @@ function getDevServerConfig() {
         },
         https: true,
         host: '127.0.0.1',
+        hot: true,
         proxy: {
             '/': {
                 bypass: devServerProxyBypass,