diff --git a/frontend/webpack.common.js b/frontend/webpack.common.js
index e6482f6a9d0..2106073522b 100644
--- a/frontend/webpack.common.js
+++ b/frontend/webpack.common.js
@@ -33,27 +33,21 @@ module.exports = {
         use: ['@svgr/webpack'],
       },
       {
-        test: /\.module\.css$/,
+        test: /(?<!\.module)\.css$/,
         use: [
-          'style-loader',
+          {
+            loader: MiniCssExtractPlugin.loader,
+          },
           {
             loader: 'css-loader',
             options: {
-              url: {
-                filter: (url, _resourcePath) => {
-                  // Disable processing for root-relative urls (e.g. /designer/img)
-                  return !/^\//.test(url);
-                },
-              },
-              modules: {
-                localIdentName: '[name]__[local]--[hash:base64:5]',
-              },
+              url: false,
             },
           },
         ],
       },
       {
-        test: /(?<!\.module)\.css$/,
+        test: /\.module\.css$/,
         use: [
           {
             loader: MiniCssExtractPlugin.loader,
@@ -61,7 +55,15 @@ module.exports = {
           {
             loader: 'css-loader',
             options: {
-              url: false,
+              url: {
+                filter: (url, _resourcePath) => {
+                  // Disable processing for root-relative urls (e.g. /designer/img)
+                  return !/^\//.test(url);
+                },
+              },
+              modules: {
+                localIdentName: '[name]__[local]--[hash:base64:5]',
+              },
             },
           },
         ],