diff --git a/apps/browser/src/vault/popup/components/vault/vault-select.component.html b/apps/browser/src/vault/popup/components/vault/vault-select.component.html
index b94128ad28..84c5f48a4e 100644
--- a/apps/browser/src/vault/popup/components/vault/vault-select.component.html
+++ b/apps/browser/src/vault/popup/components/vault/vault-select.component.html
@@ -1,9 +1,8 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <ng-container *ngIf="loaded && organizations$ | async as organizations">
   <div class="content org-filter-content" *ngIf="loaded && shouldShow(organizations)">
     <ng-container *ngIf="selectedVault$ | async as vaultFilterDisplay">
       <button
+        type="button"
         #toggleVaults
         class="org-filter"
         (click)="openOverlay()"
@@ -33,19 +32,25 @@
         role="dialog"
         aria-modal="true"
       >
-        <button appStopClick (click)="selectAllVaults()">
+        <button type="button" appStopClick (click)="selectAllVaults()">
           <div class="vault-select-org-text-container">
             <i class="bwi bwi-fw bwi-filter vault-select-prefix-icon" aria-hidden="true"></i>
             <span class="vault-select-org-name">{{ "allVaults" | i18n }}</span>
           </div>
         </button>
-        <button *ngIf="!enforcePersonalOwnership" appStopClick (click)="selectMyVault()">
+        <button
+          type="button"
+          *ngIf="!enforcePersonalOwnership"
+          appStopClick
+          (click)="selectMyVault()"
+        >
           <div class="vault-select-org-text-container">
             <i class="bwi bwi-fw bwi-user vault-select-prefix-icon" aria-hidden="true"></i>
             <span class="vault-select-org-name">{{ "myVault" | i18n }}</span>
           </div>
         </button>
         <button
+          type="button"
           *ngFor="let organization of organizations"
           appStopClick
           (click)="selectOrganization(organization)"
diff --git a/apps/browser/src/vault/popup/components/vault/view.component.html b/apps/browser/src/vault/popup/components/vault/view.component.html
index a698aaf718..27eebd5d4a 100644
--- a/apps/browser/src/vault/popup/components/vault/view.component.html
+++ b/apps/browser/src/vault/popup/components/vault/view.component.html
@@ -1,5 +1,3 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <header>
   <div class="left">
     <button type="button" (click)="close()">{{ "close" | i18n }}</button>
@@ -655,6 +653,7 @@
       <div *ngIf="cipher.hasPasswordHistory">
         <b class="font-weight-semibold">{{ "passwordHistory" | i18n }}:</b>
         <button
+          type="button"
           routerLink="/cipher-password-history"
           [queryParams]="{ cipherId: cipher.id }"
           appStopClick
diff --git a/apps/desktop/src/admin-console/vault-filters/collection-filter.component.html b/apps/desktop/src/admin-console/vault-filters/collection-filter.component.html
index 281a0aac14..bf4422a8a1 100644
--- a/apps/desktop/src/admin-console/vault-filters/collection-filter.component.html
+++ b/apps/desktop/src/admin-console/vault-filters/collection-filter.component.html
@@ -1,9 +1,8 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <ng-container *ngIf="show">
   <div class="filter-heading">
     <h2>
       <button
+        type="button"
         class="no-btn"
         [attr.aria-expanded]="!isCollapsed(collectionsGrouping)"
         aria-controls="collection-filters"
@@ -30,6 +29,7 @@
       >
         <span class="filter-buttons">
           <button
+            type="button"
             *ngIf="c.children.length"
             class="toggle-button"
             [attr.aria-expanded]="!isCollapsed(c.node)"
@@ -47,6 +47,7 @@
             ></i>
           </button>
           <button
+            type="button"
             class="filter-button"
             (click)="applyFilter(c.node)"
             [attr.aria-pressed]="c.node.id === activeFilter.selectedCollectionId"
diff --git a/apps/desktop/src/admin-console/vault-filters/organization-filter.component.html b/apps/desktop/src/admin-console/vault-filters/organization-filter.component.html
index 26b1b3af33..2740b22978 100644
--- a/apps/desktop/src/admin-console/vault-filters/organization-filter.component.html
+++ b/apps/desktop/src/admin-console/vault-filters/organization-filter.component.html
@@ -1,10 +1,9 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <ng-container *ngIf="show">
   <ng-container [ngSwitch]="displayMode">
     <ng-container *ngSwitchCase="'personalOwnershipPolicy'">
       <div class="filter-heading" [ngClass]="{ active: !hasActiveFilter }">
         <button
+          type="button"
           class="toggle-button"
           appA11yTitle="{{ 'toggleCollapse' | i18n }} {{ organizationGrouping.name | i18n }}"
           (click)="toggleCollapse()"
@@ -23,6 +22,7 @@
         &nbsp;
         <h2>
           <button
+            type="button"
             class="filter-button"
             (click)="clearFilter()"
             [attr.aria-pressed]="!hasActiveFilter"
@@ -40,6 +40,7 @@
         >
           <span class="filter-buttons">
             <button
+              type="button"
               class="filter-button"
               (click)="applyOrganizationFilter(organization)"
               [attr.aria-pressed]="activeFilter.myVaultOnly"
@@ -62,6 +63,7 @@
     <ng-container *ngSwitchDefault>
       <div class="filter-heading" [ngClass]="{ active: !hasActiveFilter }">
         <button
+          type="button"
           appA11yTitle="{{ 'toggleCollapse' | i18n }} {{ organizationGrouping.name | i18n }}"
           (click)="toggleCollapse()"
           [attr.aria-expanded]="!isCollapsed"
@@ -79,6 +81,7 @@
         &nbsp;
         <h2>
           <button
+            type="button"
             class="filter-button"
             (click)="clearFilter()"
             [attr.aria-pressed]="!hasActiveFilter"
@@ -92,6 +95,7 @@
         <li class="filter-option" [ngClass]="{ active: activeFilter.myVaultOnly }">
           <span class="filter-buttons">
             <button
