diff --git a/apps/web/src/app/layouts/product-switcher/product-switcher.component.html b/apps/web/src/app/layouts/product-switcher/product-switcher.component.html
index 110aca2622..449557b6f4 100644
--- a/apps/web/src/app/layouts/product-switcher/product-switcher.component.html
+++ b/apps/web/src/app/layouts/product-switcher/product-switcher.component.html
@@ -1,7 +1,6 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <ng-template [ngIf]="isEnabled">
   <button
+    type="button"
     bitIconButton="bwi bwi-fw bwi-filter"
     [bitMenuTriggerFor]="content?.menu"
     [buttonType]="buttonType"
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.html
index a53ee1c38a..4d6963d9e8 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.html
@@ -1,8 +1,6 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <ng-container *ngIf="secrets$ | async as secrets; else spinner">
   <div *ngIf="secrets.length > 0" class="float-right tw-mt-3 tw-items-center">
-    <button bitButton buttonType="secondary" (click)="openNewSecretDialog()">
+    <button type="button" bitButton buttonType="secondary" (click)="openNewSecretDialog()">
       <i class="bwi bwi-plus" aria-hidden="true"></i>
       {{ "newSecret" | i18n }}
     </button>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects-list/projects-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects-list/projects-list.component.html
index 78451436bb..9f5830cda3 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects-list/projects-list.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects-list/projects-list.component.html
@@ -1,5 +1,3 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <div *ngIf="!projects" class="tw-items-center tw-justify-center tw-pt-64 tw-text-center">
   <i class="bwi bwi-spinner bwi-spin bwi-3x"></i>
 </div>
@@ -7,7 +5,13 @@
 <sm-no-items *ngIf="projects?.length == 0">
   <ng-container slot="title">{{ "projectsNoItemsTitle" | i18n }}</ng-container>
   <ng-container slot="description">{{ "projectsNoItemsMessage" | i18n }}</ng-container>
-  <button slot="button" bitButton buttonType="secondary" (click)="newProjectEvent.emit()">
+  <button
+    type="button"
+    slot="button"
+    bitButton
+    buttonType="secondary"
+    (click)="newProjectEvent.emit()"
+  >
     <i class="bwi bwi-plus" aria-hidden="true"></i>
     {{ "newProject" | i18n }}
   </button>
@@ -31,6 +35,7 @@
       <th bitCell bitSortable="revisionDate">{{ "lastEdited" | i18n }}</th>
       <th bitCell class="tw-w-0">
         <button
+          type="button"
           bitIconButton="bwi-ellipsis-v"
           buttonType="main"
           [bitMenuTriggerFor]="tableMenu"
@@ -58,6 +63,7 @@
       <td bitCell>{{ project.revisionDate | date: "medium" }}</td>
       <td bitCell>
         <button
+          type="button"
           bitIconButton="bwi-ellipsis-v"
           buttonType="main"
           [bitMenuTriggerFor]="projectMenu"
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.html
index cba1d376ed..57a42b1a03 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.html
@@ -1,5 +1,4 @@
 <!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <!-- eslint-disable tailwindcss/no-custom-classname -->
 <form [formGroup]="formGroup" [bitSubmit]="submit">
   <bit-dialog dialogSize="default" disablePadding>
@@ -55,6 +54,7 @@
                 </td>
                 <td bitCell class="tw-w-0">
                   <button
+                    type="button"
                     (click)="removeProjectAssociation(e.id)"
                     bitIconButton="bwi-close"
                     buttonType="main"
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.html
index 53c0be16ad..a725997e4a 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-list.component.html
@@ -1,5 +1,3 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <div *ngIf="!tokens" class="tw-items-center tw-justify-center tw-pt-64 tw-text-center">
   <i class="bwi bwi-spinner bwi-spin bwi-3x"></i>
 </div>
@@ -7,7 +5,13 @@
 <sm-no-items *ngIf="tokens?.length == 0">
   <ng-container slot="title">{{ "accessTokensNoItemsTitle" | i18n }}</ng-container>
   <ng-container slot="description">{{ "accessTokensNoItemsDesc" | i18n }}</ng-container>
