diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
index 7c8231d4b..2bdb6c715 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
@@ -28,16 +28,16 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>{{ installation.name }} - {% block title %}{% endblock %}</title>
     <link rel="shortcut icon" href="{{ asset('build/images/favicon.ico') }}" type="image/x-icon">
-    <link rel="stylesheet" href="{{ asset('build/scratch.css') }}"/>
-    <link rel="stylesheet" href="{{ asset('build/chill.css') }}"/>
+      {{ encore_entry_link_tags('scratch') }}
+      {{ encore_entry_link_tags('chill') }}
     {% if active_bootstrap == 1 %}
-        <link rel="stylesheet" href="{{ asset('build/bootstrap.css') }}" type="text/css"/>
+      {{ encore_entry_link_tags('bootstrap') }}
     {% endif %}
     {% if active_forkawesome == 1 %}
-        <link rel="stylesheet" href="{{ asset('build/forkawesome.css') }}" type="text/css"/>
+      {{ encore_entry_link_tags('forkawesome') }}
     {% endif %}
     {% if active_ckeditor == 1 %}
-        <link rel="stylesheet" href="{{ asset('build/ckeditor5.css') }}" type="text/css"/>
+      {{ encore_entry_link_tags('ckeditor5') }}
     {% endif %}
     {% block css%}<!-- nothing added to css -->{% endblock %}
 </head>
@@ -152,17 +152,16 @@
 
     {{ include('@ChillMain/Layout/_footer.html.twig') }}
 
-    <script type="text/javascript" src="{{ asset('build/runtime.js') }}"></script>
-    <script type="text/javascript" src="{{ asset('build/scratch.js') }}"></script>
-    <script type="text/javascript" src="{{ asset('build/chill.js') }}"></script>
+    {{ encore_entry_script_tags('scratch') }}
+    {{ encore_entry_script_tags('chill') }}
     {% if active_bootstrap == 1 %}
-        <script type="text/javascript" src="{{ asset('build/bootstrap.js') }}"></script>
+      {{ encore_entry_script_tags('bootstrap') }}
     {% endif %}
     {% if active_forkawesome == 1 %}
-        <script type="text/javascript" src="{{ asset('build/forkawesome.js') }}"></script>
+      {{ encore_entry_script_tags('forkawesome') }}
     {% endif %}
     {% if active_ckeditor == 1 %}
-        <script type="text/javascript" src="{{ asset('build/ckeditor5.js') }}"></script>
+      {{ encore_entry_script_tags('ckeditor5') }}
     {% endif %}
     <script type="text/javascript">
         chill.initPikaday('{{ app.request.locale }}');