+              type="button"
               class="filter-button"
               (click)="applyMyVaultFilter()"
               [attr.aria-pressed]="activeFilter.myVaultOnly"
@@ -109,6 +113,7 @@
         >
           <span class="filter-buttons">
             <button
+              type="button"
               class="filter-button"
               (click)="applyOrganizationFilter(organization)"
               appA11yTitle="{{ 'vault' | i18n }}: {{ organization.name }} {{
diff --git a/apps/desktop/src/app/tools/send/send.component.html b/apps/desktop/src/app/tools/send/send.component.html
index 4413c83e36..f03a15e1e5 100644
--- a/apps/desktop/src/app/tools/send/send.component.html
+++ b/apps/desktop/src/app/tools/send/send.component.html
@@ -1,5 +1,3 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <div id="sends" class="vault">
   <div class="left-nav">
     <div class="vault-filters">
@@ -9,6 +7,7 @@
           <li class="filter-option" [ngClass]="{ active: selectedAll }">
             <span class="filter-buttons">
               <button
+                type="button"
                 class="filter-button"
                 (click)="selectAll()"
                 [attr.aria-pressed]="selectedAll === true"
@@ -29,6 +28,7 @@
           <li class="filter-option" [ngClass]="{ active: selectedType === sendType.Text }">
             <span class="filter-buttons">
               <button
+                type="button"
                 class="filter-button"
                 (click)="selectType(sendType.Text)"
                 [attr.aria-pressed]="selectedType === sendType.Text"
@@ -42,6 +42,7 @@
           <li class="filter-option" [ngClass]="{ active: selectedType === sendType.File }">
             <span class="filter-buttons">
               <button
+                type="button"
                 class="filter-button"
                 (click)="selectType(sendType.File)"
                 [attr.aria-pressed]="selectedType === sendType.File"
@@ -61,6 +62,7 @@
     <div class="content">
       <div class="list full-height" *ngIf="filteredSends.length">
         <button
+          type="button"
           *ngFor="let s of filteredSends"
           appStopClick
           (click)="selectSend(s.id)"
diff --git a/apps/desktop/src/vault/app/vault/vault-filter/filters/folder-filter.component.html b/apps/desktop/src/vault/app/vault/vault-filter/filters/folder-filter.component.html
index e1649a0067..218a4c1269 100644
--- a/apps/desktop/src/vault/app/vault/vault-filter/filters/folder-filter.component.html
+++ b/apps/desktop/src/vault/app/vault/vault-filter/filters/folder-filter.component.html
@@ -1,9 +1,8 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <ng-container *ngIf="!hide">
   <div class="filter-heading">
     <h2>
       <button
+        type="button"
         class="toggle-button"
         [attr.aria-expanded]="!isCollapsed(foldersGrouping)"
         aria-controls="folder-filters"
@@ -20,7 +19,12 @@
         &nbsp;{{ foldersGrouping.name | i18n }}
       </button>
     </h2>
-    <button class="add-button" (click)="addFolder()" appA11yTitle="{{ 'addFolder' | i18n }}">
+    <button
+      type="button"
+      class="add-button"
+      (click)="addFolder()"
+      appA11yTitle="{{ 'addFolder' | i18n }}"
+    >
       <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
     </button>
   </div>
@@ -35,6 +39,7 @@
       >
         <span class="filter-buttons">
           <button
+            type="button"
             class="toggle-button"
             *ngIf="f.children.length"
             (click)="toggleCollapse(f.node)"
@@ -52,6 +57,7 @@
             ></i>
           </button>
           <button
+            type="button"
             class="filter-button"
             (click)="applyFilter(f.node)"
             [attr.aria-pressed]="
@@ -62,6 +68,7 @@
             &nbsp;{{ f.node.name }}
           </button>
           <button
+            type="button"
             class="edit-button"
             *ngIf="f.node.id"
             (click)="editFolder(f.node)"
diff --git a/apps/desktop/src/vault/app/vault/vault-filter/filters/status-filter.component.html b/apps/desktop/src/vault/app/vault/vault-filter/filters/status-filter.component.html
index 8b0e109a43..0e4a4c997e 100644
--- a/apps/desktop/src/vault/app/vault/vault-filter/filters/status-filter.component.html
+++ b/apps/desktop/src/vault/app/vault/vault-filter/filters/status-filter.component.html
@@ -1,11 +1,10 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <ng-container *ngIf="show">
   <h2 class="sr-only">{{ "filters" | i18n }}</h2>
   <ul class="filter-options">
     <li class="filter-option" [ngClass]="{ active: activeFilter.status === 'all' }">
       <span class="filter-buttons">
         <button
+          type="button"
           class="filter-button"
           (click)="applyFilter('all')"
           [attr.aria-pressed]="activeFilter.status === 'all'"
@@ -21,6 +20,7 @@
     >
       <span class="filter-buttons">
         <button
+          type="button"
           class="filter-button"
           (click)="applyFilter('favorites')"
           [attr.aria-pressed]="activeFilter.status === 'favorites'"
@@ -36,6 +36,7 @@
     >
       <span class="filter-buttons">
         <button
+          type="button"
           class="filter-button"
           (click)="applyFilter('trash')"
           [attr.aria-pressed]="activeFilter.status === 'trash'"
diff --git a/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.html b/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.html
index d684ccf660..1df87a69ed 100644
--- a/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.html
+++ b/apps/desktop/src/vault/app/vault/vault-filter/filters/type-filter.component.html
@@ -1,8 +1,7 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <div class="filter-heading">
   <h2>
     <button
+      type="button"
       class="no-btn"
       (click)="toggleCollapse()"
       [attr.aria-expanded]="!isCollapsed"
@@ -27,6 +26,7 @@
   >
     <span class="filter-buttons">
       <button
+        type="button"
         class="filter-button"
         (click)="applyFilter(cipherTypeEnum.Login)"
         [attr.aria-pressed]="activeFilter.cipherType === cipherTypeEnum.Login"