-  <button slot="button" bitButton buttonType="secondary" (click)="newAccessTokenEvent.emit()">
+  <button
+    type="button"
+    slot="button"
+    bitButton
+    buttonType="secondary"
+    (click)="newAccessTokenEvent.emit()"
+  >
     <i class="bwi bwi-plus" aria-hidden="true"></i>
     {{ "createAccessToken" | i18n }}
   </button>
@@ -33,6 +37,7 @@
       <th bitCell>{{ "lastEdited" | i18n }}</th>
       <th bitCell class="tw-w-0">
         <button
+          type="button"
           bitIconButton="bwi-ellipsis-v"
           buttonType="main"
           [title]="'options' | i18n"
@@ -58,6 +63,7 @@
       <td bitCell>{{ token.revisionDate | date: "medium" }}</td>
       <td bitCell>
         <button
+          type="button"
           bitIconButton="bwi-ellipsis-v"
           buttonType="main"
           [title]="'options' | i18n"
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-dialog.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-dialog.component.html
index 5165adafa0..ff70383106 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-dialog.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-dialog.component.html
@@ -1,5 +1,3 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <bit-dialog dialogSize="default">
   <ng-container bitDialogTitle>
     <span>{{ "createAccessToken" | i18n }}</span>
@@ -24,7 +22,7 @@
   </div>
 
   <div bitDialogFooter class="tw-flex tw-gap-2">
-    <button bitButton buttonType="primary" (click)="copyAccessToken()">
+    <button type="button" bitButton buttonType="primary" (click)="copyAccessToken()">
       <i class="bwi bwi-clone" aria-hidden="true"></i>
       {{ "copyToken" | i18n }}
     </button>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.html
index 4b1838edb2..12a26bb6cc 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.html
@@ -1,5 +1,3 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <sm-header
   *ngIf="serviceAccount$ | async as serviceAccount"
   [title]="serviceAccount.name"
@@ -16,7 +14,13 @@
     <bit-tab-link [route]="['people']">{{ "people" | i18n }}</bit-tab-link>
     <bit-tab-link [route]="['access']">{{ "accessTokens" | i18n }}</bit-tab-link>
   </bit-tab-nav-bar>
-  <button slot="secondary" bitButton buttonType="secondary" (click)="openNewAccessTokenDialog()">
+  <button
+    type="button"
+    slot="secondary"
+    bitButton
+    buttonType="secondary"
+    (click)="openNewAccessTokenDialog()"
+  >
     <i class="bwi bwi-plus" aria-hidden="true"></i>
     {{ "createAccessToken" | i18n }}
   </button>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html
index e976e113a9..a1f1730574 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html
@@ -1,5 +1,3 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <div *ngIf="!serviceAccounts" class="tw-items-center tw-justify-center tw-pt-64 tw-text-center">
   <i class="bwi bwi-spinner bwi-spin bwi-3x"></i>
 </div>
@@ -7,7 +5,13 @@
 <sm-no-items *ngIf="serviceAccounts?.length == 0">
   <ng-container slot="title">{{ "serviceAccountsNoItemsTitle" | i18n }}</ng-container>
   <ng-container slot="description">{{ "serviceAccountsNoItemsMessage" | i18n }}</ng-container>
-  <button slot="button" bitButton buttonType="secondary" (click)="newServiceAccountEvent.emit()">
+  <button
+    slot="button"
+    type="button"
+    bitButton
+    buttonType="secondary"
+    (click)="newServiceAccountEvent.emit()"
+  >
     <i class="bwi bwi-plus" aria-hidden="true"></i>
     {{ "newServiceAccount" | i18n }}
   </button>
@@ -32,6 +36,7 @@
       <th bitCell>{{ "lastEdited" | i18n }}</th>
       <th bitCell class="tw-w-0">
         <button
+          type="button"
           bitIconButton="bwi-ellipsis-v"
           buttonType="main"
           [title]="'options' | i18n"
@@ -65,6 +70,7 @@
       <td bitCell>{{ serviceAccount.revisionDate | date: "medium" }}</td>
       <td bitCell>
         <button
+          type="button"
           bitIconButton="bwi-ellipsis-v"
           buttonType="main"
           [title]="'options' | i18n"
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/header.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/header.component.html
index 32dfe1d799..42fbadefaa 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/header.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/header.component.html
@@ -1,5 +1,3 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <header
   *ngIf="routeData$ | async as routeData"
   class="-tw-m-6 tw-mb-3 tw-flex tw-flex-col tw-p-6"
