From 40be0f37c7a93f1e088034cc5950ee3ad5f29283 Mon Sep 17 00:00:00 2001
From: Juho Heikka <juho.heikka@gmail.com>
Date: Fri, 12 Aug 2022 11:24:31 +0300
Subject: [PATCH] Support for data-telemetry-title for custom title

Signed-off-by: Juho Heikka <juho.heikka@gmail.com>
---
 .../src/metrics-settings.tsx                  |   2 +-
 ...ation-using-application-menu.test.tsx.snap |   2 -
 ...e-since-update-was-downloaded.test.ts.snap |   1 -
 .../order-of-sidebar-items.test.tsx.snap      |   2 +
 ...-and-tab-navigation-for-core.test.tsx.snap |   5 +
 ...ab-navigation-for-extensions.test.tsx.snap |  11 +
 .../visibility-of-sidebar-items.test.tsx.snap |   2 +
 ...when-cluster-is-not-relevant.test.tsx.snap |   2 +
 ...when-cluster-is-not-relevant.test.tsx.snap |   3 +
 .../edit-namespace-from-new-tab.test.tsx.snap |  80 +----
 ...e-from-previously-opened-tab.test.tsx.snap |   2 +
 ...when-cluster-is-not-relevant.test.tsx.snap |   3 +
 ...gation-using-application-menu.test.ts.snap |   1 -
 ...elm-repository-in-preferences.test.ts.snap |  52 +--
 ...tory-from-list-in-preferences.test.ts.snap |  30 +-
 ...m-repositories-in-preferences.test.ts.snap |  20 +-
 ...ive-repository-in-preferences.test.ts.snap |  12 +-
 ...lling-helm-chart-from-new-tab.test.ts.snap | 314 +++++++++++++++++-
 ...rt-from-previously-opened-tab.test.ts.snap |   2 +
 ...tab-for-installing-helm-chart.test.ts.snap | 118 ++++++-
 ...installing-helm-chart-from-new-tab.test.ts |  11 +-
 ...wing-details-for-helm-release.test.ts.snap | 236 ++++++++++++-
 ...ion-to-kubernetes-preferences.test.ts.snap |   3 +-
 ...-of-custom-helm-repository-open-button.tsx |   1 +
 .../avatar/__tests__/avatar.test.tsx          |  13 +-
 src/renderer/components/avatar/avatar.tsx     |   7 +-
 src/renderer/components/button/button.tsx     |  43 ++-
 src/renderer/components/dock/info-panel.tsx   |   8 +-
 .../components/item-object-list/content.tsx   |   8 +-
 .../kube-object-menu.test.tsx.snap            |   8 -
 .../components/layout/tab-layout-2.tsx        |   1 +
 .../__snapshots__/foo-bar.test.tsx.snap       |  11 -
 .../on-click-decorated.test.tsx.snap          |   2 +-
 .../on-click-decorated.test.tsx               |   2 +-
 .../on-click-decorated/on-click-decorated.tsx |  13 +-
 ...on-click-telemetry-decorator.injectable.ts |   5 +-
 src/renderer/components/table/table-cell.tsx  |  10 +-
 src/renderer/components/tabs/tabs.tsx         |   6 +-
 .../__snapshots__/cluster-frame.test.tsx.snap |   1 +
 39 files changed, 821 insertions(+), 232 deletions(-)
 delete mode 100644 src/renderer/components/on-click-decorated/__snapshots__/foo-bar.test.tsx.snap

