diff --git a/src/components/atoms/ModalFooter/ModalFooter.js b/src/components/atoms/ModalFooter/ModalFooter.js
index 113b5c2a..1bf2386a 100644
--- a/src/components/atoms/ModalFooter/ModalFooter.js
+++ b/src/components/atoms/ModalFooter/ModalFooter.js
@@ -43,12 +43,12 @@ export default class ModalFooter extends HTMLElement {
 
     const btnExtraClasses = this.getAttribute('data-button-extra-classes');
 
-    const extraClasses = this.getAttribute('data-extra-classes');
+    const extraClasses = this.getAttribute('extra-classes');
 
     const modalFooterClasses = ['modal-footer'];
-    this.closeBtn.setAttribute('data-img-alt', '');
-    this.closeBtn.setAttribute('data-icon', '');
-    this.closeBtn.setAttribute('data-label', 'Close');
+    this.closeBtn.setAttribute('img-alt', '');
+    this.closeBtn.setAttribute('icon', '');
+    this.closeBtn.setAttribute('label', 'Close');
     this.closeBtn.setAttribute('data-bs-dismiss', 'modal');
 
     // TODO: Fix old ESLint errors - see issue #1099