diff --git a/.php_cs.dist b/.php_cs.dist
index a5b6cf731..ecd127eb3 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -14,9 +14,7 @@ $finder = PhpCsFixer\Finder::create()
     ->exclude('config')
     ->exclude('var')
     ->exclude('public/bundles')
-    ->exclude('public/css')
-    ->exclude('public/fonts')
-    ->exclude('public/js')
+    ->exclude('public/build')
 ;
 
 return PhpCsFixer\Config::create()
diff --git a/config/services.yaml b/config/services.yaml
index 65782fdf3..f8303c388 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -32,7 +32,7 @@ services:
         public: true
         tags: ['controller.service_arguments']
 
-# Autowiring can't guess the constructor arguments that are not type-hinted with
+    # Autowiring can't guess the constructor arguments that are not type-hinted with
     # classes (e.g. container parameters) so you must define those arguments explicitly
     App\Command\ListUsersCommand:
         $emailSender: '%app.notifications.email_sender%'
diff --git a/webpack.config.js b/webpack.config.js
index bfd7f59aa..02bec267b 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,7 +1,7 @@
 var Encore = require('@symfony/webpack-encore');
 
 Encore
-    .setOutputPath('web/build/')
+    .setOutputPath('public/build/')
     .setPublicPath('/build')
     .cleanupOutputBeforeBuild()
     .autoProvidejQuery()