diff --git a/config/packages/webpack_encore.yaml b/config/packages/webpack_encore.yaml
index 9191f4f4..8eb88a34 100644
--- a/config/packages/webpack_encore.yaml
+++ b/config/packages/webpack_encore.yaml
@@ -8,7 +8,7 @@ webpack_encore:
     # crossorigin: 'anonymous'
 
     # preload all rendered script and link tags automatically via the http2 Link header
-    # preload: true
+    preload: true
 
     # Throw an exception if the entrypoints.json file is missing or an entry is missing from the data
     # strict_mode: false
diff --git a/templates/base.html.twig b/templates/base.html.twig
index b1bdc6cf..b58aa96d 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -45,10 +45,7 @@
             <link rel="stylesheet" href="{{ preload(asset('build/themes/bootstrap.css'), {as: 'style'}) }}">
         {% endif %}
 
-        {% for css in encore_entry_css_files('app') %}
-           <link rel="stylesheet" href="{{ preload(asset(css), {as: 'style'}) }}">
-        {% endfor %}
-
+        {{ encore_entry_link_tags('app') }}
     {% endblock %}
 </head>
 <body data-base-url="{{ url('homepage', {'_locale': app.request.locale}) }}">
@@ -119,14 +116,8 @@
 
 {% endblock %}
 {% block javascripts %}
-    {% for js in encore_entry_js_files('app') %}
-        <script src="{{ preload(asset(js), {as: 'script'}) }}"></script>
-    {% endfor %}
-
-    {% for js in encore_entry_js_files('ru2ftwofactor') %}
-    <script src="{{ preload(asset(js), {as: 'script'}) }}"></script>
-    {% endfor %}
-
+    {{ encore_entry_script_tags('app') }}
+    {{ encore_entry_script_tags('ru2ftwofactor') }}
 {% endblock %}
 
 {% block scripts %}