diff --git a/extensions/metrics-cluster-feature/src/metrics-settings.tsx b/extensions/metrics-cluster-feature/src/metrics-settings.tsx
index b3052fbf37..3f20a80df1 100644
--- a/extensions/metrics-cluster-feature/src/metrics-settings.tsx
+++ b/extensions/metrics-cluster-feature/src/metrics-settings.tsx
@@ -262,7 +262,7 @@ export class MetricsSettings extends React.Component<MetricsSettingsProps> {
         </section>
 
         <section>
-          <OpenLensButton
+          <Button
             label={this.buttonLabel}
             waiting={this.inProgress}
             onClick={() => this.save()}
diff --git a/src/behaviours/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap b/src/behaviours/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap
index 991a77480a..51a8e4cf27 100644
--- a/src/behaviours/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap
+++ b/src/behaviours/add-cluster/__snapshots__/navigation-using-application-menu.test.tsx.snap
@@ -299,11 +299,9 @@ exports[`add-cluster - navigation using application menu when navigating to add
               <button
                 class="Button primary"
                 disabled=""
-                type="button"
               >
                 Add clusters
               </button>
-              <div />
             </div>
           </div>
           <div
diff --git a/src/behaviours/application-update/__snapshots__/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts.snap b/src/behaviours/application-update/__snapshots__/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts.snap
index e6856ccc51..c716ca000d 100644
--- a/src/behaviours/application-update/__snapshots__/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts.snap
+++ b/src/behaviours/application-update/__snapshots__/force-user-to-update-when-too-long-time-since-update-was-downloaded.test.ts.snap
@@ -468,7 +468,6 @@ exports[`force user to update when too long since update was downloaded when app
           <button
             class="Button primary"
             data-testid="update-now-from-must-update-immediately-modal"
-            type="button"
           >
             Update
              
diff --git a/src/behaviours/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap b/src/behaviours/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap
index 3dccc2e925..2004b8b189 100644
--- a/src/behaviours/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap
+++ b/src/behaviours/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap
@@ -336,6 +336,7 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = `
           <div
             class="Tab flex gaps align-center active"
             data-is-active-test="true"
+            data-telemetry-title="Tab Overview"
             data-testid="tab-link-for-overview"
             role="tab"
             tabindex="0"
@@ -973,6 +974,7 @@ exports[`cluster - order of sidebar items when rendered when parent is expanded
           <div
             class="Tab flex gaps align-center active"
             data-is-active-test="true"
+            data-telemetry-title="Tab Overview"
             data-testid="tab-link-for-overview"
             role="tab"
             tabindex="0"
diff --git a/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-core.test.tsx.snap b/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-core.test.tsx.snap
index 8928a59b25..f223cb76a7 100644
--- a/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-core.test.tsx.snap
+++ b/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-core.test.tsx.snap
@@ -305,6 +305,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
           <div
             class="Tab flex gaps align-center active"
             data-is-active-test="true"
+            data-telemetry-title="Tab Overview"
             data-testid="tab-link-for-overview"
             role="tab"
             tabindex="0"
@@ -853,6 +854,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
           <div
             class="Tab flex gaps align-center active"
             data-is-active-test="true"
+            data-telemetry-title="Tab Overview"
             data-testid="tab-link-for-overview"
             role="tab"
             tabindex="0"
@@ -1423,6 +1425,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
           <div
             class="Tab flex gaps align-center active"
             data-is-active-test="true"
+            data-telemetry-title="Tab Overview"
             data-testid="tab-link-for-overview"
             role="tab"
             tabindex="0"
@@ -2872,6 +2875,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
           <div
             class="Tab flex gaps align-center active"
             data-is-active-test="true"
+            data-telemetry-title="Tab Overview"
             data-testid="tab-link-for-overview"
             role="tab"
             tabindex="0"
@@ -3420,6 +3424,7 @@ exports[`cluster - sidebar and tab navigation for core given core registrations
           <div
             class="Tab flex gaps align-center active"
             data-is-active-test="true"
+            data-telemetry-title="Tab Overview"
             data-testid="tab-link-for-overview"
             role="tab"
             tabindex="0"
diff --git a/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap b/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap
index b9cc0addaf..2b73fef3ea 100644
--- a/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap
+++ b/src/behaviours/cluster/__snapshots__/sidebar-and-tab-navigation-for-extensions.test.tsx.snap
@@ -305,6 +305,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
           <div
             class="Tab flex gaps align-center active"
             data-is-active-test="true"
+            data-telemetry-title="Tab Overview"
             data-testid="tab-link-for-overview"
             role="tab"
             tabindex="0"
@@ -853,6 +854,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
           <div
             class="Tab flex gaps align-center active"
             data-is-active-test="true"
+            data-telemetry-title="Tab Overview"
             data-testid="tab-link-for-overview"
             role="tab"
             tabindex="0"
@@ -1441,6 +1443,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
           <div
             class="Tab flex gaps align-center active"
             data-is-active-test="true"
+            data-telemetry-title="Tab Overview"
             data-testid="tab-link-for-overview"
             role="tab"
             tabindex="0"
@@ -2030,6 +2033,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
           <div
             class="Tab flex gaps align-center active"
             data-is-active-test="true"
+            data-telemetry-title="Tab Child 1"
             data-testid="tab-link-for-some-extension-name-some-child-id"
             role="tab"
             tabindex="0"
@@ -2043,6 +2047,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
           <div
             class="Tab flex gaps align-center"
             data-is-active-test="false"
+            data-telemetry-title="Tab Child 2"
             data-testid="tab-link-for-some-extension-name-some-other-child-id"
             role="tab"
             tabindex="0"
@@ -2538,6 +2543,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
           <div
             class="Tab flex gaps align-center"
             data-is-active-test="false"
+            data-telemetry-title="Tab Child 1"
             data-testid="tab-link-for-some-extension-name-some-child-id"
             role="tab"
             tabindex="0"
@@ -2551,6 +2557,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
           <div
             class="Tab flex gaps align-center active"
             data-is-active-test="true"
+            data-telemetry-title="Tab Child 2"
             data-testid="tab-link-for-some-extension-name-some-other-child-id"
             role="tab"
             tabindex="0"
@@ -3005,6 +3012,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
           <div
             class="Tab flex gaps align-center active"
             data-is-active-test="true"
+            data-telemetry-title="Tab Child 1"
             data-testid="tab-link-for-some-extension-name-some-child-id"
             role="tab"
             tabindex="0"
@@ -3018,6 +3026,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
           <div
             class="Tab flex gaps align-center"
             data-is-active-test="false"
+            data-telemetry-title="Tab Child 2"
             data-testid="tab-link-for-some-extension-name-some-other-child-id"
             role="tab"
             tabindex="0"
@@ -3512,6 +3521,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
           <div
             class="Tab flex gaps align-center active"
             data-is-active-test="true"
+            data-telemetry-title="Tab Overview"
             data-testid="tab-link-for-overview"
             role="tab"
             tabindex="0"
@@ -4060,6 +4070,7 @@ exports[`cluster - sidebar and tab navigation for extensions given extension wit
           <div
             class="Tab flex gaps align-center active"
             data-is-active-test="true"
+            data-telemetry-title="Tab Overview"
             data-testid="tab-link-for-overview"
             role="tab"
             tabindex="0"
diff --git a/src/behaviours/cluster/__snapshots__/visibility-of-sidebar-items.test.tsx.snap b/src/behaviours/cluster/__snapshots__/visibility-of-sidebar-items.test.tsx.snap
index bba303f5b7..d6d4112949 100644
--- a/src/behaviours/cluster/__snapshots__/visibility-of-sidebar-items.test.tsx.snap
+++ b/src/behaviours/cluster/__snapshots__/visibility-of-sidebar-items.test.tsx.snap
@@ -275,6 +275,7 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
           <div
             class="Tab flex gaps align-center active"
             data-is-active-test="true"
+            data-telemetry-title="Tab Overview"
             data-testid="tab-link-for-overview"
             role="tab"
             tabindex="0"
@@ -837,6 +838,7 @@ exports[`cluster - visibility of sidebar items given kube resource for route is
           <div
             class="Tab flex gaps align-center active"
             data-is-active-test="true"
+            data-telemetry-title="Tab Overview"
             data-testid="tab-link-for-overview"
             role="tab"
             tabindex="0"
diff --git a/src/behaviours/cluster/extension-api/__snapshots__/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx.snap b/src/behaviours/cluster/extension-api/__snapshots__/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx.snap
index 1ec0fb09cb..724ee451c7 100644
--- a/src/behaviours/cluster/extension-api/__snapshots__/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx.snap
+++ b/src/behaviours/cluster/extension-api/__snapshots__/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx.snap
@@ -677,6 +677,7 @@ exports[`disable-cluster-pages-when-cluster-is-not-relevant given extension shou
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Overview"
               data-testid="tab-link-for-overview"
               role="tab"
               tabindex="0"
@@ -1197,6 +1198,7 @@ exports[`disable-cluster-pages-when-cluster-is-not-relevant given not yet known
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Overview"
               data-testid="tab-link-for-overview"
               role="tab"
               tabindex="0"
diff --git a/src/behaviours/cluster/extension-api/__snapshots__/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx.snap b/src/behaviours/cluster/extension-api/__snapshots__/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx.snap
index 2a7214e3cd..c7c9f7896e 100644
--- a/src/behaviours/cluster/extension-api/__snapshots__/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx.snap
+++ b/src/behaviours/cluster/extension-api/__snapshots__/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx.snap
@@ -296,6 +296,7 @@ exports[`disable sidebar items when cluster is not relevant given extension shou
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Overview"
               data-testid="tab-link-for-overview"
               role="tab"
               tabindex="0"
@@ -816,6 +817,7 @@ exports[`disable sidebar items when cluster is not relevant given extension shou
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Overview"
               data-testid="tab-link-for-overview"
               role="tab"
               tabindex="0"
@@ -1336,6 +1338,7 @@ exports[`disable sidebar items when cluster is not relevant given not yet known
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Overview"
               data-testid="tab-link-for-overview"
               role="tab"
               tabindex="0"
diff --git a/src/behaviours/cluster/namespaces/__snapshots__/edit-namespace-from-new-tab.test.tsx.snap b/src/behaviours/cluster/namespaces/__snapshots__/edit-namespace-from-new-tab.test.tsx.snap
index 3d062ac38e..bab09f9518 100644
--- a/src/behaviours/cluster/namespaces/__snapshots__/edit-namespace-from-new-tab.test.tsx.snap
+++ b/src/behaviours/cluster/namespaces/__snapshots__/edit-namespace-from-new-tab.test.tsx.snap
@@ -489,7 +489,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                 >
                   <button
                     class="Button add-button primary big round"
-                    type="button"
+                    tooltip="Add Namespace"
                   >
                     <i
                       class="Icon material focusable"
@@ -502,9 +502,6 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       </span>
                     </i>
                   </button>
-                  <div>
-                    Add Namespace
-                  </div>
                 </div>
               </div>
             </div>
@@ -1140,7 +1137,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                 >
                   <button
                     class="Button add-button primary big round"
-                    type="button"
+                    tooltip="Add Namespace"
                   >
                     <i
                       class="Icon material focusable"
@@ -1153,9 +1150,6 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       </span>
                     </i>
                   </button>
-                  <div>
-                    Add Namespace
-                  </div>
                 </div>
               </div>
             </div>
@@ -1796,7 +1790,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                 >
                   <button
                     class="Button add-button primary big round"
-                    type="button"
+                    tooltip="Add Namespace"
                   >
                     <i
                       class="Icon material focusable"
@@ -1809,9 +1803,6 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       </span>
                     </i>
                   </button>
-                  <div>
-                    Add Namespace
-                  </div>
                 </div>
               </div>
             </div>
@@ -2521,7 +2512,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                 >
                   <button
                     class="Button add-button primary big round"
-                    type="button"
+                    tooltip="Add Namespace"
                   >
                     <i
                       class="Icon material focusable"
@@ -2534,9 +2525,6 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       </span>
                     </i>
                   </button>
-                  <div>
-                    Add Namespace
-                  </div>
                 </div>
               </div>
             </div>
@@ -3221,7 +3209,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                 >
                   <button
                     class="Button add-button primary big round"
-                    type="button"
+                    tooltip="Add Namespace"
                   >
                     <i
                       class="Icon material focusable"
@@ -3234,9 +3222,6 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       </span>
                     </i>
                   </button>
-                  <div>
-                    Add Namespace
-                  </div>
                 </div>
               </div>
             </div>
@@ -3993,7 +3978,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                 >
                   <button
                     class="Button add-button primary big round"
-                    type="button"
+                    tooltip="Add Namespace"
                   >
                     <i
                       class="Icon material focusable"
@@ -4006,9 +3991,6 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       </span>
                     </i>
                   </button>
-                  <div>
-                    Add Namespace
-                  </div>
                 </div>
               </div>
             </div>
@@ -4767,7 +4749,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                 >
                   <button
                     class="Button add-button primary big round"
-                    type="button"
+                    tooltip="Add Namespace"
                   >
                     <i
                       class="Icon material focusable"
@@ -4780,9 +4762,6 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       </span>
                     </i>
                   </button>
-                  <div>
-                    Add Namespace
-                  </div>
                 </div>
               </div>
             </div>
@@ -5506,7 +5485,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                 >
                   <button
                     class="Button add-button primary big round"
-                    type="button"
+                    tooltip="Add Namespace"
                   >
                     <i
                       class="Icon material focusable"
@@ -5519,9 +5498,6 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       </span>
                     </i>
                   </button>
-                  <div>
-                    Add Namespace
-                  </div>
                 </div>
               </div>
             </div>
@@ -6240,7 +6216,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                 >
                   <button
                     class="Button add-button primary big round"
-                    type="button"
+                    tooltip="Add Namespace"
                   >
                     <i
                       class="Icon material focusable"
@@ -6253,9 +6229,6 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       </span>
                     </i>
                   </button>
-                  <div>
-                    Add Namespace
-                  </div>
                 </div>
               </div>
             </div>
@@ -6965,7 +6938,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                 >
                   <button
                     class="Button add-button primary big round"
-                    type="button"
+                    tooltip="Add Namespace"
                   >
                     <i
                       class="Icon material focusable"
@@ -6978,9 +6951,6 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       </span>
                     </i>
                   </button>
-                  <div>
-                    Add Namespace
-                  </div>
                 </div>
               </div>
             </div>
@@ -7690,7 +7660,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                 >
                   <button
                     class="Button add-button primary big round"
-                    type="button"
+                    tooltip="Add Namespace"
                   >
                     <i
                       class="Icon material focusable"
@@ -7703,9 +7673,6 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       </span>
                     </i>
                   </button>
-                  <div>
-                    Add Namespace
-                  </div>
                 </div>
               </div>
             </div>
@@ -8415,7 +8382,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                 >
                   <button
                     class="Button add-button primary big round"
-                    type="button"
+                    tooltip="Add Namespace"
                   >
                     <i
                       class="Icon material focusable"
@@ -8428,9 +8395,6 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       </span>
                     </i>
                   </button>
-                  <div>
-                    Add Namespace
-                  </div>
                 </div>
               </div>
             </div>
@@ -8978,7 +8942,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                 >
                   <button
                     class="Button add-button primary big round"
-                    type="button"
+                    tooltip="Add Namespace"
                   >
                     <i
                       class="Icon material focusable"
@@ -8991,9 +8955,6 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       </span>
                     </i>
                   </button>
-                  <div>
-                    Add Namespace
-                  </div>
                 </div>
               </div>
             </div>
@@ -9712,7 +9673,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                 >
                   <button
                     class="Button add-button primary big round"
-                    type="button"
+                    tooltip="Add Namespace"
                   >
                     <i
                       class="Icon material focusable"
@@ -9725,9 +9686,6 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       </span>
                     </i>
                   </button>
-                  <div>
-                    Add Namespace
-                  </div>
                 </div>
               </div>
             </div>
@@ -10275,7 +10233,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                 >
                   <button
                     class="Button add-button primary big round"
-                    type="button"
+                    tooltip="Add Namespace"
                   >
                     <i
                       class="Icon material focusable"
@@ -10288,9 +10246,6 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       </span>
                     </i>
                   </button>
-                  <div>
-                    Add Namespace
-                  </div>
                 </div>
               </div>
             </div>
@@ -10838,7 +10793,7 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                 >
                   <button
                     class="Button add-button primary big round"
-                    type="button"
+                    tooltip="Add Namespace"
                   >
                     <i
                       class="Icon material focusable"
@@ -10851,9 +10806,6 @@ exports[`cluster/namespaces - edit namespace from new tab when navigating to nam
                       </span>
                     </i>
                   </button>
-                  <div>
-                    Add Namespace
-                  </div>
                 </div>
               </div>
             </div>
diff --git a/src/behaviours/cluster/namespaces/__snapshots__/edit-namespace-from-previously-opened-tab.test.tsx.snap b/src/behaviours/cluster/namespaces/__snapshots__/edit-namespace-from-previously-opened-tab.test.tsx.snap
index 8f1ae0f34e..4c779aad46 100644
--- a/src/behaviours/cluster/namespaces/__snapshots__/edit-namespace-from-previously-opened-tab.test.tsx.snap
+++ b/src/behaviours/cluster/namespaces/__snapshots__/edit-namespace-from-previously-opened-tab.test.tsx.snap
@@ -303,6 +303,7 @@ exports[`cluster/namespaces - edit namespaces from previously opened tab given t
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Overview"
               data-testid="tab-link-for-overview"
               role="tab"
               tabindex="0"
@@ -860,6 +861,7 @@ exports[`cluster/namespaces - edit namespaces from previously opened tab given t
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Overview"
               data-testid="tab-link-for-overview"
               role="tab"
               tabindex="0"
diff --git a/src/behaviours/cluster/workloads/overview/extension-api/__snapshots__/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx.snap b/src/behaviours/cluster/workloads/overview/extension-api/__snapshots__/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx.snap
index 5040538e31..91d6767143 100644
--- a/src/behaviours/cluster/workloads/overview/extension-api/__snapshots__/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx.snap
+++ b/src/behaviours/cluster/workloads/overview/extension-api/__snapshots__/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx.snap
@@ -276,6 +276,7 @@ exports[`disable workloads overview details when cluster is not relevant given e
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Overview"
               data-testid="tab-link-for-overview"
               role="tab"
               tabindex="0"
@@ -801,6 +802,7 @@ exports[`disable workloads overview details when cluster is not relevant given e
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Overview"
               data-testid="tab-link-for-overview"
               role="tab"
               tabindex="0"
@@ -1321,6 +1323,7 @@ exports[`disable workloads overview details when cluster is not relevant given n
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Overview"
               data-testid="tab-link-for-overview"
               role="tab"
               tabindex="0"
diff --git a/src/behaviours/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap b/src/behaviours/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap
index c3d9431eb2..0a2f44242f 100644
--- a/src/behaviours/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap
+++ b/src/behaviours/extensions/__snapshots__/navigation-using-application-menu.test.ts.snap
@@ -306,7 +306,6 @@ exports[`extensions - navigation using application menu when navigating to exten
                   <div>
                     <button
                       class="Button button primary"
-                      type="button"
                     >
                       Install
                     </button>
diff --git a/src/behaviours/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
index 8f83091fcc..e080580268 100644
--- a/src/behaviours/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
+++ b/src/behaviours/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
@@ -328,7 +328,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -454,8 +453,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -906,7 +905,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -1017,8 +1015,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -1495,7 +1493,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -1606,8 +1603,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -1823,7 +1820,6 @@ exports[`add custom helm repository in preferences when navigating to preference
               <button
                 class="Button accordion plain"
                 data-testid="toggle-maximal-options-for-custom-helm-repository-button"
-                type="button"
               >
                 More
                 <i
@@ -1848,7 +1844,6 @@ exports[`add custom helm repository in preferences when navigating to preference
             <button
               class="Button back-btn plain"
               data-testid="custom-helm-repository-cancel-button"
-              type="button"
             >
               Cancel
             </button>
@@ -2195,7 +2190,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -2306,8 +2300,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -2792,7 +2786,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -2903,8 +2896,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -3120,7 +3113,6 @@ exports[`add custom helm repository in preferences when navigating to preference
               <button
                 class="Button accordion plain"
                 data-testid="toggle-maximal-options-for-custom-helm-repository-button"
-                type="button"
               >
                 More
                 <i
@@ -3145,7 +3137,6 @@ exports[`add custom helm repository in preferences when navigating to preference
             <button
               class="Button back-btn plain"
               data-testid="custom-helm-repository-cancel-button"
-              type="button"
             >
               Cancel
             </button>
@@ -3492,7 +3483,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -3603,8 +3593,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -3820,7 +3810,6 @@ exports[`add custom helm repository in preferences when navigating to preference
               <button
                 class="Button accordion plain"
                 data-testid="toggle-maximal-options-for-custom-helm-repository-button"
-                type="button"
               >
                 More
                 <i
@@ -4027,7 +4016,6 @@ exports[`add custom helm repository in preferences when navigating to preference
             <button
               class="Button back-btn plain"
               data-testid="custom-helm-repository-cancel-button"
-              type="button"
             >
               Cancel
             </button>
@@ -4374,7 +4362,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -4485,8 +4472,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -4702,7 +4689,6 @@ exports[`add custom helm repository in preferences when navigating to preference
               <button
                 class="Button accordion plain"
                 data-testid="toggle-maximal-options-for-custom-helm-repository-button"
-                type="button"
               >
                 More
                 <i
@@ -4727,7 +4713,6 @@ exports[`add custom helm repository in preferences when navigating to preference
             <button
               class="Button back-btn plain"
               data-testid="custom-helm-repository-cancel-button"
-              type="button"
             >
               Cancel
             </button>
@@ -5074,7 +5059,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -5185,8 +5169,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -5402,7 +5386,6 @@ exports[`add custom helm repository in preferences when navigating to preference
               <button
                 class="Button accordion plain"
                 data-testid="toggle-maximal-options-for-custom-helm-repository-button"
-                type="button"
               >
                 More
                 <i
@@ -5609,12 +5592,11 @@ exports[`add custom helm repository in preferences when navigating to preference
             <button
               class="Button back-btn plain"
               data-testid="custom-helm-repository-cancel-button"
-              type="button"
             >
               Cancel
             </button>
             <button
-              class="Button primary"
+              class="Button waiting primary"
               data-testid="custom-helm-repository-submit-button"
               type="submit"
             >
@@ -5956,7 +5938,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -6067,8 +6048,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -6284,7 +6265,6 @@ exports[`add custom helm repository in preferences when navigating to preference
               <button
                 class="Button accordion plain"
                 data-testid="toggle-maximal-options-for-custom-helm-repository-button"
-                type="button"
               >
                 More
                 <i
@@ -6309,7 +6289,6 @@ exports[`add custom helm repository in preferences when navigating to preference
             <button
               class="Button back-btn plain"
               data-testid="custom-helm-repository-cancel-button"
-              type="button"
             >
               Cancel
             </button>
@@ -6656,7 +6635,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -6767,8 +6745,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -7253,7 +7231,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -7379,8 +7356,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -7839,7 +7816,6 @@ exports[`add custom helm repository in preferences when navigating to preference
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -7965,8 +7941,8 @@ exports[`add custom helm repository in preferences when navigating to preference
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -8156,7 +8132,6 @@ exports[`add custom helm repository in preferences when navigating to preference
               <button
                 class="Button accordion plain"
                 data-testid="toggle-maximal-options-for-custom-helm-repository-button"
-                type="button"
               >
                 More
                 <i
@@ -8181,7 +8156,6 @@ exports[`add custom helm repository in preferences when navigating to preference
             <button
               class="Button back-btn plain"
               data-testid="custom-helm-repository-cancel-button"
-              type="button"
             >
               Cancel
             </button>
diff --git a/src/behaviours/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
index 193511c896..0711729c24 100644
--- a/src/behaviours/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
+++ b/src/behaviours/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
@@ -328,7 +328,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -454,8 +453,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -906,7 +905,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -1017,8 +1015,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -1495,7 +1493,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -1608,8 +1605,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -2137,7 +2134,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -2248,8 +2244,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -2726,7 +2722,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -2837,8 +2832,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -3315,7 +3310,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -3441,8 +3435,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -3893,7 +3887,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -4004,8 +3997,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -4516,7 +4509,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -4629,8 +4621,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -5202,7 +5194,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -5313,8 +5304,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -5825,7 +5816,6 @@ exports[`add helm repository from list in preferences when navigating to prefere
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -5951,8 +5941,8 @@ exports[`add helm repository from list in preferences when navigating to prefere
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
diff --git a/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
index 146fb371aa..b289b9555a 100644
--- a/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
+++ b/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
@@ -328,7 +328,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -454,8 +453,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -906,7 +905,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -1032,8 +1030,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -1484,7 +1482,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -1954,7 +1951,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -2080,8 +2076,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -2532,7 +2528,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -3002,7 +2997,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -3128,8 +3122,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -3580,7 +3574,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -3691,8 +3684,8 @@ exports[`listing active helm repositories in preferences when navigating to pref
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -4203,7 +4196,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -4673,7 +4665,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -5143,7 +5134,6 @@ exports[`listing active helm repositories in preferences when navigating to pref
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
diff --git a/src/behaviours/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
index 2cb3b4e60d..0b18a57485 100644
--- a/src/behaviours/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
+++ b/src/behaviours/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
@@ -328,7 +328,6 @@ exports[`remove helm repository from list of active repositories in preferences
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -454,8 +453,8 @@ exports[`remove helm repository from list of active repositories in preferences
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -906,7 +905,6 @@ exports[`remove helm repository from list of active repositories in preferences
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -1017,8 +1015,8 @@ exports[`remove helm repository from list of active repositories in preferences
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -1495,7 +1493,6 @@ exports[`remove helm repository from list of active repositories in preferences
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -1606,8 +1603,8 @@ exports[`remove helm repository from list of active repositories in preferences
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
@@ -2084,7 +2081,6 @@ exports[`remove helm repository from list of active repositories in preferences
                   >
                     <button
                       class="Button PathPicker primary"
-                      type="button"
                     >
                       Sync Files and Folders
                     </button>
@@ -2210,8 +2206,8 @@ exports[`remove helm repository from list of active repositories in preferences
                         </div>
                         <button
                           class="Button primary"
+                          data-telemetry-title="Add Custom Helm Repo Custom Title"
                           data-testid="add-custom-helm-repo-button"
-                          type="button"
                         >
                           Add Custom Helm Repo
                         </button>
diff --git a/src/behaviours/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap b/src/behaviours/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap
index 2a9f1f3ed8..f84ca00921 100644
--- a/src/behaviours/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap
+++ b/src/behaviours/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap
@@ -276,6 +276,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -289,6 +290,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -467,6 +469,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -511,29 +514,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -546,6 +555,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -590,29 +600,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -782,7 +798,6 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                 <button
                   class="Button primary"
                   data-testid="install-chart-for-some-repository-some-name"
-                  type="button"
                 >
                   Install
                 </button>
@@ -1203,6 +1218,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -1216,6 +1232,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -1394,6 +1411,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -1438,29 +1456,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -1473,6 +1497,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -1517,29 +1542,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -1972,6 +2003,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -1985,6 +2017,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -2163,6 +2196,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -2207,29 +2241,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -2242,6 +2282,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -2286,29 +2327,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -2985,6 +3032,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -2998,6 +3046,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -3176,6 +3225,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -3220,29 +3270,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -3255,6 +3311,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -3299,29 +3356,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -3972,6 +4035,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -3985,6 +4049,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -4163,6 +4228,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -4207,29 +4273,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -4242,6 +4314,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -4286,29 +4359,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -4954,6 +5033,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -4967,6 +5047,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -5145,6 +5226,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -5189,29 +5271,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -5224,6 +5312,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -5268,29 +5357,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -5936,6 +6031,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -5949,6 +6045,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -6127,6 +6224,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -6171,29 +6269,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -6206,6 +6310,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -6250,29 +6355,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -6940,6 +7051,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -6953,6 +7065,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -7131,6 +7244,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -7175,29 +7289,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -7210,6 +7330,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -7254,29 +7375,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -7953,6 +8080,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -7966,6 +8094,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -8144,6 +8273,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -8188,29 +8318,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -8223,6 +8359,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -8267,29 +8404,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -8935,6 +9078,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -8948,6 +9092,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -9126,6 +9271,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -9170,29 +9316,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -9205,6 +9357,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -9249,29 +9402,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -9972,6 +10131,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -9985,6 +10145,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -10163,6 +10324,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -10207,29 +10369,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -10242,6 +10410,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -10286,29 +10455,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -10477,14 +10652,12 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                 <button
                   class="Button primary"
                   data-testid="show-release-some-release-for-some-first-tab-id"
-                  type="button"
                 >
                   View Helm Release
                 </button>
                 <button
                   class="Button plain active"
                   data-testid="show-execution-output-for-some-release-in-some-first-tab-id"
-                  type="button"
                 >
                   Show Notes
                 </button>
@@ -10821,6 +10994,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -10834,6 +11008,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -11594,6 +11769,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -11607,6 +11783,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -11785,6 +11962,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -11829,29 +12007,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -11864,6 +12048,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -11908,29 +12093,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -12099,14 +12290,12 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                 <button
                   class="Button primary"
                   data-testid="show-release-some-release-for-some-first-tab-id"
-                  type="button"
                 >
                   View Helm Release
                 </button>
                 <button
                   class="Button plain active"
                   data-testid="show-execution-output-for-some-release-in-some-first-tab-id"
-                  type="button"
                 >
                   Show Notes
                 </button>
@@ -12152,7 +12341,6 @@ exports[`installing helm chart from new tab given tab for installing chart was n
           >
             <button
               class="Button plain"
-              type="button"
             >
               <i
                 class="Icon material focusable"
@@ -12168,7 +12356,6 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             </button>
             <button
               class="Button plain"
-              type="button"
             >
               Close
             </button>
@@ -12456,6 +12643,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -12469,6 +12657,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -12647,6 +12836,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -12691,29 +12881,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -12726,6 +12922,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -12770,29 +12967,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -13263,7 +13466,6 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                 <button
                   class="Button primary"
                   data-testid="install-chart-for-some-repository-some-other-name"
-                  type="button"
                 >
                   Install
                 </button>
@@ -13684,6 +13886,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -13697,6 +13900,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -13875,6 +14079,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -13919,29 +14124,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -13954,6 +14165,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -13998,29 +14210,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -14502,6 +14720,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -14515,6 +14734,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -14693,6 +14913,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -14737,29 +14958,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -14772,6 +14999,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -14816,29 +15044,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -15535,6 +15769,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -15548,6 +15783,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -15726,6 +15962,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -15770,29 +16007,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -15805,6 +16048,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -15849,29 +16093,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -16566,6 +16816,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -16579,6 +16830,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -16757,6 +17009,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -16801,29 +17054,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -16836,6 +17095,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -16880,29 +17140,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -17548,6 +17814,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -17561,6 +17828,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -17739,6 +18007,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -17783,29 +18052,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -17818,6 +18093,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -17862,29 +18138,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -18530,6 +18812,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -18543,6 +18826,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -18721,6 +19005,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -18765,29 +19050,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -18800,6 +19091,7 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -18844,29 +19136,35 @@ exports[`installing helm chart from new tab given tab for installing chart was n
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
diff --git a/src/behaviours/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-previously-opened-tab.test.ts.snap b/src/behaviours/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-previously-opened-tab.test.ts.snap
index 7bd7f19eae..4ffc859f89 100644
--- a/src/behaviours/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-previously-opened-tab.test.ts.snap
+++ b/src/behaviours/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-previously-opened-tab.test.ts.snap
@@ -276,6 +276,7 @@ exports[`installing helm chart from previously opened tab given tab for installi
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Overview"
               data-testid="tab-link-for-overview"
               role="tab"
               tabindex="0"
@@ -806,6 +807,7 @@ exports[`installing helm chart from previously opened tab given tab for installi
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Overview"
               data-testid="tab-link-for-overview"
               role="tab"
               tabindex="0"
diff --git a/src/behaviours/helm-charts/installing-chart/__snapshots__/opening-dock-tab-for-installing-helm-chart.test.ts.snap b/src/behaviours/helm-charts/installing-chart/__snapshots__/opening-dock-tab-for-installing-helm-chart.test.ts.snap
index 7f543d7597..6a6ea18843 100644
--- a/src/behaviours/helm-charts/installing-chart/__snapshots__/opening-dock-tab-for-installing-helm-chart.test.ts.snap
+++ b/src/behaviours/helm-charts/installing-chart/__snapshots__/opening-dock-tab-for-installing-helm-chart.test.ts.snap
@@ -276,6 +276,7 @@ exports[`opening dock tab for installing helm chart given application is started
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -289,6 +290,7 @@ exports[`opening dock tab for installing helm chart given application is started
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -793,6 +795,7 @@ exports[`opening dock tab for installing helm chart given application is started
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -806,6 +809,7 @@ exports[`opening dock tab for installing helm chart given application is started
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -984,6 +988,7 @@ exports[`opening dock tab for installing helm chart given application is started
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -1028,29 +1033,35 @@ exports[`opening dock tab for installing helm chart given application is started
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -1063,6 +1074,7 @@ exports[`opening dock tab for installing helm chart given application is started
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -1107,29 +1119,35 @@ exports[`opening dock tab for installing helm chart given application is started
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -1474,6 +1492,7 @@ exports[`opening dock tab for installing helm chart given application is started
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -1487,6 +1506,7 @@ exports[`opening dock tab for installing helm chart given application is started
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -1665,6 +1685,7 @@ exports[`opening dock tab for installing helm chart given application is started
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -1709,29 +1730,35 @@ exports[`opening dock tab for installing helm chart given application is started
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -1744,6 +1771,7 @@ exports[`opening dock tab for installing helm chart given application is started
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -1788,29 +1816,35 @@ exports[`opening dock tab for installing helm chart given application is started
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -2212,6 +2246,7 @@ exports[`opening dock tab for installing helm chart given application is started
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -2225,6 +2260,7 @@ exports[`opening dock tab for installing helm chart given application is started
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -2403,6 +2439,7 @@ exports[`opening dock tab for installing helm chart given application is started
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -2447,29 +2484,35 @@ exports[`opening dock tab for installing helm chart given application is started
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -2482,6 +2525,7 @@ exports[`opening dock tab for installing helm chart given application is started
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -2526,29 +2570,35 @@ exports[`opening dock tab for installing helm chart given application is started
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -2718,7 +2768,6 @@ exports[`opening dock tab for installing helm chart given application is started
                 <button
                   class="Button primary"
                   data-testid="install-chart-for-some-repository-some-name"
-                  type="button"
                 >
                   Install
                 </button>
@@ -3129,6 +3178,7 @@ exports[`opening dock tab for installing helm chart given application is started
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -3142,6 +3192,7 @@ exports[`opening dock tab for installing helm chart given application is started
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -3320,6 +3371,7 @@ exports[`opening dock tab for installing helm chart given application is started
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -3364,29 +3416,35 @@ exports[`opening dock tab for installing helm chart given application is started
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -3399,6 +3457,7 @@ exports[`opening dock tab for installing helm chart given application is started
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -3443,29 +3502,35 @@ exports[`opening dock tab for installing helm chart given application is started
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -3635,7 +3700,6 @@ exports[`opening dock tab for installing helm chart given application is started
                 <button
                   class="Button primary"
                   data-testid="install-chart-for-some-repository-some-name"
-                  type="button"
                 >
                   Install
                 </button>
@@ -4056,6 +4120,7 @@ exports[`opening dock tab for installing helm chart given application is started
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -4069,6 +4134,7 @@ exports[`opening dock tab for installing helm chart given application is started
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -4247,6 +4313,7 @@ exports[`opening dock tab for installing helm chart given application is started
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -4291,29 +4358,35 @@ exports[`opening dock tab for installing helm chart given application is started
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -4326,6 +4399,7 @@ exports[`opening dock tab for installing helm chart given application is started
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -4370,29 +4444,35 @@ exports[`opening dock tab for installing helm chart given application is started
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -4562,7 +4642,6 @@ exports[`opening dock tab for installing helm chart given application is started
                 <button
                   class="Button primary"
                   data-testid="install-chart-for-some-repository-some-name"
-                  type="button"
                 >
                   Install
                 </button>
@@ -4973,6 +5052,7 @@ exports[`opening dock tab for installing helm chart given application is started
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -4986,6 +5066,7 @@ exports[`opening dock tab for installing helm chart given application is started
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -5164,6 +5245,7 @@ exports[`opening dock tab for installing helm chart given application is started
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -5208,29 +5290,35 @@ exports[`opening dock tab for installing helm chart given application is started
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -5243,6 +5331,7 @@ exports[`opening dock tab for installing helm chart given application is started
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -5287,29 +5376,35 @@ exports[`opening dock tab for installing helm chart given application is started
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -5479,7 +5574,6 @@ exports[`opening dock tab for installing helm chart given application is started
                 <button
                   class="Button primary"
                   data-testid="install-chart-for-some-repository-some-name"
-                  type="button"
                 >
                   Install
                 </button>
@@ -5900,6 +5994,7 @@ exports[`opening dock tab for installing helm chart given application is started
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -5913,6 +6008,7 @@ exports[`opening dock tab for installing helm chart given application is started
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -6091,6 +6187,7 @@ exports[`opening dock tab for installing helm chart given application is started
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -6135,29 +6232,35 @@ exports[`opening dock tab for installing helm chart given application is started
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
@@ -6170,6 +6273,7 @@ exports[`opening dock tab for installing helm chart given application is started
                             >
                               <div
                                 class="TableCell icon"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 <figure>
                                   <div>
@@ -6214,29 +6318,35 @@ exports[`opening dock tab for installing helm chart given application is started
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell description"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-description
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-version
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm charts"
                               />
                               <div
                                 class="TableCell some-repository repository"
+                                data-telemetry-title="Table Row helm charts"
                               >
                                 some-repository
                               </div>
                               <div
                                 class="TableCell menu"
+                                data-telemetry-title="Table Row helm charts"
                               />
                             </div>
                           </div>
diff --git a/src/behaviours/helm-charts/installing-chart/installing-helm-chart-from-new-tab.test.ts b/src/behaviours/helm-charts/installing-chart/installing-helm-chart-from-new-tab.test.ts
index 4da41f669d..c5eb7937c1 100644
--- a/src/behaviours/helm-charts/installing-chart/installing-helm-chart-from-new-tab.test.ts
+++ b/src/behaviours/helm-charts/installing-chart/installing-helm-chart-from-new-tab.test.ts
@@ -5,7 +5,7 @@
 import type { AsyncFnMock } from "@async-fn/jest";
 import asyncFn from "@async-fn/jest";
 import type { RenderResult } from "@testing-library/react";
-import { fireEvent } from "@testing-library/react";
+import {  fireEvent } from "@testing-library/react";
 import type { ApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder";
 import type { CallForHelmCharts } from "../../../renderer/components/+helm-charts/helm-charts/call-for-helm-charts.injectable";
@@ -54,6 +54,13 @@ describe("installing helm chart from new tab", () => {
     callForCreateHelmReleaseMock = asyncFn();
 
     builder.beforeApplicationStart(({ rendererDi }) => {
+      /*rendererDi.override(
+        onClickTelemetryDecoratorInjectable,
+        () => ({
+          onClick: (f) => (e) => { return f(e); },
+        }),
+      );*/
+
       rendererDi.override(
         directoryForLensLocalStorageInjectable,
         () => "/some-directory-for-lens-local-storage",
@@ -370,6 +377,8 @@ describe("installing helm chart from new tab", () => {
           });
 
           it("install button is disabled", () => {
+            fireEvent.click(installButton);
+
             expect(installButton).toHaveAttribute("disabled");
           });
 
diff --git a/src/behaviours/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap b/src/behaviours/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap
index ae169ab2f4..a7601dd4cd 100644
--- a/src/behaviours/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap
+++ b/src/behaviours/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap
@@ -276,6 +276,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -289,6 +290,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -1028,6 +1030,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -1041,6 +1044,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -1785,6 +1789,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -1798,6 +1803,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -2152,41 +2158,49 @@ exports[`showing details for helm release given application is started when navi
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell namespace"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-namespace
                               </div>
                               <div
                                 class="TableCell chart"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-chart
                               </div>
                               <div
                                 class="TableCell revision"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaN
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-app-version
                               </div>
                               <div
                                 class="TableCell some-status status"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 Some-status
                               </div>
                               <div
                                 class="TableCell updated"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaNy
                               </div>
@@ -2233,41 +2247,49 @@ exports[`showing details for helm release given application is started when navi
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell namespace"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-namespace
                               </div>
                               <div
                                 class="TableCell chart"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-chart
                               </div>
                               <div
                                 class="TableCell revision"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaN
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-app-version
                               </div>
                               <div
                                 class="TableCell some-other-status status"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 Some-other-status
                               </div>
                               <div
                                 class="TableCell updated"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaNy
                               </div>
@@ -2710,6 +2732,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -2723,6 +2746,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -3077,41 +3101,49 @@ exports[`showing details for helm release given application is started when navi
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell namespace"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-namespace
                               </div>
                               <div
                                 class="TableCell chart"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-chart
                               </div>
                               <div
                                 class="TableCell revision"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaN
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-app-version
                               </div>
                               <div
                                 class="TableCell some-status status"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 Some-status
                               </div>
                               <div
                                 class="TableCell updated"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaNy
                               </div>
@@ -3158,41 +3190,49 @@ exports[`showing details for helm release given application is started when navi
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell namespace"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-namespace
                               </div>
                               <div
                                 class="TableCell chart"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-chart
                               </div>
                               <div
                                 class="TableCell revision"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaN
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-app-version
                               </div>
                               <div
                                 class="TableCell some-other-status status"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 Some-other-status
                               </div>
                               <div
                                 class="TableCell updated"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaNy
                               </div>
@@ -3682,6 +3722,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -3695,6 +3736,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -4049,41 +4091,49 @@ exports[`showing details for helm release given application is started when navi
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell namespace"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-namespace
                               </div>
                               <div
                                 class="TableCell chart"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-chart
                               </div>
                               <div
                                 class="TableCell revision"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaN
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-app-version
                               </div>
                               <div
                                 class="TableCell some-status status"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 Some-status
                               </div>
                               <div
                                 class="TableCell updated"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaNy
                               </div>
@@ -4130,41 +4180,49 @@ exports[`showing details for helm release given application is started when navi
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell namespace"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-namespace
                               </div>
                               <div
                                 class="TableCell chart"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-chart
                               </div>
                               <div
                                 class="TableCell revision"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaN
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-app-version
                               </div>
                               <div
                                 class="TableCell some-other-status status"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 Some-other-status
                               </div>
                               <div
                                 class="TableCell updated"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaNy
                               </div>
@@ -4607,6 +4665,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -4620,6 +4679,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -4974,41 +5034,49 @@ exports[`showing details for helm release given application is started when navi
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell namespace"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-namespace
                               </div>
                               <div
                                 class="TableCell chart"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-chart
                               </div>
                               <div
                                 class="TableCell revision"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaN
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-app-version
                               </div>
                               <div
                                 class="TableCell some-status status"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 Some-status
                               </div>
                               <div
                                 class="TableCell updated"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaNy
                               </div>
@@ -5055,41 +5123,49 @@ exports[`showing details for helm release given application is started when navi
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell namespace"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-namespace
                               </div>
                               <div
                                 class="TableCell chart"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-chart
                               </div>
                               <div
                                 class="TableCell revision"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaN
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-app-version
                               </div>
                               <div
                                 class="TableCell some-other-status status"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 Some-other-status
                               </div>
                               <div
                                 class="TableCell updated"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaNy
                               </div>
@@ -5579,6 +5655,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -5592,6 +5669,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -5946,41 +6024,49 @@ exports[`showing details for helm release given application is started when navi
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell namespace"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-namespace
                               </div>
                               <div
                                 class="TableCell chart"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-chart
                               </div>
                               <div
                                 class="TableCell revision"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaN
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-app-version
                               </div>
                               <div
                                 class="TableCell some-status status"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 Some-status
                               </div>
                               <div
                                 class="TableCell updated"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaNy
                               </div>
@@ -6027,41 +6113,49 @@ exports[`showing details for helm release given application is started when navi
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell namespace"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-namespace
                               </div>
                               <div
                                 class="TableCell chart"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-chart
                               </div>
                               <div
                                 class="TableCell revision"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaN
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-app-version
                               </div>
                               <div
                                 class="TableCell some-other-status status"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 Some-other-status
                               </div>
                               <div
                                 class="TableCell updated"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaNy
                               </div>
@@ -6551,6 +6645,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -6564,6 +6659,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -6918,41 +7014,49 @@ exports[`showing details for helm release given application is started when navi
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell namespace"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-namespace
                               </div>
                               <div
                                 class="TableCell chart"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-chart
                               </div>
                               <div
                                 class="TableCell revision"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaN
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-app-version
                               </div>
                               <div
                                 class="TableCell some-status status"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 Some-status
                               </div>
                               <div
                                 class="TableCell updated"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaNy
                               </div>
@@ -6999,41 +7103,49 @@ exports[`showing details for helm release given application is started when navi
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell namespace"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-namespace
                               </div>
                               <div
                                 class="TableCell chart"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-chart
                               </div>
                               <div
                                 class="TableCell revision"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaN
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-app-version
                               </div>
                               <div
                                 class="TableCell some-other-status status"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 Some-other-status
                               </div>
                               <div
                                 class="TableCell updated"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaNy
                               </div>
@@ -7323,7 +7435,6 @@ exports[`showing details for helm release given application is started when navi
                 <button
                   class="Button box right upgrade primary"
                   data-testid="helm-release-upgrade-button"
-                  type="button"
                 >
                   Upgrade
                 </button>
@@ -7430,7 +7541,6 @@ exports[`showing details for helm release given application is started when navi
               <button
                 class="Button primary"
                 data-testid="helm-release-configuration-save-button"
-                type="button"
               >
                 Save
               </button>
@@ -7789,6 +7899,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -7802,6 +7913,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -8156,41 +8268,49 @@ exports[`showing details for helm release given application is started when navi
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell namespace"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-namespace
                               </div>
                               <div
                                 class="TableCell chart"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-chart
                               </div>
                               <div
                                 class="TableCell revision"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaN
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-app-version
                               </div>
                               <div
                                 class="TableCell some-status status"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 Some-status
                               </div>
                               <div
                                 class="TableCell updated"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaNy
                               </div>
@@ -8237,41 +8357,49 @@ exports[`showing details for helm release given application is started when navi
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell namespace"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-namespace
                               </div>
                               <div
                                 class="TableCell chart"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-chart
                               </div>
                               <div
                                 class="TableCell revision"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaN
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-app-version
                               </div>
                               <div
                                 class="TableCell some-other-status status"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 Some-other-status
                               </div>
                               <div
                                 class="TableCell updated"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaNy
                               </div>
@@ -8561,7 +8689,6 @@ exports[`showing details for helm release given application is started when navi
                 <button
                   class="Button box right upgrade primary"
                   data-testid="helm-release-upgrade-button"
-                  type="button"
                 >
                   Upgrade
                 </button>
@@ -8668,7 +8795,6 @@ exports[`showing details for helm release given application is started when navi
               <button
                 class="Button primary"
                 data-testid="helm-release-configuration-save-button"
-                type="button"
               >
                 Save
               </button>
@@ -9027,6 +9153,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -9040,6 +9167,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -9394,41 +9522,49 @@ exports[`showing details for helm release given application is started when navi
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell namespace"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-namespace
                               </div>
                               <div
                                 class="TableCell chart"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-chart
                               </div>
                               <div
                                 class="TableCell revision"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaN
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-app-version
                               </div>
                               <div
                                 class="TableCell some-status status"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 Some-status
                               </div>
                               <div
                                 class="TableCell updated"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaNy
                               </div>
@@ -9475,41 +9611,49 @@ exports[`showing details for helm release given application is started when navi
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell namespace"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-namespace
                               </div>
                               <div
                                 class="TableCell chart"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-chart
                               </div>
                               <div
                                 class="TableCell revision"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaN
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-app-version
                               </div>
                               <div
                                 class="TableCell some-other-status status"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 Some-other-status
                               </div>
                               <div
                                 class="TableCell updated"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaNy
                               </div>
@@ -9799,7 +9943,6 @@ exports[`showing details for helm release given application is started when navi
                 <button
                   class="Button box right upgrade primary"
                   data-testid="helm-release-upgrade-button"
-                  type="button"
                 >
                   Upgrade
                 </button>
@@ -9906,7 +10049,6 @@ exports[`showing details for helm release given application is started when navi
               <button
                 class="Button waiting primary"
                 data-testid="helm-release-configuration-save-button"
-                type="button"
               >
                 Save
               </button>
@@ -10265,6 +10407,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -10278,6 +10421,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -10864,7 +11008,6 @@ exports[`showing details for helm release given application is started when navi
                 <button
                   class="Button box right upgrade primary"
                   data-testid="helm-release-upgrade-button"
-                  type="button"
                 >
                   Upgrade
                 </button>
@@ -10971,7 +11114,6 @@ exports[`showing details for helm release given application is started when navi
               <button
                 class="Button primary"
                 data-testid="helm-release-configuration-save-button"
-                type="button"
               >
                 Save
               </button>
@@ -11330,6 +11472,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -11343,6 +11486,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -11929,7 +12073,6 @@ exports[`showing details for helm release given application is started when navi
                 <button
                   class="Button box right upgrade primary"
                   data-testid="helm-release-upgrade-button"
-                  type="button"
                 >
                   Upgrade
                 </button>
@@ -12038,7 +12181,6 @@ exports[`showing details for helm release given application is started when navi
                 class="Button primary"
                 data-testid="helm-release-configuration-save-button"
                 disabled=""
-                type="button"
               >
                 Save
               </button>
@@ -12397,6 +12539,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -12410,6 +12553,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -12764,41 +12908,49 @@ exports[`showing details for helm release given application is started when navi
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell namespace"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-namespace
                               </div>
                               <div
                                 class="TableCell chart"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-chart
                               </div>
                               <div
                                 class="TableCell revision"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaN
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-app-version
                               </div>
                               <div
                                 class="TableCell some-status status"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 Some-status
                               </div>
                               <div
                                 class="TableCell updated"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaNy
                               </div>
@@ -12845,41 +12997,49 @@ exports[`showing details for helm release given application is started when navi
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell namespace"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-namespace
                               </div>
                               <div
                                 class="TableCell chart"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-chart
                               </div>
                               <div
                                 class="TableCell revision"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaN
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-app-version
                               </div>
                               <div
                                 class="TableCell some-other-status status"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 Some-other-status
                               </div>
                               <div
                                 class="TableCell updated"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaNy
                               </div>
@@ -13169,7 +13329,6 @@ exports[`showing details for helm release given application is started when navi
                 <button
                   class="Button box right upgrade primary"
                   data-testid="helm-release-upgrade-button"
-                  type="button"
                 >
                   Upgrade
                 </button>
@@ -13276,7 +13435,6 @@ exports[`showing details for helm release given application is started when navi
               <button
                 class="Button primary"
                 data-testid="helm-release-configuration-save-button"
-                type="button"
               >
                 Save
               </button>
@@ -13635,6 +13793,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -13648,6 +13807,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -14002,41 +14162,49 @@ exports[`showing details for helm release given application is started when navi
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell namespace"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-namespace
                               </div>
                               <div
                                 class="TableCell chart"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-chart
                               </div>
                               <div
                                 class="TableCell revision"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaN
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-app-version
                               </div>
                               <div
                                 class="TableCell some-status status"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 Some-status
                               </div>
                               <div
                                 class="TableCell updated"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaNy
                               </div>
@@ -14083,41 +14251,49 @@ exports[`showing details for helm release given application is started when navi
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell namespace"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-namespace
                               </div>
                               <div
                                 class="TableCell chart"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-chart
                               </div>
                               <div
                                 class="TableCell revision"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaN
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-app-version
                               </div>
                               <div
                                 class="TableCell some-other-status status"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 Some-other-status
                               </div>
                               <div
                                 class="TableCell updated"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaNy
                               </div>
@@ -14618,6 +14794,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -14631,6 +14808,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -14985,41 +15163,49 @@ exports[`showing details for helm release given application is started when navi
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell namespace"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-namespace
                               </div>
                               <div
                                 class="TableCell chart"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-chart
                               </div>
                               <div
                                 class="TableCell revision"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaN
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-app-version
                               </div>
                               <div
                                 class="TableCell some-status status"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 Some-status
                               </div>
                               <div
                                 class="TableCell updated"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaNy
                               </div>
@@ -15066,41 +15252,49 @@ exports[`showing details for helm release given application is started when navi
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell namespace"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-namespace
                               </div>
                               <div
                                 class="TableCell chart"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-chart
                               </div>
                               <div
                                 class="TableCell revision"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaN
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-app-version
                               </div>
                               <div
                                 class="TableCell some-other-status status"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 Some-other-status
                               </div>
                               <div
                                 class="TableCell updated"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaNy
                               </div>
@@ -15590,6 +15784,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center"
               data-is-active-test="false"
+              data-telemetry-title="Tab Charts"
               data-testid="tab-link-for-charts"
               role="tab"
               tabindex="0"
@@ -15603,6 +15798,7 @@ exports[`showing details for helm release given application is started when navi
             <div
               class="Tab flex gaps align-center active"
               data-is-active-test="true"
+              data-telemetry-title="Tab Releases"
               data-testid="tab-link-for-releases"
               role="tab"
               tabindex="0"
@@ -15957,41 +16153,49 @@ exports[`showing details for helm release given application is started when navi
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-name
                               </div>
                               <div
                                 class="TableCell namespace"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-namespace
                               </div>
                               <div
                                 class="TableCell chart"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-chart
                               </div>
                               <div
                                 class="TableCell revision"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaN
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-app-version
                               </div>
                               <div
                                 class="TableCell some-status status"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 Some-status
                               </div>
                               <div
                                 class="TableCell updated"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaNy
                               </div>
@@ -16038,41 +16242,49 @@ exports[`showing details for helm release given application is started when navi
                               </div>
                               <div
                                 class="TableCell name"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-name
                               </div>
                               <div
                                 class="TableCell namespace"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-namespace
                               </div>
                               <div
                                 class="TableCell chart"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-chart
                               </div>
                               <div
                                 class="TableCell revision"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaN
                               </div>
                               <div
                                 class="TableCell version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 
                               </div>
                               <div
                                 class="TableCell app-version"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 some-other-app-version
                               </div>
                               <div
                                 class="TableCell some-other-status status"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 Some-other-status
                               </div>
                               <div
                                 class="TableCell updated"
+                                data-telemetry-title="Table Row helm releases"
                               >
                                 NaNy
                               </div>
diff --git a/src/behaviours/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap b/src/behaviours/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap
index f450498468..b43c07ea83 100644
--- a/src/behaviours/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap
+++ b/src/behaviours/preferences/__snapshots__/navigation-to-kubernetes-preferences.test.ts.snap
@@ -965,7 +965,6 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
                 >
                   <button
                     class="Button PathPicker primary"
-                    type="button"
                   >
                     Sync Files and Folders
                   </button>
@@ -1076,8 +1075,8 @@ exports[`preferences - navigation to kubernetes preferences given in preferences
                       </div>
                       <button
                         class="Button primary"
+                        data-telemetry-title="Add Custom Helm Repo Custom Title"
                         data-testid="add-custom-helm-repo-button"
-                        type="button"
                       >
                         Add Custom Helm Repo
                       </button>
diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-open-button.tsx b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-open-button.tsx
index a3f2243263..43a4f11a84 100644
--- a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-open-button.tsx
+++ b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-open-button.tsx
@@ -17,6 +17,7 @@ const NonInjectedActivationOfCustomHelmRepositoryOpenButton = ({ showDialog }: D
     label="Add Custom Helm Repo"
     onClick={showDialog}
     data-testid="add-custom-helm-repo-button"
+    data-telemetry-title="Add Custom Helm Repo Custom Title"
   />
 );
 
diff --git a/src/renderer/components/avatar/__tests__/avatar.test.tsx b/src/renderer/components/avatar/__tests__/avatar.test.tsx
index 4b7b3e18c0..f0b2db7879 100644
--- a/src/renderer/components/avatar/__tests__/avatar.test.tsx
+++ b/src/renderer/components/avatar/__tests__/avatar.test.tsx
@@ -5,11 +5,22 @@
 
 import React from "react";
 import "@testing-library/jest-dom/extend-expect";
-import { render } from "@testing-library/react";
 import { Avatar } from "../avatar";
 import { Icon } from "../../icon";
+import type { DiContainer } from "@ogre-tools/injectable";
+import type { DiRender } from "../../test-utils/renderFor";
+import { renderFor } from "../../test-utils/renderFor";
+import { getDiForUnitTesting } from "../../../getDiForUnitTesting";
 
 describe("<Avatar/>", () => {
+  let di: DiContainer;
+  let render: DiRender;
+
+  beforeEach(() => {
+    di = getDiForUnitTesting({ doGeneralOverrides: true });
+    render = renderFor(di);
+  });
+
   test("renders w/o errors", () => {
     const { container } = render(<Avatar title="John Ferguson"/>);
 
diff --git a/src/renderer/components/avatar/avatar.tsx b/src/renderer/components/avatar/avatar.tsx
index 6a4588306f..0735703e8a 100644
--- a/src/renderer/components/avatar/avatar.tsx
+++ b/src/renderer/components/avatar/avatar.tsx
@@ -11,7 +11,7 @@ import randomColor from "randomcolor";
 import GraphemeSplitter from "grapheme-splitter";
 import type { SingleOrMany } from "../../utils";
 import { cssNames, isDefined, iter } from "../../utils";
-import { OpenLensButton } from "../button";
+import { OnClickDecorated } from "../on-click-decorated/on-click-decorated";
 
 export interface AvatarProps {
   title: string;
@@ -78,7 +78,8 @@ export const Avatar = ({
   onClick,
   "data-testid": dataTestId,
 }: AvatarProps) => (
-  <OpenLensButton
+  <OnClickDecorated
+    tagName="div"
     className={cssNames(styles.Avatar, {
       [styles.circle]: variant == "circle",
       [styles.rounded]: variant == "rounded",
@@ -106,5 +107,5 @@ export const Avatar = ({
         />
       )
       : children || getLabelFromTitle(title)}
-  </OpenLensButton>
+  </OnClickDecorated>
 );
diff --git a/src/renderer/components/button/button.tsx b/src/renderer/components/button/button.tsx
index 64890b52dd..9ccf641d1d 100644
--- a/src/renderer/components/button/button.tsx
+++ b/src/renderer/components/button/button.tsx
@@ -25,48 +25,61 @@ export interface ButtonProps extends ButtonHTMLAttributes<any> {
   round?: boolean;
   href?: string; // render as hyperlink
   target?: "_blank"; // in case of using @href
-  Component?: React.ComponentType<any>;
 }
 
-const PlainButton = (props: React.DetailedHTMLProps<React.ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement>) => <button {...props} />;
-const PlainAnchor = (props: React.DetailedHTMLProps<React.AnchorHTMLAttributes<HTMLAnchorElement>, HTMLAnchorElement>) => <a {...props} />;
-
-export const Button = withTooltip((props: ButtonProps) => {
+const prepareProps = (props: ButtonProps) => {
   const {
     waiting, label, primary, accent, plain, hidden, active, big,
-    round, outlined, light, children, Component, ...btnProps
+    round, outlined, light, children, ...btnProps
   } = props;
 
-  if (hidden) return null;
-
-  const ButtonComponent = Component ?? (props.href ? PlainAnchor : PlainButton);
-
   btnProps.className = cssNames("Button", btnProps.className, {
     waiting, primary, accent, plain, active, big, round, outlined, light,
   });
 
+  return btnProps;
+};
+
+export const Button = withTooltip((props: ButtonProps) => {
+  const { label, children, hidden } = props;
+
+  if (hidden) return null;
+
+  const btnProps = prepareProps(props);
+
   // render as link
   if (props.href) {
     return (
-      <ButtonComponent
+      <a
         {...btnProps}>
         {label}
         {children}
-      </ButtonComponent>
+      </a>
     );
   }
 
   // render as button
   return (
-    <ButtonComponent
+    <button
       type="button"
       {...btnProps}>
       {label}
       {children}
-    </ButtonComponent>
+    </button>
   );
 });
 
 export const OpenLensButton = (props: ButtonProps & TooltipDecoratorProps) => {
-  return <Button {...props} Component={(props) => <OnClickDecorated {...props} tagName={props.href ? "a" : "button"} />} />;
+  const { label, children, hidden } = props;
+
+  if (hidden) return null;
+
+  const buttonProps = prepareProps(props);
+
+  return (
+    <OnClickDecorated {...buttonProps} tagName={props.href ? "a" : "button"}>
+      {label}
+      {children}
+    </OnClickDecorated>
+  );
 };
diff --git a/src/renderer/components/dock/info-panel.tsx b/src/renderer/components/dock/info-panel.tsx
index 20346a945f..48a53a0308 100644
--- a/src/renderer/components/dock/info-panel.tsx
+++ b/src/renderer/components/dock/info-panel.tsx
@@ -10,7 +10,7 @@ import React, { Component } from "react";
 import { computed, observable, reaction, makeObservable } from "mobx";
 import { disposeOnUnmount, observer } from "mobx-react";
 import { cssNames } from "../../utils";
-import { OpenLensButton } from "../button";
+import { Button } from "../button";
 import { Icon } from "../icon";
 import { Spinner } from "../spinner";
 import type { DockStore, TabId } from "./dock/store";
@@ -146,13 +146,13 @@ class NonInjectedInfoPanel extends Component<InfoPanelProps & Dependencies> {
         )}
         {showButtons && (
           <>
-            <OpenLensButton
+            <Button
               plain
               label="Cancel"
               onClick={close}
               data-testid={this.props.cancelTestId}
             />
-            <OpenLensButton
+            <Button
               active
               outlined={showSubmitClose}
               primary={!showSubmitClose}// one button always should be primary (blue)
@@ -162,7 +162,7 @@ class NonInjectedInfoPanel extends Component<InfoPanelProps & Dependencies> {
               data-testid={this.props.submitTestId}
             />
             {showSubmitClose && (
-              <OpenLensButton
+              <Button
                 primary
                 active
                 label={`${submitLabel} & Close`}
diff --git a/src/renderer/components/item-object-list/content.tsx b/src/renderer/components/item-object-list/content.tsx
index 8cff8f21bc..c45a504e17 100644
--- a/src/renderer/components/item-object-list/content.tsx
+++ b/src/renderer/components/item-object-list/content.tsx
@@ -103,6 +103,7 @@ class NonInjectedItemListLayoutContent<
       copyClassNameFromHeadCells, customizeTableRowProps = () => ({}), detailsItem,
     } = this.props;
     const { isSelected } = store;
+    const telemetryTitle = `Table Row ${this.props.tableId?.split("_").join(" ")}`;
 
     return (
       <TableRow
@@ -134,7 +135,12 @@ class NonInjectedItemListLayoutContent<
           }
 
           if (!headCell || this.showColumn(headCell)) {
-            return <TableCell key={index} {...cellProps} />;
+            return (
+              <TableCell
+                key={index}
+                {...cellProps}
+                telemetryTitle={telemetryTitle} />
+            );
           }
 
           return null;
diff --git a/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap b/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap
index 799e841e5d..e6f633e0d8 100644
--- a/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap
+++ b/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap
@@ -115,14 +115,12 @@ exports[`kube-object-menu given kube object when removing kube object renders 1`
       >
         <button
           class="Button cancel plain"
-          type="button"
         >
           Cancel
         </button>
         <button
           class="Button ok primary"
           data-testid="confirm"
-          type="button"
         >
           Remove
         </button>
@@ -241,14 +239,12 @@ exports[`kube-object-menu given kube object when rerendered with different kube
       >
         <button
           class="Button cancel plain"
-          type="button"
         >
           Cancel
         </button>
         <button
           class="Button ok primary"
           data-testid="confirm"
-          type="button"
         >
           Remove
         </button>
@@ -333,14 +329,12 @@ exports[`kube-object-menu given kube object with namespace when removing kube ob
       >
         <button
           class="Button cancel plain"
-          type="button"
         >
           Cancel
         </button>
         <button
           class="Button ok primary"
           data-testid="confirm"
-          type="button"
         >
           Remove
         </button>
@@ -425,14 +419,12 @@ exports[`kube-object-menu given kube object without namespace when removing kube
       >
         <button
           class="Button cancel plain"
-          type="button"
         >
           Cancel
         </button>
         <button
           class="Button ok primary"
           data-testid="confirm"
-          type="button"
         >
           Remove
         </button>
diff --git a/src/renderer/components/layout/tab-layout-2.tsx b/src/renderer/components/layout/tab-layout-2.tsx
index a0348383c1..f16b90d590 100644
--- a/src/renderer/components/layout/tab-layout-2.tsx
+++ b/src/renderer/components/layout/tab-layout-2.tsx
@@ -43,6 +43,7 @@ export const TabLayout = observer(
                   active={active}
                   data-is-active-test={active}
                   data-testid={`tab-link-for-${registration.id}`}
+                  data-telemetry-title={`Tab ${registration.title?.toString()}`}
                 />
               );
             })}
diff --git a/src/renderer/components/on-click-decorated/__snapshots__/foo-bar.test.tsx.snap b/src/renderer/components/on-click-decorated/__snapshots__/foo-bar.test.tsx.snap
deleted file mode 100644
index d9847c3c80..0000000000
--- a/src/renderer/components/on-click-decorated/__snapshots__/foo-bar.test.tsx.snap
+++ /dev/null
@@ -1,11 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`foobar given A -element 1`] = `
-<body>
-  <div>
-    <a
-      data-testid="some-anchor"
-    />
-  </div>
-</body>
-`;
diff --git a/src/renderer/components/on-click-decorated/__snapshots__/on-click-decorated.test.tsx.snap b/src/renderer/components/on-click-decorated/__snapshots__/on-click-decorated.test.tsx.snap
index d9847c3c80..c6e3a27953 100644
--- a/src/renderer/components/on-click-decorated/__snapshots__/on-click-decorated.test.tsx.snap
+++ b/src/renderer/components/on-click-decorated/__snapshots__/on-click-decorated.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`foobar given A -element 1`] = `
+exports[`<OnClickDecorated /> given A -element 1`] = `
 <body>
   <div>
     <a
diff --git a/src/renderer/components/on-click-decorated/on-click-decorated.test.tsx b/src/renderer/components/on-click-decorated/on-click-decorated.test.tsx
index 413b346df6..b3438ac057 100644
--- a/src/renderer/components/on-click-decorated/on-click-decorated.test.tsx
+++ b/src/renderer/components/on-click-decorated/on-click-decorated.test.tsx
@@ -14,7 +14,7 @@ import type { DiContainer } from "@ogre-tools/injectable";
 import { getInjectable } from "@ogre-tools/injectable";
 import { OnClickDecorated } from "./on-click-decorated";
 
-describe("foobar", () => {
+describe("<OnClickDecorated />", () => {
   let di: DiContainer;
   let render: DiRender;
 
diff --git a/src/renderer/components/on-click-decorated/on-click-decorated.tsx b/src/renderer/components/on-click-decorated/on-click-decorated.tsx
index 75f8441044..8878f07a2d 100644
--- a/src/renderer/components/on-click-decorated/on-click-decorated.tsx
+++ b/src/renderer/components/on-click-decorated/on-click-decorated.tsx
@@ -15,16 +15,21 @@ interface Dependencies {
 
 interface ClickDecoratedProps extends HTMLAttributes<any> {
   onClick?: MouseEventHandler<any>;
-  tagName: "button" | "a";
+  tagName: "button" | "a" | "div";
 }
 
-const NonInjectedOnClickDecorated = ({ decorators, tagName: TagName, onClick, ...props }: Dependencies & ClickDecoratedProps) => {
+const NonInjectedOnClickDecorated = React.forwardRef<HTMLButtonElement & HTMLAnchorElement & HTMLDivElement, Dependencies & ClickDecoratedProps>(({ decorators, tagName: TagName, onClick, ...props }, ref) => {
   const onClickDecorators = decorators.map(decorator => decorator.onClick);
 
   const decoratedOnClick = onClick ? flow(...onClickDecorators)(onClick) : undefined;
 
-  return <TagName {...props} onClick={decoratedOnClick} />;
-};
+  return (
+    <TagName
+      {...props}
+      ref={ref}
+      onClick={decoratedOnClick} />
+  );
+});
 
 export const OnClickDecorated = withInjectables<Dependencies, ClickDecoratedProps>(
   NonInjectedOnClickDecorated,
diff --git a/src/renderer/components/on-click-decorated/on-click-telemetry-decorator.injectable.ts b/src/renderer/components/on-click-decorated/on-click-telemetry-decorator.injectable.ts
index 219ed8c3db..8e49f8d31e 100644
--- a/src/renderer/components/on-click-decorated/on-click-telemetry-decorator.injectable.ts
+++ b/src/renderer/components/on-click-decorated/on-click-telemetry-decorator.injectable.ts
@@ -38,7 +38,10 @@ function getEventName(el: HTMLElement, pathname: string, parentLevels = 3) {
 }
 
 function captureMouseEvent(eventBus: EventEmitter<[AppEvent]>, event: React.MouseEvent) {
-  const name = getEventName(event.target as HTMLElement, window.location.pathname);
+  const eventTarget = event.target as HTMLElement;
+  const customTitle = eventTarget?.dataset.telemetryTitle;
+
+  const name = customTitle ?? getEventName(eventTarget, window.location.pathname);
 
   eventBus.emit({
     name,
diff --git a/src/renderer/components/table/table-cell.tsx b/src/renderer/components/table/table-cell.tsx
index 758c5cd951..77b772c1bd 100644
--- a/src/renderer/components/table/table-cell.tsx
+++ b/src/renderer/components/table/table-cell.tsx
@@ -11,6 +11,7 @@ import React from "react";
 import { autoBind, cssNames } from "../../utils";
 import { Icon } from "../icon";
 import { Checkbox } from "../checkbox";
+import { OnClickDecorated } from "../on-click-decorated/on-click-decorated";
 
 export type TableCellElem = React.ReactElement<TableCellProps>;
 
@@ -70,6 +71,8 @@ export interface TableCellProps extends React.DOMAttributes<HTMLDivElement> {
    * indicator, might come from parent <TableHead>, don't use this prop outside (!)
    */
   _nowrap?: boolean;
+
+  telemetryTitle?: string;
 }
 
 export class TableCell extends React.Component<TableCellProps> {
@@ -132,6 +135,7 @@ export class TableCell extends React.Component<TableCellProps> {
       children,
       title,
       showWithColumn,
+      telemetryTitle,
       ...cellProps
     } = this.props;
 
@@ -144,7 +148,9 @@ export class TableCell extends React.Component<TableCellProps> {
     const content = title || children;
 
     return (
-      <div
+      <OnClickDecorated
+        tagName="div"
+        data-telemetry-title={telemetryTitle}
         {...cellProps}
         className={classNames}
         onClick={this.onClick}
@@ -152,7 +158,7 @@ export class TableCell extends React.Component<TableCellProps> {
         {this.renderCheckbox()}
         {_nowrap ? <div className="content">{content}</div> : content}
         {this.renderSortIcon()}
-      </div>
+      </OnClickDecorated>
     );
   }
 }
diff --git a/src/renderer/components/tabs/tabs.tsx b/src/renderer/components/tabs/tabs.tsx
index cfbcf8d5ea..e0ed7f7a96 100644
--- a/src/renderer/components/tabs/tabs.tsx
+++ b/src/renderer/components/tabs/tabs.tsx
@@ -8,6 +8,7 @@ import type { DOMAttributes } from "react";
 import React from "react";
 import { autoBind, cssNames } from "../../utils";
 import { Icon } from "../icon";
+import { OnClickDecorated } from "../on-click-decorated/on-click-decorated";
 
 const TabsContext = React.createContext<TabsContextValue>({});
 
@@ -124,7 +125,8 @@ export class Tab extends React.PureComponent<TabProps> {
     });
 
     return (
-      <div
+      <OnClickDecorated
+        tagName="div"
         {...elemProps}
         className={className}
         tabIndex={0}
@@ -138,7 +140,7 @@ export class Tab extends React.PureComponent<TabProps> {
         <div className="label">
           {label}
         </div>
-      </div>
+      </OnClickDecorated>
     );
   }
 }
diff --git a/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap b/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap
index d9f951355a..06e119b3c2 100644
--- a/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap
+++ b/src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap
@@ -1267,6 +1267,7 @@ exports[`<ClusterFrame /> given cluster without list nodes, but with namespaces
           <div
             class="Tab flex gaps align-center active"
             data-is-active-test="true"
+            data-telemetry-title="Tab Overview"
             data-testid="tab-link-for-overview"
             role="tab"
             tabindex="0"