@@ -38,6 +38,7 @@
   <li class="filter-option" [ngClass]="{ active: activeFilter.cipherType === cipherTypeEnum.Card }">
     <span class="filter-buttons">
       <button
+        type="button"
         class="filter-button"
         (click)="applyFilter(cipherTypeEnum.Card)"
         [attr.aria-pressed]="activeFilter.cipherType === cipherTypeEnum.Card"
@@ -52,6 +53,7 @@
   >
     <span class="filter-buttons">
       <button
+        type="button"
         class="filter-button"
         (click)="applyFilter(cipherTypeEnum.Identity)"
         [attr.aria-pressed]="activeFilter.cipherType === cipherTypeEnum.Identity"
@@ -66,6 +68,7 @@
   >
     <span class="filter-buttons">
       <button
+        type="button"
         class="filter-button"
         (click)="applyFilter(cipherTypeEnum.SecureNote)"
         [attr.aria-pressed]="activeFilter.cipherType === cipherTypeEnum.SecureNote"
diff --git a/apps/desktop/src/vault/app/vault/vault-items.component.html b/apps/desktop/src/vault/app/vault/vault-items.component.html
index 348bb1e55b..b64bdaa1c8 100644
--- a/apps/desktop/src/vault/app/vault/vault-items.component.html
+++ b/apps/desktop/src/vault/app/vault/vault-items.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="container loading-spinner" *ngIf="!loaded">
   <i class="bwi bwi-spinner bwi-spin bwi-3x" aria-hidden="true"></i>
 </div>
@@ -54,10 +52,13 @@
     <div class="no-items" *ngIf="!ciphers.length">
       <img class="no-items-image" aria-hidden="true" />
       <p>{{ "noItemsInList" | i18n }}</p>
-      <button (click)="addCipher()" class="btn block primary link">{{ "addItem" | i18n }}</button>
+      <button type="button" (click)="addCipher()" class="btn block primary link">
+        {{ "addItem" | i18n }}
+      </button>
     </div>
     <div class="footer">
       <button
+        type="button"
         (click)="addCipher()"
         (contextmenu)="addCipherOptions()"
         class="block primary"
diff --git a/apps/desktop/src/vault/app/vault/view.component.html b/apps/desktop/src/vault/app/vault/view.component.html
index 557e7e4f4f..ac23264c8d 100644
--- a/apps/desktop/src/vault/app/vault/view.component.html
+++ b/apps/desktop/src/vault/app/vault/view.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="content">
   <div class="inner-content" *ngIf="cipher">
     <div class="box">
@@ -532,6 +530,7 @@
 </div>
 <div class="footer" *ngIf="cipher">
   <button
+    type="button"
     class="primary"
     (click)="edit()"
     appA11yTitle="{{ 'edit' | i18n }}"
@@ -540,6 +539,7 @@
     <i class="bwi bwi-pencil bwi-fw bwi-lg" aria-hidden="true"></i>
   </button>
   <button
+    type="button"
     class="primary"
     (click)="restore()"
     appA11yTitle="{{ 'restore' | i18n }}"
@@ -548,6 +548,7 @@
     <i class="bwi bwi-undo bwi-fw bwi-lg" aria-hidden="true"></i>
   </button>
   <button
+    type="button"
     class="primary"
     *ngIf="!cipher?.organizationId && !cipher.isDeleted"
     (click)="clone()"
diff --git a/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.html b/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.html
index 334b12ae87..0989cecd74 100644
--- a/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.html
+++ b/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.html
@@ -1,5 +1,3 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <!-- eslint-disable tailwindcss/no-custom-classname -->
 <div *ngIf="accountCreateOnly" class="">
   <h1 class="tw-mt-12 tw-text-center tw-text-xl">{{ "createAccount" | i18n }}</h1>
@@ -76,6 +74,7 @@
             <app-vertical-step label="Organization Information" [subLabel]="orgInfoSubLabel">
               <app-org-info [nameOnly]="true" [formGroup]="orgInfoFormGroup"></app-org-info>
               <button
+                type="button"
                 bitButton
                 buttonType="primary"
                 [disabled]="orgInfoFormGroup.get('name').invalid"
@@ -100,10 +99,11 @@
                 [orgLabel]="orgLabel"
               ></app-trial-confirmation-details>
               <div class="tw-mb-3 tw-flex">
-                <button bitButton buttonType="primary" (click)="navigateToOrgVault()">
+                <button type="button" bitButton buttonType="primary" (click)="navigateToOrgVault()">
                   Get Started
                 </button>
                 <button
+                  type="button"
                   bitButton
                   buttonType="secondary"
                   (click)="navigateToOrgInvite()"
diff --git a/apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-step-content.component.html b/apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-step-content.component.html
index 09c76ab435..622a9f6d92 100644
--- a/apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-step-content.component.html
+++ b/apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-step-content.component.html
@@ -1,8 +1,7 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <!-- eslint-disable tailwindcss/no-custom-classname -->
 <div class="tw-m-2.5 tw-h-16 tw-text-center">
   <button
+    type="button"
     (click)="selectStep()"
     [disabled]="disabled"
     class="tw-flex tw-w-full tw-items-center tw-border-none tw-bg-transparent"
diff --git a/apps/web/src/app/admin-console/organizations/manage/groups.component.html b/apps/web/src/app/admin-console/organizations/manage/groups.component.html
index 45e3eeabe3..d8055e4bdc 100644
--- a/apps/web/src/app/admin-console/organizations/manage/groups.component.html
+++ b/apps/web/src/app/admin-console/organizations/manage/groups.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="container page-content">
   <div class="tw-mb-4 tw-flex">
     <h1>{{ "groups" | i18n }}</h1>
@@ -81,7 +79,7 @@
             <input type="checkbox" bitCheckbox [(ngModel)]="g.checked" />
           </td>
           <td bitCell class="tw-cursor-pointer tw-font-bold" (click)="edit(g)">
