diff --git a/templates/overrides/navigation/block--system-branding-block.html.twig b/templates/overrides/navigation/block--system-branding-block.html.twig
index a5890d4cf754c234d14c3f55aa73ce9d34d882a5..a3755bcbbf5a173e3a81c261432ca2a06e20af11 100644
--- a/templates/overrides/navigation/block--system-branding-block.html.twig
+++ b/templates/overrides/navigation/block--system-branding-block.html.twig
@@ -18,37 +18,19 @@
   {% apply spaceless %}
     {# Project name. #}
     {% if site_logo is not empty or site_name is not empty %}
-      {% set project_classes = 'bcl-header__project' %}
-      {% if light is not empty %}
-        {% set project_classes = project_classes ~ ' light' %}
-      {% endif %}
-      <div {{ create_attribute().addClass(project_classes) }}>
+      <div class="bcl-header__project{{ light is not empty ? ' light' }}">
         <div class="container">
           {% if site_logo is not empty and bcl_component_library != 'neutral' %}
-            {% set img_classes = ['d-none','d-lg-inline-block', 'text-decoration-none', 'site-logo'] %}
-            <a {{ create_attribute().addClass(img_classes).setAttribute('rel', 'Home') }} href="{{ path('<front>') }}">
-              <img {{ site_logo_img_attr.setAttribute('alt', 'Home'|t) }} src="{{ site_logo }}"/>
+            <a class="d-none d-lg-inline-block text-decoration-none site-logo" href="{{ path('<front>') }}">
+              <img alt="{{ 'Home'|t }}" src="{{ site_logo }}"/>
             </a>
           {% endif %}
           {% if site_name is not empty %}
-            {% set name_classes = [
-              'text-decoration-none',
-              'align-bottom',
-              'bcl-header__site-name',
-              'mw-100',
-            ] %}
-            {% set _site_name %}
-              <a {{ create_attribute().addClass(name_classes).setAttribute('rel', 'Home') }}
-                href="{{ path('<front>') }}">
+            <div class="bcl-header__site-name site-name{{ bcl_component_library == 'neutral' ? ' h5 d-inline-block d-lg-none' }}">
+              <a class="text-decoration-none align-bottom bcl-header__site-name mw-100"
+                 href="{{ path('<front>') }}">
                 {{ site_name }}
               </a>
-            {% endset %}
-            {% set _site_name_classes = ['bcl-header__site-name', 'site-name'] %}
-            {% if bcl_component_library == 'neutral' %}
-              {% set _site_name_classes = _site_name_classes|merge(['h5', 'd-inline-block', 'd-lg-none']) %}
-            {% endif %}
-            <div {{ create_attribute().addClass(_site_name_classes) }}>
-              {{ _site_name }}
             </div>
           {% endif %}
         </div>