diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.html
index 3cb3f92beb2..8ac29de3b72 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.html
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.html
@@ -26,36 +26,40 @@
 <div class="tw-mt-4 tw-flex tw-flex-col" *ngIf="!(isLoading$ | async) && dataSource.data.length">
   <h2 class="tw-mb-6" bitTypography="h2">{{ "allApplications" | i18n }}</h2>
   <div class="tw-flex tw-gap-6">
-    <dirt-card
-      #allAppsOrgAtRiskMembers
-      class="tw-flex-1 tw-cursor-pointer"
-      [ngClass]="{ 'tw-bg-primary-100': dataService.drawerInvokerId === 'allAppsOrgAtRiskMembers' }"
-      [title]="'atRiskMembers' | i18n"
-      [value]="applicationSummary.totalAtRiskMemberCount"
-      [maxValue]="applicationSummary.totalMemberCount"
-      [tabindex]="0"
-      role="button"
+    <button
+      type="button"
+      class="tw-flex-1"
       (click)="showOrgAtRiskMembers('allAppsOrgAtRiskMembers')"
-      (keydown.enter)="showOrgAtRiskMembers('allAppsOrgAtRiskMembers')"
-      (keydown.space)="showOrgAtRiskMembers('allAppsOrgAtRiskMembers'); $event.preventDefault()"
     >
-    </dirt-card>
-    <dirt-card
-      #allAppsOrgAtRiskApplications
-      class="tw-flex-1 tw-cursor-pointer"
-      [ngClass]="{
-        'tw-bg-primary-100': dataService.drawerInvokerId === 'allAppsOrgAtRiskApplications',
-      }"
-      [title]="'atRiskApplications' | i18n"
-      [value]="applicationSummary.totalAtRiskApplicationCount"
-      [maxValue]="applicationSummary.totalApplicationCount"
-      [tabindex]="0"
-      role="button"
+      <dirt-card
+        #allAppsOrgAtRiskMembers
+        class="tw-w-full"
+        [ngClass]="{
+          'tw-bg-primary-100': dataService.drawerInvokerId === 'allAppsOrgAtRiskMembers',
+        }"
+        [title]="'atRiskMembers' | i18n"
+        [value]="applicationSummary.totalAtRiskMemberCount"
+        [maxValue]="applicationSummary.totalMemberCount"
+      >
+      </dirt-card>
+    </button>
+    <button
+      type="button"
+      class="tw-flex-1"
       (click)="showOrgAtRiskApps('allAppsOrgAtRiskApplications')"
-      (keydown.enter)="showOrgAtRiskApps('allAppsOrgAtRiskApplications')"
-      (keydown.space)="showOrgAtRiskApps('allAppsOrgAtRiskApplications'); $event.preventDefault()"
     >
-    </dirt-card>
+      <dirt-card
+        #allAppsOrgAtRiskApplications
+        class="tw-w-full"
+        [ngClass]="{
+          'tw-bg-primary-100': dataService.drawerInvokerId === 'allAppsOrgAtRiskApplications',
+        }"
+        [title]="'atRiskApplications' | i18n"
+        [value]="applicationSummary.totalAtRiskApplicationCount"
+        [maxValue]="applicationSummary.totalApplicationCount"
+      >
+      </dirt-card>
+    </button>
   </div>
   <div class="tw-flex tw-mt-8 tw-mb-4 tw-gap-4">
     <bit-search
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.html
index 50f74518ad9..47142d47ce4 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.html
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.html
@@ -44,38 +44,40 @@
     </button>
   </div>
   <div class="tw-flex tw-gap-6">
-    <dirt-card
-      #criticalAppsAtRiskMembers
-      class="tw-flex-1 tw-cursor-pointer"
-      [ngClass]="{
-        'tw-bg-primary-100': dataService.drawerInvokerId === 'criticalAppsAtRiskMembers',
-      }"
-      [title]="'atRiskMembers' | i18n"
-      [value]="applicationSummary.totalAtRiskMemberCount"
-      [maxValue]="applicationSummary.totalMemberCount"
-      [tabindex]="0"
-      role="button"
+    <button
+      type="button"
+      class="tw-flex-1"
       (click)="showOrgAtRiskMembers('criticalAppsAtRiskMembers')"
-      (keydown.enter)="showOrgAtRiskMembers('criticalAppsAtRiskMembers')"
-      (keydown.space)="showOrgAtRiskMembers('criticalAppsAtRiskMembers'); $event.preventDefault()"
     >
-    </dirt-card>
-    <dirt-card
-      #criticalAppsAtRiskApplications
-      class="tw-flex-1 tw-cursor-pointer"
-      [ngClass]="{
-        'tw-bg-primary-100': dataService.drawerInvokerId === 'criticalAppsAtRiskApplications',
-      }"
-      [title]="'atRiskApplications' | i18n"
-      [value]="applicationSummary.totalAtRiskApplicationCount"
-      [maxValue]="applicationSummary.totalApplicationCount"
-      [tabindex]="0"
-      role="button"
+      <dirt-card
+        #criticalAppsAtRiskMembers
+        class="tw-w-full"
+        [ngClass]="{
+          'tw-bg-primary-100': dataService.drawerInvokerId === 'criticalAppsAtRiskMembers',
+        }"
+        [title]="'atRiskMembers' | i18n"
+        [value]="applicationSummary.totalAtRiskMemberCount"
+        [maxValue]="applicationSummary.totalMemberCount"
+      >
+      </dirt-card>
+    </button>
+    <button
+      type="button"
+      class="tw-flex-1"
       (click)="showOrgAtRiskApps('criticalAppsAtRiskApplications')"
-      (keydown.enter)="showOrgAtRiskApps('criticalAppsAtRiskApplications')"
-      (keydown.space)="showOrgAtRiskApps('criticalAppsAtRiskApplications'); $event.preventDefault()"
     >
-    </dirt-card>
+      <dirt-card
+        #criticalAppsAtRiskApplications
+        class="tw-w-full"
+        [ngClass]="{
+          'tw-bg-primary-100': dataService.drawerInvokerId === 'criticalAppsAtRiskApplications',
+        }"
+        [title]="'atRiskApplications' | i18n"
+        [value]="applicationSummary.totalAtRiskApplicationCount"
+        [maxValue]="applicationSummary.totalApplicationCount"
+      >
+      </dirt-card>
+    </button>
   </div>
   <div class="tw-flex tw-mt-8 tw-mb-4 tw-gap-4">
     <bit-search