-            <button bitLink>
+            <button type="button" bitLink>
               {{ g.details.name }}
             </button>
           </td>
diff --git a/apps/web/src/app/admin-console/organizations/members/people.component.html b/apps/web/src/app/admin-console/organizations/members/people.component.html
index 17f587c533..de675853a0 100644
--- a/apps/web/src/app/admin-console/organizations/members/people.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/people.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="container page-content">
   <div class="tw-mb-4 tw-flex tw-flex-col tw-space-y-4">
     <h1>{{ "members" | i18n }}</h1>
@@ -150,7 +148,7 @@
                 ></bit-avatar>
                 <div class="tw-flex tw-flex-col">
                   <div>
-                    <button bitLink>
+                    <button type="button" bitLink>
                       {{ u.name ?? u.email }}
                     </button>
                     <span
diff --git a/apps/web/src/app/admin-console/settings/sponsoring-org-row.component.html b/apps/web/src/app/admin-console/settings/sponsoring-org-row.component.html
index 9c1a202237..818f7e8edf 100644
--- a/apps/web/src/app/admin-console/settings/sponsoring-org-row.component.html
+++ b/apps/web/src/app/admin-console/settings/sponsoring-org-row.component.html
@@ -1,5 +1,3 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <td>
   {{ sponsoringOrg.familySponsorshipFriendlyName }}
 </td>
@@ -23,6 +21,7 @@
     </button>
     <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
       <button
+        type="button"
         #resendEmailBtn
         *ngIf="!isSelfHosted && !sponsoringOrg.familySponsorshipValidUntil"
         [appApiAction]="resendEmailPromise"
@@ -35,6 +34,7 @@
         <span>{{ "resendEmail" | i18n }}</span>
       </button>
       <button
+        type="button"
         #revokeSponsorshipBtn
         [appApiAction]="revokeSponsorshipPromise"
         class="dropdown-item text-danger btn-submit"
diff --git a/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.html b/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.html
index beb6c6fbde..0ce30ccd4f 100644
--- a/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.html
+++ b/apps/web/src/app/auth/settings/emergency-access/emergency-access.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="page-header">
   <h1>{{ "emergencyAccess" | i18n }}</h1>
 </div>
@@ -85,6 +83,7 @@
         </button>
         <bit-menu #trustedContactOptions>
           <button
+            type="button"
             bitMenuItem
             *ngIf="c.status === emergencyAccessStatusType.Invited"
             (click)="reinvite(c)"
@@ -93,6 +92,7 @@
             {{ "resendInvitation" | i18n }}
           </button>
           <button
+            type="button"
             bitMenuItem
             *ngIf="c.status === emergencyAccessStatusType.Accepted"
             (click)="confirm(c)"
@@ -101,6 +101,7 @@
             {{ "confirm" | i18n }}
           </button>
           <button
+            type="button"
             bitMenuItem
             *ngIf="c.status === emergencyAccessStatusType.RecoveryInitiated"
             (click)="approve(c)"
@@ -109,6 +110,7 @@
             {{ "approve" | i18n }}
           </button>
           <button
+            type="button"
             bitMenuItem
             *ngIf="
               c.status === emergencyAccessStatusType.RecoveryInitiated ||
@@ -119,7 +121,7 @@
             <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
             {{ "reject" | i18n }}
           </button>
-          <button bitMenuItem (click)="remove(c)">
+          <button type="button" bitMenuItem (click)="remove(c)">
             <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
             {{ "remove" | i18n }}
           </button>
@@ -198,6 +200,7 @@
         </button>
         <bit-menu #grantedContactOptions>
           <button
+            type="button"
             bitMenuItem
             *ngIf="c.status === emergencyAccessStatusType.Confirmed"
             (click)="requestAccess(c)"
@@ -206,6 +209,7 @@
             {{ "requestAccess" | i18n }}
           </button>
           <button
+            type="button"
             bitMenuItem
             *ngIf="
               c.status === emergencyAccessStatusType.RecoveryApproved &&
@@ -217,6 +221,7 @@
             {{ "takeover" | i18n }}
           </button>
           <button
+            type="button"
             bitMenuItem
             *ngIf="
               c.status === emergencyAccessStatusType.RecoveryApproved &&
@@ -227,7 +232,7 @@
             <i class="bwi bwi-fw bwi-eye" aria-hidden="true"></i>
             {{ "view" | i18n }}
           </button>
-          <button bitMenuItem (click)="remove(c)">
+          <button type="button" bitMenuItem (click)="remove(c)">
             <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
             {{ "remove" | i18n }}
           </button>
diff --git a/apps/web/src/app/auth/settings/two-factor-setup.component.html b/apps/web/src/app/auth/settings/two-factor-setup.component.html
index d61f62425e..7e60a4ecaa 100644
--- a/apps/web/src/app/auth/settings/two-factor-setup.component.html
+++ b/apps/web/src/app/auth/settings/two-factor-setup.component.html
@@ -1,5 +1,3 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <div [ngClass]="tabbedHeader ? 'tabbed-header' : 'page-header'">
   <h1 *ngIf="!organizationId">{{ "twoStepLogin" | i18n }}</h1>
   <h1 *ngIf="organizationId">{{ "twoStepLoginEnforcement" | i18n }}</h1>
@@ -16,7 +14,7 @@
 </ng-container>
 <bit-callout type="warning" *ngIf="!organizationId">
   <p>{{ "twoStepLoginRecoveryWarning" | i18n }}</p>
-  <button bitButton buttonType="secondary" (click)="recoveryCode()">
+  <button type="button" bitButton buttonType="secondary" (click)="recoveryCode()">
     {{ "viewRecoveryCode" | i18n }}
   </button>
 </bit-callout>
@@ -56,6 +54,7 @@
     </div>
     <div class="ml-auto">
       <button
+        type="button"
         bitButton
         buttonType="secondary"
         [disabled]="!canAccessPremium && p.premium"