@@ -28,7 +26,11 @@
         <ng-content></ng-content>
         <product-switcher></product-switcher>
         <ng-container *ngIf="account$ | async as account">
-          <button [bitMenuTriggerFor]="accountMenu" class="tw-border-0 tw-bg-transparent tw-p-0">
+          <button
+            type="button"
+            [bitMenuTriggerFor]="accountMenu"
+            class="tw-border-0 tw-bg-transparent tw-p-0"
+          >
             <bit-avatar [id]="account.userId" [text]="account.name || account.email"></bit-avatar>
           </button>
 
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.html
index 7b57a98c9a..39b9e031a0 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.html
@@ -1,6 +1,10 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
-<button bitButton class="tw-min-w-max" buttonType="primary" [bitMenuTriggerFor]="newMenu">
+<button
+  type="button"
+  bitButton
+  class="tw-min-w-max"
+  buttonType="primary"
+  [bitMenuTriggerFor]="newMenu"
+>
   {{ "new" | i18n }} <i class="bwi bwi-angle-down" aria-hidden="true"></i>
 </button>
 
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html
index aeec7f818b..509123931c 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/secrets-list.component.html
@@ -1,5 +1,3 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <div *ngIf="!secrets" class="tw-items-center tw-justify-center tw-pt-64 tw-text-center">
   <i class="bwi bwi-spinner bwi-spin bwi-3x"></i>
 </div>
@@ -7,7 +5,13 @@
 <sm-no-items *ngIf="secrets?.length == 0">
   <ng-container slot="title">{{ "secretsNoItemsTitle" | i18n }}</ng-container>
   <ng-container slot="description">{{ "secretsNoItemsMessage" | i18n }}</ng-container>
-  <button slot="button" bitButton buttonType="secondary" (click)="newSecretEvent.emit()">
+  <button
+    type="button"
+    slot="button"
+    bitButton
+    buttonType="secondary"
+    (click)="newSecretEvent.emit()"
+  >
     <i class="bwi bwi-plus" aria-hidden="true"></i>
     {{ "newSecret" | i18n }}
   </button>
@@ -32,6 +36,7 @@
       <th bitCell>{{ "lastEdited" | i18n }}</th>
       <th bitCell class="tw-w-0">
         <button
+          type="button"
           bitIconButton="bwi-ellipsis-v"
           buttonType="main"
           [title]="'options' | i18n"
@@ -67,6 +72,7 @@
       <td bitCell>{{ secret.revisionDate | date: "medium" }}</td>
       <td bitCell>
         <button
+          type="button"
           bitIconButton="bwi-ellipsis-v"
           buttonType="main"
           [title]="'options' | i18n"
diff --git a/libs/components/src/banner/banner.component.html b/libs/components/src/banner/banner.component.html
index bed7d6c045..7f0624d143 100644
--- a/libs/components/src/banner/banner.component.html
+++ b/libs/components/src/banner/banner.component.html
@@ -1,5 +1,3 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <div
   class="tw-flex tw-items-center tw-gap-2 tw-p-2 tw-pl-4 tw-text-contrast"
   [ngClass]="bannerClass"
@@ -11,6 +9,7 @@
     <ng-content></ng-content>
   </span>
   <button
+    type="button"
     bitIconButton="bwi-close"
     buttonType="contrast"
     size="default"
diff --git a/libs/components/src/breadcrumbs/breadcrumbs.component.html b/libs/components/src/breadcrumbs/breadcrumbs.component.html
index 08b2965a91..b75bf4ac51 100644
--- a/libs/components/src/breadcrumbs/breadcrumbs.component.html
+++ b/libs/components/src/breadcrumbs/breadcrumbs.component.html
@@ -1,5 +1,3 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <ng-container *ngFor="let breadcrumb of beforeOverflow; let last = last">
   <ng-container *ngIf="breadcrumb.route">
     <a
@@ -14,6 +12,7 @@
   </ng-container>
   <ng-container *ngIf="!breadcrumb.route">
     <button
+      type="button"
       bitLink
       linkType="primary"
       class="tw-my-2 tw-inline-block"
