diff --git a/src/patterns/04-components/eu-cookie-compliance/eu-cookie-compliance.twig b/src/patterns/04-components/eu-cookie-compliance/eu-cookie-compliance.twig
index 2877a0f8ab008469eca9634590ae4500be006734..0742853fd15fbc8dbacecaaf2128f60f15365ebe 100644
--- a/src/patterns/04-components/eu-cookie-compliance/eu-cookie-compliance.twig
+++ b/src/patterns/04-components/eu-cookie-compliance/eu-cookie-compliance.twig
@@ -1,16 +1,17 @@
 <div class="eu-cookie-compliance-banner eu-cookie-compliance-banner-info eu-cookie-compliance-banner--default">
     <div class="popup-content info eu-cookie-compliance-content" role="alertdialog">
         <div
-            aria-labelledby="{{ cookie.labelledby_id }}"
-            aria-describedby="{{ cookie.describedby_id }}"
-            id="popup-text"
-            class="eu-cookie-compliance-message">
-            <h2 id="{{ cookie.labelledby_id }}">{{ cookie.label }}</h2>
-            <p id="{{ cookie.describedby_id }}">{{ cookie.description }}</p>
+            class="eu-cookie-compliance-message"
+            id="{{ cookie.describedby_id }}">
+            <h2>{{ cookie.label }}</h2>
+            <p>{{ cookie.description }}</p>
         </div>
 
         <div id="popup-buttons" class="eu-cookie-compliance-buttons">
-            <button type="button" class="agree-button eu-cookie-compliance-default-button">{{ 'Accept all'|t }}</button>
+            <button type="button" class="agree-button eu-cookie-compliance-default-button"
+                aria-describedby="{{ cookie.describedby_id }}">
+                {{ 'Accept all'|t }}
+            </button>
         </div>
     </div>
 </div>