diff --git a/apps/web/src/app/billing/organizations/organization-billing-history-view.component.html b/apps/web/src/app/billing/organizations/organization-billing-history-view.component.html
index 050d787ee2..cf4b938bd6 100644
--- a/apps/web/src/app/billing/organizations/organization-billing-history-view.component.html
+++ b/apps/web/src/app/billing/organizations/organization-billing-history-view.component.html
@@ -1,10 +1,9 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <div class="d-flex page-header">
   <h1>
     {{ "billingHistory" | i18n }}
   </h1>
   <button
+    type="button"
     bitButton
     buttonType="secondary"
     (click)="load()"
diff --git a/apps/web/src/app/billing/settings/billing-history-view.component.html b/apps/web/src/app/billing/settings/billing-history-view.component.html
index b524ae0af4..1032558f5f 100644
--- a/apps/web/src/app/billing/settings/billing-history-view.component.html
+++ b/apps/web/src/app/billing/settings/billing-history-view.component.html
@@ -1,10 +1,9 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <div class="d-flex tabbed-header">
   <h1>
     {{ "billingHistory" | i18n }}
   </h1>
   <button
+    type="button"
     bitButton
     buttonType="secondary"
     (click)="load()"
diff --git a/apps/web/src/app/billing/settings/payment-method.component.html b/apps/web/src/app/billing/settings/payment-method.component.html
index 77401ae25c..9fde6419e1 100644
--- a/apps/web/src/app/billing/settings/payment-method.component.html
+++ b/apps/web/src/app/billing/settings/payment-method.component.html
@@ -1,10 +1,9 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <div class="d-flex" [ngClass]="headerClass">
   <h1>
     {{ "paymentMethod" | i18n }}
   </h1>
   <button
+    type="button"
     bitButton
     buttonType="secondary"
     (click)="load()"
@@ -30,7 +29,13 @@
     <strong>{{ creditOrBalance | currency : "$" }}</strong>
   </p>
   <p>{{ "creditAppliedDesc" | i18n }}</p>
-  <button bitButton buttonType="secondary" (click)="addCredit()" *ngIf="!showAddCredit">
+  <button
+    type="button"
+    bitButton
+    buttonType="secondary"
+    (click)="addCredit()"
+    *ngIf="!showAddCredit"
+  >
     {{ "addCredit" | i18n }}
   </button>
   <app-add-credit
@@ -72,6 +77,7 @@
           <span bitPrefix>$0.</span>
         </bit-form-field>
         <button
+          type="button"
           bitButton
           buttonType="primary"
           type="submit"
@@ -89,7 +95,13 @@
       {{ paymentSource.description }}
     </p>
   </ng-container>
-  <button bitButton buttonType="secondary" (click)="changePayment()" *ngIf="!showAdjustPayment">
+  <button
+    type="button"
+    bitButton
+    buttonType="secondary"
+    (click)="changePayment()"
+    *ngIf="!showAdjustPayment"
+  >
     {{ (paymentSource ? "changePaymentMethod" : "addPaymentMethod") | i18n }}
   </button>
   <app-adjust-payment
diff --git a/apps/web/src/app/components/user-verification-prompt.component.html b/apps/web/src/app/components/user-verification-prompt.component.html
index 76eb757a8e..10a137c51e 100644
--- a/apps/web/src/app/components/user-verification-prompt.component.html
+++ b/apps/web/src/app/components/user-verification-prompt.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="modal fade" role="dialog" aria-modal="true" aria-labelledby="confirmUserTitle">
   <div class="modal-dialog modal-dialog-scrollable" role="document">
     <form class="modal-content" #form (ngSubmit)="submit()">
@@ -16,10 +14,10 @@
       <div
         class="tw-border-0 tw-border-t tw-border-solid tw-border-secondary-300 tw-bg-background-alt tw-p-3.5"
       >
-        <button bitButton buttonType="primary" type="submit" appBlurClick>
+        <button type="button" bitButton buttonType="primary" type="submit" appBlurClick>
           <span>{{ confirmButtonText | i18n }}</span>
         </button>
-        <button bitButton buttonType="secondary" data-dismiss="modal">
+        <button type="button" bitButton buttonType="secondary" data-dismiss="modal">
           {{ "cancel" | i18n }}
         </button>
       </div>
diff --git a/apps/web/src/app/layouts/navbar.component.html b/apps/web/src/app/layouts/navbar.component.html
index a9e035d1ab..6764e158f3 100644
--- a/apps/web/src/app/layouts/navbar.component.html
+++ b/apps/web/src/app/layouts/navbar.component.html
@@ -1,5 +1,3 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <nav class="navbar navbar-expand navbar-dark" [ngClass]="{ 'nav-background-alt': selfHosted }">
   <div class="container">
     <a class="navbar-brand" routerLink="/" appA11yTitle="{{ 'pageTitle' | i18n : 'Bitwarden' }}">
@@ -44,6 +42,7 @@
     <ul class="navbar-nav flex-row ml-md-auto d-none d-md-flex">
       <li>
         <button
+          type="button"
           [bitMenuTriggerFor]="accountMenu"
           class="tw-border-0 tw-bg-transparent tw-text-alt2 tw-opacity-70 hover:tw-opacity-90"
         >
diff --git a/apps/web/src/app/settings/account.component.html b/apps/web/src/app/settings/account.component.html
index b889b121a1..687a78290a 100644
--- a/apps/web/src/app/settings/account.component.html
+++ b/apps/web/src/app/settings/account.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="page-header">
   <h1>{{ "myAccount" | i18n }}</h1>
 </div>
@@ -16,13 +14,13 @@
 <div class="card border-danger">
   <div class="card-body">
     <p>{{ "dangerZoneDesc" | i18n }}</p>
-    <button bitButton buttonType="danger" (click)="deauthorizeSessions()">
+    <button type="button" bitButton buttonType="danger" (click)="deauthorizeSessions()">
       {{ "deauthorizeSessions" | i18n }}
     </button>