@@ -29,6 +28,7 @@
   <i *ngIf="beforeOverflow.length > 0" class="bwi bwi-angle-right tw-mx-1.5 tw-text-main"></i>
 
   <button
+    type="button"
     bitIconButton="bwi-ellipsis-h"
     [bitMenuTriggerFor]="overflowMenu"
     size="small"
@@ -48,7 +48,7 @@
         </a>
       </ng-container>
       <ng-container *ngIf="!breadcrumb.route">
-        <button bitMenuItem linkType="primary" (click)="breadcrumb.onClick($event)">
+        <button type="button" bitMenuItem linkType="primary" (click)="breadcrumb.onClick($event)">
           <ng-container [ngTemplateOutlet]="breadcrumb.content"></ng-container>
         </button>
       </ng-container>
@@ -70,6 +70,7 @@
     </ng-container>
     <ng-container *ngIf="!breadcrumb.route">
       <button
+        type="button"
         bitLink
         linkType="primary"
         class="tw-my-2 tw-inline-block"
diff --git a/libs/components/src/dialog/simple-configurable-dialog/simple-configurable-dialog.component.html b/libs/components/src/dialog/simple-configurable-dialog/simple-configurable-dialog.component.html
index beaa9aee57..cc6ce75dcb 100644
--- a/libs/components/src/dialog/simple-configurable-dialog/simple-configurable-dialog.component.html
+++ b/libs/components/src/dialog/simple-configurable-dialog/simple-configurable-dialog.component.html
@@ -1,5 +1,3 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <bit-simple-dialog>
   <i bit-dialog-icon class="bwi tw-text-3xl" [class]="iconClasses" aria-hidden="true"></i>
 
@@ -8,12 +6,18 @@
   <div bitDialogContent>{{ content }}</div>
 
   <div bitDialogFooter class="tw-flex tw-flex-row tw-gap-2">
-    <button bitButton buttonType="primary" (click)="dialogRef.close(SimpleDialogCloseType.ACCEPT)">
+    <button
+      type="button"
+      bitButton
+      buttonType="primary"
+      (click)="dialogRef.close(SimpleDialogCloseType.ACCEPT)"
+    >
       {{ acceptButtonText }}
     </button>
 
     <button
       *ngIf="showCancelButton"
+      type="button"
       bitButton
       buttonType="secondary"
       (click)="dialogRef.close(SimpleDialogCloseType.CANCEL)"
diff --git a/libs/components/src/navigation/nav-group.component.html b/libs/components/src/navigation/nav-group.component.html
index 91efcb9783..bb39319790 100644
--- a/libs/components/src/navigation/nav-group.component.html
+++ b/libs/components/src/navigation/nav-group.component.html
@@ -1,5 +1,3 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <!-- This a higher order component that composes `NavItemComponent`  -->
 <bit-nav-item
   [text]="text"
@@ -13,6 +11,7 @@
 >
   <ng-template #button>
     <button
+      type="button"
       class="tw-ml-auto"
       [bitIconButton]="
         open ? 'bwi-angle-up' : variant === 'tree' ? 'bwi-angle-right' : 'bwi-angle-down'
diff --git a/libs/components/src/navigation/nav-item.component.html b/libs/components/src/navigation/nav-item.component.html
index 3bec915b73..879cdf311b 100644
--- a/libs/components/src/navigation/nav-item.component.html
+++ b/libs/components/src/navigation/nav-item.component.html
@@ -1,5 +1,3 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <div
   class="tw-relative"
   [ngClass]="[
@@ -28,6 +26,7 @@
       }"
     >
       <button
+        type="button"
         class="tw-invisible"
         [bitIconButton]="'bwi-angle-down'"
         size="small"
@@ -65,6 +64,7 @@
     <ng-template #isButton>
       <!-- Class field should match `#isAnchor` class field above -->
       <button
+        type="button"
         class="fvw tw-w-full tw-overflow-hidden tw-text-ellipsis tw-whitespace-nowrap tw-border-none tw-bg-transparent tw-p-0 tw-text-start !tw-text-alt2 hover:tw-text-alt2 hover:tw-no-underline focus:tw-outline-none [&>:not(.bwi)]:hover:tw-underline"
         (click)="mainContentClicked.emit()"
       >