diff --git a/feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog.component.html b/feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog.component.html
index 55c3b9b2f33..099b643eb22 100644
--- a/feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog.component.html
+++ b/feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog.component.html
@@ -122,6 +122,7 @@
                   [routerLink]="{ cxRoute: 'cart' } | cxUrl"
                   (click)="dismissModal('View Cart click')"
                   class="btn btn-primary"
+                  role="button"
                   autofocus
                   >{{ 'addToCart.viewCart' | cxTranslate }}</a
                 >
@@ -130,6 +131,7 @@
                   [routerLink]="{ cxRoute: 'checkout' } | cxUrl"
                   (click)="dismissModal('Proceed To Checkout click')"
                   class="btn btn-secondary"
+                  role="button"
                   >{{ 'addToCart.proceedToCheckout' | cxTranslate }}</a
                 >
               </ng-container>
@@ -273,6 +275,7 @@
                   [routerLink]="{ cxRoute: 'cart' } | cxUrl"
                   (click)="dismissModal('View Cart click')"
                   class="btn btn-primary"
+                  role="button"
                   autofocus
                   >{{ 'addToCart.viewCart' | cxTranslate }}</a
                 >
@@ -281,6 +284,7 @@
                   [routerLink]="{ cxRoute: 'checkout' } | cxUrl"
                   (click)="dismissModal('Proceed To Checkout click')"
                   class="btn btn-secondary"
+                  role="button"
                   >{{ 'addToCart.proceedToCheckout' | cxTranslate }}</a
                 >
               </ng-container>
diff --git a/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.component.html b/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.component.html
index e8398b13a09..f5df9a135fc 100644
--- a/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.component.html
+++ b/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.component.html
@@ -86,6 +86,7 @@
   <ng-container *ngIf="hasStock">
     <a
       class="btn btn-link button-add-link cx-action-link"
+      role="button"
       [routerLink]="{ cxRoute: 'login' } | cxUrl"
     >
       <cx-icon aria-hidden="true" [type]="iconTypes.EMPTY_HEART"></cx-icon>
diff --git a/feature-libs/order/components/order-history/order-history.component.html b/feature-libs/order/components/order-history/order-history.component.html
index 2e77eafde52..63d1dd3c2f6 100644
--- a/feature-libs/order/components/order-history/order-history.component.html
+++ b/feature-libs/order/components/order-history/order-history.component.html
@@ -242,6 +242,7 @@ <h2 *ngIf="!type.replenishmentOrder">
                 <a
                   [routerLink]="{ cxRoute: 'home' } | cxUrl"
                   routerLinkActive="active"
+                  role="button"
                   class="btn btn-primary btn-block"
                   >{{ 'orderHistory.startShopping' | cxTranslate }}</a
                 >
diff --git a/feature-libs/order/components/replenishment-order-history/replenishment-order-history.component.html b/feature-libs/order/components/replenishment-order-history/replenishment-order-history.component.html
index 9ead30fb269..1649bbf1ea7 100644
--- a/feature-libs/order/components/replenishment-order-history/replenishment-order-history.component.html
+++ b/feature-libs/order/components/replenishment-order-history/replenishment-order-history.component.html
@@ -237,6 +237,7 @@ <h3>
               [routerLink]="{ cxRoute: 'home' } | cxUrl"
               routerLinkActive="active"
               class="btn btn-primary btn-block"
+              role="button"
               >{{ 'orderHistory.startShopping' | cxTranslate }}</a
             >
           </div>
diff --git a/feature-libs/organization/unit-order/components/unit-level-order-history/unit-level-order-history.component.html b/feature-libs/organization/unit-order/components/unit-level-order-history/unit-level-order-history.component.html
index 57c269b972b..1e4c566a347 100644
--- a/feature-libs/organization/unit-order/components/unit-level-order-history/unit-level-order-history.component.html
+++ b/feature-libs/organization/unit-order/components/unit-level-order-history/unit-level-order-history.component.html
@@ -223,6 +223,7 @@
                 [routerLink]="{ cxRoute: 'home' } | cxUrl"
                 routerLinkActive="active"
                 class="btn btn-primary btn-block"
+                role="button"
                 >{{ 'unitLevelOrderHistory.startShopping' | cxTranslate }}</a
               >
             </div>
diff --git a/feature-libs/product-configurator/common/components/configure-product/configure-product.component.html b/feature-libs/product-configurator/common/components/configure-product/configure-product.component.html
index cbf2d7030c3..7e5d9ba1968 100644
--- a/feature-libs/product-configurator/common/components/configure-product/configure-product.component.html
+++ b/feature-libs/product-configurator/common/components/configure-product/configure-product.component.html
@@ -31,6 +31,7 @@
           productCode: product.code,
         }"
         class="btn btn-primary btn-block"
+        role="button"
         cxAutoFocus
         [attr.aria-label]="
           getAriaLabelTranslationKey(product.configuratorType) | cxTranslate
diff --git a/feature-libs/storefinder/components/store-finder-list-item/store-finder-list-item.component.html b/feature-libs/storefinder/components/store-finder-list-item/store-finder-list-item.component.html
index 04cbecd72ae..011bfe776f0 100644
--- a/feature-libs/storefinder/components/store-finder-list-item/store-finder-list-item.component.html
+++ b/feature-libs/storefinder/components/store-finder-list-item/store-finder-list-item.component.html
@@ -51,6 +51,7 @@
       target="_blank"
       rel="noopener noreferrer"
       class="btn btn-sm btn-secondary btn-block cx-button"
+      role="button"
       (click)="$event.stopPropagation()"
       [attr.aria-label]="'storeFinder.ariaLabelGetDirections' | cxTranslate"
       >{{ 'storeFinder.getDirections' | cxTranslate }}</a
diff --git a/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent.component.html b/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent.component.html
index d5188e6981b..04ee945e2f9 100644
--- a/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent.component.html
+++ b/integration-libs/cdc/user-account/login-form/reconsent/cdc-reconsent.component.html
@@ -49,6 +49,7 @@ <h3>
             dismissDialog('Proceed To Login', reconsentEvent.errorMessage)
           "
           class="btn btn-primary"
+          role="button"
           autofocus
           >{{ 'common.submit' | cxTranslate }}</a
         >
diff --git a/integration-libs/s4-service/order/components/s4-service-order-detail-actions/s4-service-order-detail-actions.component.html b/integration-libs/s4-service/order/components/s4-service-order-detail-actions/s4-service-order-detail-actions.component.html
index 23be008b8d4..3c214907c94 100644
--- a/integration-libs/s4-service/order/components/s4-service-order-detail-actions/s4-service-order-detail-actions.component.html
+++ b/integration-libs/s4-service/order/components/s4-service-order-detail-actions/s4-service-order-detail-actions.component.html
@@ -16,6 +16,7 @@
           "
           [attr.aria-label]="'cancelService.action' | cxTranslate"
           class="btn btn-secondary"
+          role="button"
         >
           {{ 'cancelService.action' | cxTranslate }}
         </a>
@@ -34,6 +35,7 @@
             'rescheduleService.actionButtonLabel' | cxTranslate
           "
           class="btn btn-secondary"
+          role="button"
         >
           {{ 'rescheduleService.actionButtonLabel' | cxTranslate }}
         </a>