-    <button bitButton buttonType="danger" (click)="purgeVault()">
+    <button type="button" bitButton buttonType="danger" (click)="purgeVault()">
       {{ "purgeVault" | i18n }}
     </button>
-    <button bitButton buttonType="danger" (click)="deleteAccount()">
+    <button type="button" bitButton buttonType="danger" (click)="deleteAccount()">
       {{ "deleteAccount" | i18n }}
     </button>
   </div>
diff --git a/apps/web/src/app/settings/security-keys.component.html b/apps/web/src/app/settings/security-keys.component.html
index b4ecbdfb5b..1ffc1607e7 100644
--- a/apps/web/src/app/settings/security-keys.component.html
+++ b/apps/web/src/app/settings/security-keys.component.html
@@ -1,5 +1,3 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <app-change-kdf *ngIf="showChangeKdf"></app-change-kdf>
 <div
   [ngClass]="{ 'tabbed-header': !showChangeKdf, 'secondary-header': showChangeKdf }"
@@ -10,10 +8,10 @@
 <p>
   {{ "userApiKeyDesc" | i18n }}
 </p>
-<button bitButton buttonType="secondary" (click)="viewUserApiKey()">
+<button type="button" bitButton buttonType="secondary" (click)="viewUserApiKey()">
   {{ "viewApiKey" | i18n }}
 </button>
-<button bitButton buttonType="secondary" (click)="rotateUserApiKey()">
+<button type="button" bitButton buttonType="secondary" (click)="rotateUserApiKey()">
   {{ "rotateApiKey" | i18n }}
 </button>
 <ng-template #viewUserApiKeyTemplate></ng-template>
diff --git a/apps/web/src/app/tools/password-generator-history.component.html b/apps/web/src/app/tools/password-generator-history.component.html
index 75fc4ea3c5..93c97f7182 100644
--- a/apps/web/src/app/tools/password-generator-history.component.html
+++ b/apps/web/src/app/tools/password-generator-history.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="modal fade" role="dialog" aria-modal="true" aria-labelledby="passHistoryTitle">
   <div class="modal-dialog modal-dialog-scrollable" role="document">
     <div class="modal-content">
@@ -27,6 +25,7 @@
             </div>
             <div class="ml-auto">
               <button
+                type="button"
                 class="btn btn-link"
                 appA11yTitle="{{ 'copyPassword' | i18n }}"
                 (click)="copy(h.password)"
diff --git a/apps/web/src/app/tools/send/add-edit.component.html b/apps/web/src/app/tools/send/add-edit.component.html
index 93523a2113..9cd90840b6 100644
--- a/apps/web/src/app/tools/send/add-edit.component.html
+++ b/apps/web/src/app/tools/send/add-edit.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="modal fade" role="dialog" aria-modal="true" aria-labelledby="sendAddEditTitle">
   <div class="modal-dialog modal-dialog-scrollable modal-lg" role="document">
     <form
@@ -144,7 +142,7 @@
           (click)="toggleOptions()"
         >
           <h3 class="mb-0 mr-2">
-            <button appStopClick class="header-expandable">
+            <button type="button" appStopClick class="header-expandable">
               <i
                 class="bwi"
                 aria-hidden="true"
diff --git a/apps/web/src/app/tools/send/send.component.html b/apps/web/src/app/tools/send/send.component.html
index d6bc7c693e..53bc0b7014 100644
--- a/apps/web/src/app/tools/send/send.component.html
+++ b/apps/web/src/app/tools/send/send.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="container page-content">
   <app-callout type="warning" title="{{ 'sendDisabled' | i18n }}" *ngIf="disableSend">
     <span>{{ "sendDisabledWarning" | i18n }}</span>
@@ -25,7 +23,7 @@
             <ul class="filter-options">
               <li class="filter-option" [ngClass]="{ active: selectedAll }">
                 <span class="filter-buttons">
-                  <button class="filter-button" appStopClick (click)="selectAll()">
+                  <button type="button" class="filter-button" appStopClick (click)="selectAll()">
                     <i class="bwi bwi-fw bwi-filter"></i>{{ "allSends" | i18n }}
                   </button>
                 </span>
@@ -39,14 +37,24 @@
             <ul class="filter-options">
               <li class="filter-option" [ngClass]="{ active: selectedType === sendType.Text }">
                 <span class="filter-buttons">
-                  <button class="filter-button" appStopClick (click)="selectType(sendType.Text)">
+                  <button
+                    type="button"
+                    class="filter-button"
+                    appStopClick
+                    (click)="selectType(sendType.Text)"
+                  >
                     <i class="bwi bwi-fw bwi-file-text"></i>{{ "sendTypeText" | i18n }}
                   </button>
                 </span>
               </li>
               <li class="filter-option" [ngClass]="{ active: selectedType === sendType.File }">
                 <span class="filter-buttons">
-                  <button class="filter-button" appStopClick (click)="selectType(sendType.File)">
+                  <button
+                    type="button"
+                    class="filter-button"
+                    appStopClick
+                    (click)="selectType(sendType.File)"
+                  >
                     <i class="bwi bwi-fw bwi-file"></i>{{ "sendTypeFile" | i18n }}
                   </button>
                 </span>
@@ -144,6 +152,7 @@
             </td>
             <td class="table-list-options">
               <button
+                type="button"
                 [bitMenuTriggerFor]="sendOptions"
                 class="tw-border-none tw-bg-transparent tw-text-main"
                 type="button"
@@ -152,15 +161,20 @@
                 <i class="bwi bwi-ellipsis-v bwi-lg" aria-hidden="true"></i>
               </button>
               <bit-menu #sendOptions>
-                <button bitMenuItem (click)="copy(s)">
+                <button type="button" bitMenuItem (click)="copy(s)">
                   <i class="bwi bwi-fw bwi-clone" aria-hidden="true"></i>
                   {{ "copySendLink" | i18n }}
                 </button>
