diff --git a/.gitignore b/.gitignore
index 8cd6a2922..ea9619e9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,7 @@ web/uploads/
 !/web/bundles/.gitkeep
 /web/assets/images/*
 !web/assets/images/.gitkeep
-/web/wallassets/*
+/web/build/*
 
 # Build
 /app/build
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67aac594d..e6ea39762 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Upcoming changes
+
+* `wallassets/` folder renamed to `build/`
+
 ## [2.6.10](https://github.com/wallabag/wallabag/tree/2.6.10)
 [Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.9...2.6.10)
 
diff --git a/app/config/webpack/common.js b/app/config/webpack/common.js
index ccf6c7262..e2c194677 100644
--- a/app/config/webpack/common.js
+++ b/app/config/webpack/common.js
@@ -11,7 +11,7 @@ module.exports = {
   },
   output: {
     filename: '[name].js',
-    path: path.resolve(projectDir, 'web/wallassets'),
+    path: path.resolve(projectDir, 'web/build'),
     publicPath: '',
   },
   plugins: [
diff --git a/templates/Entry/share.html.twig b/templates/Entry/share.html.twig
index c8cf32eaf..ecf94d547 100644
--- a/templates/Entry/share.html.twig
+++ b/templates/Entry/share.html.twig
@@ -18,9 +18,9 @@
         <meta name="twitter:title" content="{{ entry.title|e|raw }}" />
         <meta name="twitter:description" content="{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;" />
         {% if app.debug %}
-            <script src="{{ asset('wallassets/public.dev.js') }}"></script>
+            <script src="{{ asset('build/public.dev.js') }}"></script>
         {% else %}
-            <link rel="stylesheet" href="{{ asset('wallassets/public.css') }}">
+            <link rel="stylesheet" href="{{ asset('build/public.css') }}">
         {% endif %}
 
     </head>
diff --git a/templates/layout.html.twig b/templates/layout.html.twig
index b40cd1177..1ac6769ed 100644
--- a/templates/layout.html.twig
+++ b/templates/layout.html.twig
@@ -3,13 +3,13 @@
 {% block css %}
     {{ parent() }}
     {% if not app.debug %}
-        <link rel="stylesheet" href="{{ asset('wallassets/main.css') }}">
+        <link rel="stylesheet" href="{{ asset('build/main.css') }}">
     {% endif %}
 {% endblock %}
 
 {% block scripts %}
     {{ parent() }}
-    <script src="{{ asset('wallassets/main' ~ (app.debug ? '.dev' : '') ~ '.js') }}"></script>
+    <script src="{{ asset('build/main' ~ (app.debug ? '.dev' : '') ~ '.js') }}"></script>
 {% endblock %}
 
 {% block header %}