-                <button bitMenuItem (click)="removePassword(s)" *ngIf="s.password && !disableSend">
+                <button
+                  type="button"
+                  bitMenuItem
+                  (click)="removePassword(s)"
+                  *ngIf="s.password && !disableSend"
+                >
                   <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
                   {{ "removePassword" | i18n }}
                 </button>
-                <button bitMenuItem (click)="delete(s)">
+                <button type="button" bitMenuItem (click)="delete(s)">
                   <span class="tw-text-danger">
                     <i class="bwi bwi-fw bwi-trash" aria-hidden="true"></i>
                     {{ "delete" | i18n }}
@@ -183,7 +197,12 @@
         <ng-container *ngIf="loaded">
           <bit-icon [icon]="noItemIcon" aria-hidden="true"></bit-icon>
           <p>{{ "noSendsInList" | i18n }}</p>
-          <button (click)="addSend()" class="btn btn-outline-primary" [disabled]="disableSend">
+          <button
+            type="button"
+            (click)="addSend()"
+            class="btn btn-outline-primary"
+            [disabled]="disableSend"
+          >
             <i class="bwi bwi-plus bwi-fw"></i>{{ "createSend" | i18n }}
           </button>
         </ng-container>
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.html b/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.html
index 6573969b01..fd3ec61520 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.html
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.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 *ngIf="!loaded">
   <i
     class="bwi bwi-spinner bwi-spin text-muted tw-m-2"
@@ -14,6 +12,7 @@
   [appApiAction]="actionPromise"
 >
   <button
+    type="button"
     *ngIf="allowEnrollmentChanges(organization) && !organization.resetPasswordEnrolled"
     class="tw-block tw-cursor-pointer tw-border-none tw-bg-background tw-px-4 tw-py-2 tw-text-left !tw-text-main hover:tw-bg-secondary-100 focus:tw-z-50 focus:tw-bg-secondary-100 focus:tw-outline-none focus:tw-ring focus:tw-ring-primary-700 focus:tw-ring-offset-2 active:!tw-ring-0 active:!tw-ring-offset-0"
     (click)="toggleResetPasswordEnrollment(organization)"
@@ -22,6 +21,7 @@
     {{ "enrollPasswordReset" | i18n }}
   </button>
   <button
+    type="button"
     *ngIf="allowEnrollmentChanges(organization) && organization.resetPasswordEnrolled"
     class="tw-block tw-cursor-pointer tw-border-none tw-bg-background tw-px-4 tw-py-2 tw-text-left !tw-text-main hover:tw-bg-secondary-100 focus:tw-z-50 focus:tw-bg-secondary-100 focus:tw-outline-none focus:tw-ring focus:tw-ring-primary-700 focus:tw-ring-offset-2 active:!tw-ring-0 active:!tw-ring-offset-0"
     (click)="toggleResetPasswordEnrollment(organization)"
@@ -31,6 +31,7 @@
   </button>
   <ng-container *ngIf="organization.useSso && organization.identifier">
     <button
+      type="button"
       *ngIf="organization.ssoBound; else linkSso"
       class="tw-block tw-cursor-pointer tw-border-none tw-bg-background tw-px-4 tw-py-2 tw-text-left !tw-text-main hover:tw-bg-secondary-100 focus:tw-z-50 focus:tw-bg-secondary-100 focus:tw-outline-none focus:tw-ring focus:tw-ring-primary-700 focus:tw-ring-offset-2 active:!tw-ring-0 active:!tw-ring-offset-0"
       (click)="unlinkSso(organization)"
@@ -43,6 +44,7 @@
     </ng-template>
   </ng-container>
   <button
+    type="button"
     class="text-danger tw-block tw-cursor-pointer tw-border-none tw-bg-background tw-px-4 tw-py-2 tw-text-left hover:tw-bg-secondary-100 focus:tw-z-50 focus:tw-bg-secondary-100 focus:tw-outline-none focus:tw-ring focus:tw-ring-primary-700 focus:tw-ring-offset-2 active:!tw-ring-0 active:!tw-ring-offset-0"
     (click)="leave(organization)"
   >
diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.html b/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.html
index 2759ef077d..b26b827274 100644
--- a/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.html
+++ b/apps/web/src/app/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.html
@@ -1,8 +1,7 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <ng-container *ngIf="filters && filters.length">
   <div *ngIf="headerInfo.showHeader" class="filter-heading">
     <button
+      type="button"
       class="toggle-button"
       (click)="toggleCollapse(headerNode.node)"
       [attr.aria-expanded]="!isCollapsed(headerNode.node)"
@@ -16,6 +15,7 @@
       ></i>
     </button>
     <button
+      type="button"
       *ngIf="headerInfo.isSelectable"
       appA11yTitle="{{ (isOrganizationFilter ? 'vault' : 'filter') | i18n }}: {{
         headerNode.node.name | i18n
@@ -36,6 +36,7 @@
     </h3>
 
     <button
+      type="button"
       *ngIf="showAddButton"
       (click)="onAdd()"
       class="text-muted ml-auto add-button"
@@ -59,6 +60,7 @@
       >
         <span class="filter-buttons">
           <button
+            type="button"
             *ngIf="f.children.length"
             appA11yTitle="{{ 'toggleCollapse' | i18n }}: {{ f.node.name }}"
             (click)="toggleCollapse(f.node)"
@@ -76,6 +78,7 @@
             ></i>
           </button>
           <button
+            type="button"
             class="filter-button"
             appA11yTitle="{{ isOrganizationFilter ? 'vault' : ('filter' | i18n) }}: {{
               f.node.name
@@ -92,6 +95,7 @@
           </button>
           <span class="ml-auto">
             <button
+              type="button"
               *ngIf="editInfo && f.node.id"
               class="edit-button"
               (click)="onEdit(f)"
@@ -106,7 +110,7 @@
               appA11yTitle="{{ 'organizationIsDisabled' | i18n }}"
             ></i
             ><ng-container *ngIf="optionsInfo && !f.node.hideOptions"
-              ><button [bitMenuTriggerFor]="optionsMenu" class="filter-options-icon">
+              ><button type="button" [bitMenuTriggerFor]="optionsMenu" class="filter-options-icon">
                 <i class="bwi bwi-ellipsis-v" aria-hidden="true"></i>
               </button>
               <bit-menu class="filter-organization-options" #optionsMenu>
diff --git a/apps/web/src/app/vault/org-vault/vault.component.html b/apps/web/src/app/vault/org-vault/vault.component.html
index 5af1cc31e8..d3109774c2 100644
--- a/apps/web/src/app/vault/org-vault/vault.component.html
+++ b/apps/web/src/app/vault/org-vault/vault.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="container page-content">
   <div class="row">
     <div class="col-3">
diff --git a/apps/web/src/connectors/webauthn-fallback.html b/apps/web/src/connectors/webauthn-fallback.html
index 554f67025f..65d0fb9a3e 100644
--- a/apps/web/src/connectors/webauthn-fallback.html
+++ b/apps/web/src/connectors/webauthn-fallback.html
@@ -1,5 +1,3 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <!DOCTYPE html>
 <html class="theme_light">
   <head>
@@ -30,7 +28,7 @@
               </div>
               <hr />
               <p class="text-center mb-0">
-                <button id="webauthn-button" class="btn btn-primary btn-lg"></button>
+                <button type="button" id="webauthn-button" class="btn btn-primary btn-lg"></button>
               </p>
             </div>
           </div>
diff --git a/apps/web/src/connectors/webauthn-mobile.html b/apps/web/src/connectors/webauthn-mobile.html
index 48776dbf6e..467a364477 100644
--- a/apps/web/src/connectors/webauthn-mobile.html
+++ b/apps/web/src/connectors/webauthn-mobile.html
@@ -1,5 +1,3 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <!DOCTYPE html>
 <html>
   <head>
@@ -24,7 +22,7 @@
           <img src="../images/u2fkey-mobile.jpg" class="rounded img-fluid" />
         </picture>
         <div class="text-center mt-4">
-          <button id="webauthn-button" class="btn btn-primary btn-lg"></button>
+          <button type="button" id="webauthn-button" class="btn btn-primary btn-lg"></button>
         </div>
       </div>
     </div>
diff --git a/apps/web/src/connectors/webauthn.html b/apps/web/src/connectors/webauthn.html
index d2871e2cde..4a489f79f4 100644
--- a/apps/web/src/connectors/webauthn.html
+++ b/apps/web/src/connectors/webauthn.html
@@ -1,5 +1,3 @@
-<!-- Please remove this disable statement when editing this file! -->
-<!-- eslint-disable @angular-eslint/template/button-has-type -->
 <!DOCTYPE html>
 <html>
   <head>
@@ -14,7 +12,7 @@
       <img src="../images/u2fkey.jpg" class="rounded img-fluid mb-3" />
     </picture>
     <div class="text-center">
-      <button id="webauthn-button" class="btn btn-primary"></button>
+      <button type="button" id="webauthn-button" class="btn btn-primary"></button>
     </div>
   </body>
 </html>
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.html
index 27d902b61f..01cbc3c0bc 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/add-organization.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="modal fade" role="dialog" aria-modal="true" aria-labelledby="addTitle">
   <div class="modal-dialog modal-dialog-scrollable" role="document">
     <div class="modal-content">
@@ -32,6 +30,7 @@
               </td>
               <td>
                 <button
+                  type="button"
                   class="btn btn-outline-secondary pull-right"
                   (click)="add(o)"
                   [disabled]="formPromise"
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.html
index 42adaabbd1..59d07f7def 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.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="page-header d-flex">
   <h1>{{ "clients" | i18n }}</h1>
 
@@ -19,6 +17,7 @@
       {{ "newClientOrganization" | i18n }}
     </a>
     <button
+      type="button"
       class="btn btn-sm btn-outline-primary ml-3"
       (click)="addExistingOrganization()"
       *ngIf="manageOrganizations && showAddExisting"
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/people.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/people.component.html
index a25a231e27..00bf5eda26 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/people.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/people.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="page-header d-flex">
   <h1>{{ "people" | i18n }}</h1>
   <div class="ml-auto d-flex">
@@ -55,11 +53,12 @@
         <i class="bwi bwi-cog" aria-hidden="true"></i>
       </button>
       <div class="dropdown-menu dropdown-menu-right" aria-labelledby="bulkActionsButton">
-        <button class="dropdown-item" appStopClick (click)="bulkReinvite()">
+        <button type="button" class="dropdown-item" appStopClick (click)="bulkReinvite()">
           <i class="bwi bwi-fw bwi-envelope" aria-hidden="true"></i>
           {{ "reinviteSelected" | i18n }}
         </button>
         <button
+          type="button"
           class="dropdown-item text-success"
           appStopClick
           (click)="bulkConfirm()"
@@ -68,16 +67,16 @@
           <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
           {{ "confirmSelected" | i18n }}
         </button>
-        <button class="dropdown-item text-danger" appStopClick (click)="bulkRemove()">
+        <button type="button" class="dropdown-item text-danger" appStopClick (click)="bulkRemove()">
           <i class="bwi bwi-fw bwi-close" aria-hidden="true"></i>
           {{ "remove" | i18n }}
         </button>
         <div class="dropdown-divider"></div>
-        <button class="dropdown-item" appStopClick (click)="selectAll(true)">
+        <button type="button" class="dropdown-item" appStopClick (click)="selectAll(true)">
           <i class="bwi bwi-fw bwi-check-square" aria-hidden="true"></i>
           {{ "selectAll" | i18n }}
         </button>
-        <button class="dropdown-item" appStopClick (click)="selectAll(false)">
+        <button type="button" class="dropdown-item" appStopClick (click)="selectAll(false)">
           <i class="bwi bwi-fw bwi-minus-square" aria-hidden="true"></i>
           {{ "unselectAll" | i18n }}
         </button>