diff --git a/bedrock/base/templates/includes/protocol/footer/footer-refresh.html b/bedrock/base/templates/includes/protocol/footer/footer-refresh.html
index 8e137de5ee9..4a67152b192 100644
--- a/bedrock/base/templates/includes/protocol/footer/footer-refresh.html
+++ b/bedrock/base/templates/includes/protocol/footer/footer-refresh.html
@@ -17,19 +17,19 @@
             <div class="moz24-footer-refresh-social-wrapper">
               <h2 class="moz24-footer-heading-social">{{ ftl('footer-refresh-follow-mozilla') }}</h2>
               <ul class="moz24-footer-links-social">
-                <li><a class="twitter" href="{{ mozilla_twitter_url() }}" data-link-type="footer" data-link-text="Twitter (@mozilla)">{{ ftl('footer-refresh-x-formerly-twitter', fallback='footer-twitter') }}<span> (@mozilla)</span></a></li>
-                <li><a class="instagram" href="{{ mozilla_instagram_url() }}" data-link-type="footer" data-link-text="Instagram (@mozilla)">{{ ftl('footer-refresh-instagram') }}<span> (@mozilla)</span></a></li>
-                <li><a class="linkedin" href="https://www.linkedin.com/company/mozilla-corporation/" data-link-type="footer" data-link-text="LinkedIn (@mozilla)">{{ ftl('footer-refresh-linkedin') }}<span> (@mozilla)</span></a></li>
-                <li><a class="tiktok" href="https://www.tiktok.com/@mozilla" data-link-type="footer" data-link-text="TikTok (@mozilla)">{{ ftl('footer-refresh-tiktok') }}<span> (@mozilla)</span></a></li>
-                <li><a class="spotify" href="https://open.spotify.com/show/0vT7LJMeVDxyQ2ZamHKu08?si=_uDRD6bRR_6M5YZyISGXgA" data-link-type="footer" data-link-text="Spotify (@mozilla)">{{ ftl('footer-refresh-spotify') }}<span> (@mozilla)</span></a></li>
+                <li><a class="twitter" href="{{ mozilla_twitter_url() }}" data-link-position="footer" data-link-text="Twitter (@mozilla)">{{ ftl('footer-refresh-x-formerly-twitter', fallback='footer-twitter') }}<span> (@mozilla)</span></a></li>
+                <li><a class="instagram" href="{{ mozilla_instagram_url() }}" data-link-position="footer" data-link-text="Instagram (@mozilla)">{{ ftl('footer-refresh-instagram') }}<span> (@mozilla)</span></a></li>
+                <li><a class="linkedin" href="https://www.linkedin.com/company/mozilla-corporation/" data-link-position="footer" data-link-text="LinkedIn (@mozilla)">{{ ftl('footer-refresh-linkedin') }}<span> (@mozilla)</span></a></li>
+                <li><a class="tiktok" href="https://www.tiktok.com/@mozilla" data-link-position="footer" data-link-text="TikTok (@mozilla)">{{ ftl('footer-refresh-tiktok') }}<span> (@mozilla)</span></a></li>
+                <li><a class="spotify" href="https://open.spotify.com/show/0vT7LJMeVDxyQ2ZamHKu08?si=_uDRD6bRR_6M5YZyISGXgA" data-link-position="footer" data-link-text="Spotify (@mozilla)">{{ ftl('footer-refresh-spotify') }}<span> (@mozilla)</span></a></li>
               </ul>
             </div>
             <div class="moz24-footer-refresh-social-wrapper">
               <h2 class="moz24-footer-heading-social">{{ ftl('footer-refresh-follow-firefox') }}</h2>
               <ul class="moz24-footer-links-social">
-                <li><a class="twitter" href="{{ firefox_twitter_url() }}" data-link-type="footer" data-link-text="Twitter (@firefox)">{{ ftl('footer-refresh-x-formerly-twitter', fallback='footer-refresh-twitter') }}<span> (@firefox)</span></a></li>
-                <li><a class="instagram" href="https://www.instagram.com/firefox/" data-link-type="footer" data-link-text="Instagram (@firefox)">{{ ftl('footer-refresh-instagram') }}<span> (@firefox)</span></a></li>
-                <li><a class="youtube" href="https://www.youtube.com/user/firefoxchannel" data-link-type="footer" data-link-text="YouTube (@firefoxchannel)">{{ ftl('footer-refresh-youtube') }}<span> (@firefoxchannel)</span></a></li>
+                <li><a class="twitter" href="{{ firefox_twitter_url() }}" data-link-position="footer" data-link-text="Twitter (@firefox)">{{ ftl('footer-refresh-x-formerly-twitter', fallback='footer-refresh-twitter') }}<span> (@firefox)</span></a></li>
+                <li><a class="instagram" href="https://www.instagram.com/firefox/" data-link-position="footer" data-link-text="Instagram (@firefox)">{{ ftl('footer-refresh-instagram') }}<span> (@firefox)</span></a></li>
+                <li><a class="youtube" href="https://www.youtube.com/user/firefoxchannel" data-link-position="footer" data-link-text="YouTube (@firefoxchannel)">{{ ftl('footer-refresh-youtube') }}<span> (@firefoxchannel)</span></a></li>
               </ul>
             </div>
           </section>
@@ -40,16 +40,16 @@ <h2 class="moz24-footer-label" data-testid="footer-heading-company">
               {{ ftl('footer-refresh-company') }}
             </h2>
             <ul class="moz24-footer-primary-list" data-testid="footer-list-company">
-              <li><a href="{{ url('mozorg.about.leadership.index') }}" data-link-type="footer" data-link-text="footer-refresh-leadership = Leadership">{{ ftl('footer-refresh-leadership') }}</a></li>
-              <li><a href="https://blog.mozilla.org/category/mozilla/news/?{{ utm_params }}&utm_content=company" data-link-type="footer" data-link-text="Press Center">{{ ftl('footer-refresh-press-center') }}</a></li>
-              <li><a href="{{ url('careers.home') }}" data-link-type="footer" data-link-text="Careers">{{ ftl('footer-refresh-careers') }}</a></li>
-              <li><a href="{{ url('mozorg.contact.contact-landing') }}" data-link-type="footer" data-link-text="Contact">{{ ftl('footer-refresh-contact') }}</a></li>
+              <li><a href="{{ url('mozorg.about.leadership.index') }}" data-link-position="footer" data-link-text="Leadership">{{ ftl('footer-refresh-leadership') }}</a></li>
+              <li><a href="https://blog.mozilla.org/category/mozilla/news/?{{ utm_params }}&utm_content=company" data-link-position="footer" data-link-text="Press Center">{{ ftl('footer-refresh-press-center') }}</a></li>
+              <li><a href="{{ url('careers.home') }}" data-link-position="footer" data-link-text="Careers">{{ ftl('footer-refresh-careers') }}</a></li>
+              <li><a href="{{ url('mozorg.contact.contact-landing') }}" data-link-position="footer" data-link-text="Contact">{{ ftl('footer-refresh-contact') }}</a></li>
               <li>
 
               </li>
             {% if LANG == "de" %}
               {# Legal requirement in Germany see issue #14240 #}
-              <li><a href="{{ url('legal.impressum') }}" data-link-type="footer" data-link-text="Impressum">Impressum</a></li>
+              <li><a href="{{ url('legal.impressum') }}" data-link-position="footer" data-link-text="Impressum">Impressum</a></li>
             {% endif %}
             </ul>
           </section>
@@ -59,9 +59,9 @@ <h2 class="moz24-footer-label" data-testid="footer-heading-support">
               {{ ftl('footer-refresh-support') }}
             </h2>
             <ul class="moz24-footer-primary-list" data-testid="footer-list-support">
-              <li><a href="https://support.mozilla.org/?{{ utm_params }}&utm_content=support" data-link-type="footer" data-link-text="Product Help">{{ ftl('footer-refresh-product-help', fallback='footer-refresh-support') }}</a></li>
-              <li><a href="https://bugzilla.mozilla.org/?{{ utm_params }}&utm_content=support" data-link-type="footer" data-link-text="File a Bug">{{ ftl('footer-refresh-file-a-bug') }}</a></li>
-              <li><a href="https://pontoon.mozilla.org/?{{ utm_params }}&utm_content=support" data-link-type="footer" data-link-text="Localise Mozilla">{{ ftl('footer-refresh-localize-mozilla') }}</a></li>
+              <li><a href="https://support.mozilla.org/?{{ utm_params }}&utm_content=support" data-link-position="footer" data-link-text="Product Help">{{ ftl('footer-refresh-product-help', fallback='footer-refresh-support') }}</a></li>
+              <li><a href="https://bugzilla.mozilla.org/?{{ utm_params }}&utm_content=support" data-link-position="footer" data-link-text="File a Bug">{{ ftl('footer-refresh-file-a-bug') }}</a></li>
+              <li><a href="https://pontoon.mozilla.org/?{{ utm_params }}&utm_content=support" data-link-position="footer" data-link-text="Localise Mozilla">{{ ftl('footer-refresh-localize-mozilla') }}</a></li>
             </ul>
           </section>
 
@@ -70,9 +70,9 @@ <h2 class="moz24-footer-label" data-testid="footer-heading-resources">
               {{ ftl('footer-refresh-resources') }}
             </h2>
             <ul class="moz24-footer-primary-list" data-testid="footer-list-resources">
-              <li><a href="{{ url('mozorg.advertising.landing') }}" data-link-type="footer" data-link-text="Advertise with Mozilla">{{ ftl('footer-refresh-advertise') }}</a></li>
-              <li><a href="https://mozilla.design/?{{ utm_params }}&utm_content=resources" data-link-type="footer" data-link-text="Brand Standards">{{ ftl('footer-refresh-brand-standards') }}</a></li>
-              <li><a href="/firefox/{{ latest_firefox_version }}/releasenotes/" data-link-type="footer" data-link-text="Firefox Release Notes">{{ ftl('footer-refresh-firefox-release-notes') }}</a></li>
+              <li><a href="{{ url('mozorg.advertising.landing') }}" data-link-position="footer" data-link-text="Advertise with Mozilla">{{ ftl('footer-refresh-advertise') }}</a></li>
+              <li><a href="https://mozilla.design/?{{ utm_params }}&utm_content=resources" data-link-position="footer" data-link-text="Brand Standards">{{ ftl('footer-refresh-brand-standards') }}</a></li>
+              <li><a href="/firefox/{{ latest_firefox_version }}/releasenotes/" data-link-position="footer" data-link-text="Firefox Release Notes">{{ ftl('footer-refresh-firefox-release-notes') }}</a></li>
             </ul>
           </section>
 
@@ -81,10 +81,10 @@ <h2 class="moz24-footer-label" data-testid="footer-heading-developers">
               {{ ftl('footer-refresh-developers') }}
             </h2>
             <ul class="moz24-footer-primary-list" data-testid="footer-list-developers">
-              <li><a href="{{ url('firefox.developer.index') }}" data-link-type="footer" data-link-text="Firefox Developer Edition">{{ ftl('footer-refresh-developer-edition') }}</a></li>
-              <li><a href="{{ url('firefox.enterprise.index') }}" data-link-type="footer" data-link-text="Firefox for Enterprise">{{ ftl('footer-refresh-enterprise') }}</a></li>
-              <li><a href="https://firefox-source-docs.mozilla.org/devtools-user/?{{ utm_params }}&utm_content=developers" rel="external" data-link-type="footer" data-link-text="Tools">{{ ftl('footer-refresh-tools') }}</a></li>
-              <li><a href="https://developer.mozilla.org/?{{ utm_params }}" data-link-type="footer" data-link-text="MDN">{{ ftl('footer-refresh-mdn') }}</a></li>
+              <li><a href="{{ url('firefox.developer.index') }}" data-link-position="footer" data-link-text="Firefox Developer Edition">{{ ftl('footer-refresh-developer-edition') }}</a></li>
+              <li><a href="{{ url('firefox.enterprise.index') }}" data-link-position="footer" data-link-text="Firefox for Enterprise">{{ ftl('footer-refresh-enterprise') }}</a></li>
+              <li><a href="https://firefox-source-docs.mozilla.org/devtools-user/?{{ utm_params }}&utm_content=developers" rel="external" data-link-position="footer" data-link-text="Tools">{{ ftl('footer-refresh-tools') }}</a></li>
+              <li><a href="https://developer.mozilla.org/?{{ utm_params }}" data-link-position="footer" data-link-text="MDN">{{ ftl('footer-refresh-mdn') }}</a></li>
             </ul>
           </section>
         </div>
@@ -104,21 +104,21 @@ <h2 class="moz24-footer-label" data-testid="footer-heading-developers">
     <nav class="moz24-footer-secondary">
       <div class="moz24-footer-legal">
         <p class="moz24-footer-license" rel="license">
-          {% set moco_link = 'href="%s" data-link-type="footer" data-link-text="Mozilla Corporation"'|safe|format(url('mozorg.home')) %}
-          {% set mofo_link = 'href="https://foundation.mozilla.org/?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=footer" rel="external noopener" data-link-type="footer" data-link-text="Mozilla Foundation"'|safe %}
+          {% set moco_link = 'href="%s" data-link-position="footer" data-link-text="Mozilla Corporation"'|safe|format(url('mozorg.home')) %}
+          {% set mofo_link = 'href="https://foundation.mozilla.org/?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=footer" rel="external noopener" data-link-position="footer" data-link-text="Mozilla Foundation"'|safe %}
           {{ ftl('footer-refresh-visit-mozilla-corporations', moco_link=moco_link, mofo_link=mofo_link) }}<br>
           {{ ftl('footer-refresh-portions-of-this-content', href='href="%s"'|safe|format(url('foundation.licensing.website-content')), current_year=current_year|string) }}
         </p>
         <ul class="moz24-footer-terms">
-          <li><a href="{{ url('privacy.notices.websites') }}" data-link-type="footer" data-link-text="Privacy">{{ ftl('footer-refresh-websites-privacy-notice') }}</a></li>
+          <li><a href="{{ url('privacy.notices.websites') }}" data-link-position="footer" data-link-text="Privacy">{{ ftl('footer-refresh-websites-privacy-notice') }}</a></li>
           <li>
             {# Link to /privacy/websites/cookie-settings/ is a legal requirement and should not be removed. It must be present on every page (Issue 14213). #}
-            <a href="{{ url('privacy.cookie-settings') }}" data-link-type="footer" data-link-text="Cookies">{{ ftl('footer-refresh-websites-cookies') }}</a>
+            <a href="{{ url('privacy.cookie-settings') }}" data-link-position="footer" data-link-text="Cookies">{{ ftl('footer-refresh-websites-cookies') }}</a>
           </li>
-          <li><a href="{{ url('legal.index') }}" data-link-type="footer" data-link-text="Legal">{{ ftl('footer-refresh-websites-legal') }}</a></li>
-          <li><a href="{{ url('mozorg.about.governance.policies.participation') }}" data-link-type="footer" data-link-text="Community Participation Guidelines">{{ ftl('footer-refresh-community-participation-guidelines') }}</a></li>
+          <li><a href="{{ url('legal.index') }}" data-link-position="footer" data-link-text="Legal">{{ ftl('footer-refresh-websites-legal') }}</a></li>
+          <li><a href="{{ url('mozorg.about.governance.policies.participation') }}" data-link-position="footer" data-link-text="Community Participation Guidelines">{{ ftl('footer-refresh-community-participation-guidelines') }}</a></li>
           {% if ftl_has_messages('footer-about-this-site') %}
-            <li><a href="{{ url('mozorg.about.this-site') }}" data-link-type="footer" data-link-text="About this site">{{ ftl('footer-refresh-about-this-site') }}</a></li>
+            <li><a href="{{ url('mozorg.about.this-site') }}" data-link-position="footer" data-link-text="About this site">{{ ftl('footer-refresh-about-this-site') }}</a></li>
           {% endif %}
         </ul>
       </div>
diff --git a/bedrock/base/templates/includes/protocol/footer/footer.html b/bedrock/base/templates/includes/protocol/footer/footer.html
index 7d312f30568..a9e5547e9d0 100644
--- a/bedrock/base/templates/includes/protocol/footer/footer.html
+++ b/bedrock/base/templates/includes/protocol/footer/footer.html
@@ -13,7 +13,7 @@
   <div class="mzp-l-content">
     <nav class="mzp-c-footer-primary">
       <div class="mzp-c-footer-primary-logo {% if switch('m24-logo') %}m24-logo{% endif %}">
-        <a href="{{ url('mozorg.home') }}" data-link-type="footer" data-link-text="Mozilla">{{ ftl('footer-mozilla') }}</a>
+        <a href="{{ url('mozorg.home') }}" data-link-position="footer" data-link-text="Mozilla">{{ ftl('footer-mozilla') }}</a>
       </div>
       <div class="mzp-c-footer-sections">
         <section class="mzp-c-footer-section">
@@ -21,13 +21,13 @@ <h2 class="mzp-c-footer-heading" data-testid="footer-heading-company">
             {{ ftl('footer-company') }}
           </h2>
           <ul class="mzp-c-footer-list" data-testid="footer-list-company">
-            <li><a href="{{ url('mozorg.about.manifesto') }}" data-link-type="footer" data-link-text="Mozilla Manifesto">{{ ftl('footer-mozilla-manifesto') }}</a></li>
-            <li><a href="https://blog.mozilla.org/category/mozilla/news/?{{ utm_params }}&utm_content=company" data-link-type="footer" data-link-text="Press Center">{{ ftl('footer-press-center') }}</a></li>
-            <li><a href="https://blog.mozilla.org/?{{ utm_params }}&utm_content=company" data-link-type="footer" data-link-text="Mozilla Blog">{{ ftl('footer-mozilla-blog', fallback='footer-corporate-blog') }}</a></li>
-            <li><a href="{{ url('careers.home') }}" data-link-type="footer" data-link-text="Careers">{{ ftl('footer-careers') }}</a></li>
-            <li><a href="{{ url('mozorg.contact.contact-landing') }}" data-link-type="footer" data-link-text="Contact">{{ ftl('footer-contact') }}</a></li>
+            <li><a href="{{ url('mozorg.about.manifesto') }}" data-link-position="footer" data-link-text="Mozilla Manifesto">{{ ftl('footer-mozilla-manifesto') }}</a></li>
+            <li><a href="https://blog.mozilla.org/category/mozilla/news/?{{ utm_params }}&utm_content=company" data-link-position="footer" data-link-text="Press Center">{{ ftl('footer-press-center') }}</a></li>
+            <li><a href="https://blog.mozilla.org/?{{ utm_params }}&utm_content=company" data-link-position="footer" data-link-text="Mozilla Blog">{{ ftl('footer-mozilla-blog', fallback='footer-corporate-blog') }}</a></li>
+            <li><a href="{{ url('careers.home') }}" data-link-position="footer" data-link-text="Careers">{{ ftl('footer-careers') }}</a></li>
+            <li><a href="{{ url('mozorg.contact.contact-landing') }}" data-link-position="footer" data-link-text="Contact">{{ ftl('footer-contact') }}</a></li>
             <li>
-              <a class="mzp-c-button mzp-t-dark mzp-t-secondary footer-donate" href="{{ donate_url(location='moco-donate-footer') }}" data-link-type="button" data-link-text="Donate">
+              <a class="mzp-c-button mzp-t-dark mzp-t-secondary footer-donate" href="{{ donate_url(location='moco-donate-footer') }}" data-link-text="Donate">
                 <span class="mzp-c-button-icon-start">
                   <svg width="16" height="16" viewBox="0 0 16 16">
                     <path fill="#fff" d="M1.2,2.2c-1.5,1.5-1.5,4.2,0,5.7L8,15c2.3-2.4,4.5-4.7,6.9-7c1.5-1.5,1.5-4.2,0-5.7c-1.5-1.5-4-1.5-5.6,0L8,3.5 L6.7,2.3C5.1,0.6,2.7,0.6,1.2,2.2"/>
@@ -38,7 +38,7 @@ <h2 class="mzp-c-footer-heading" data-testid="footer-heading-company">
             </li>
           {% if LANG == "de" %}
             {# Legal requirement in Germany see issue #14240 #}
-            <li><a href="{{ url('legal.impressum') }}" data-link-type="footer" data-link-text="Impressum">Impressum</a></li>
+            <li><a href="{{ url('legal.impressum') }}" data-link-position="footer" data-link-text="Impressum">Impressum</a></li>
           {% endif %}
           </ul>
         </section>
@@ -48,11 +48,11 @@ <h2 class="mzp-c-footer-heading" data-testid="footer-heading-resources">
             {{ ftl('footer-resources') }}
           </h2>
           <ul class="mzp-c-footer-list" data-testid="footer-list-resources">
-            <li><a href="{{ url('privacy') }}" data-link-type="footer" data-link-text="Privacy Hub">{{ ftl('footer-privacy-hub', fallback='footer-privacy') }}</a></li>
-          {% if ftl_has_messages('footer-advertise') %}
-            <li><a href="{{ url('mozorg.advertising.landing') }}" data-link-type="footer" data-link-text="Advertise with Mozilla">{{ ftl('footer-advertise') }}</a></li>
-          {% endif %}
-            <li><a href="https://mozilla.design/?{{ utm_params }}&utm_content=resources" data-link-type="footer" data-link-text="Brand Standards">{{ ftl('footer-brand-standards') }}</a></li>
+            <li><a href="{{ url('privacy') }}" data-link-position="footer" data-link-text="Privacy Hub">{{ ftl('footer-privacy-hub', fallback='footer-privacy') }}</a></li>
+            {% if ftl_has_messages('footer-advertise') %}
+              <li><a href="{{ url('mozorg.advertising.landing') }}" data-link-position="footer" data-link-text="Advertise with Mozilla">{{ ftl('footer-advertise') }}</a></li>
+            {% endif %}
+            <li><a href="https://mozilla.design/?{{ utm_params }}&utm_content=resources" data-link-position="footer" data-link-text="Brand Standards">{{ ftl('footer-brand-standards') }}</a></li>
           </ul>
         </section>
 
@@ -61,9 +61,9 @@ <h2 class="mzp-c-footer-heading" data-testid="footer-heading-support">
             {{ ftl('footer-support') }}
           </h2>
           <ul class="mzp-c-footer-list" data-testid="footer-list-support">
-            <li><a href="https://support.mozilla.org/?{{ utm_params }}&utm_content=support" data-link-type="footer" data-link-text="Product Help">{{ ftl('footer-product-help', fallback='footer-support') }}</a></li>
-            <li><a href="https://bugzilla.mozilla.org/?{{ utm_params }}&utm_content=support" data-link-type="footer" data-link-text="File a Bug">{{ ftl('footer-file-a-bug') }}</a></li>
-            <li><a href="https://pontoon.mozilla.org/?{{ utm_params }}&utm_content=support" data-link-type="footer" data-link-text="Localise Mozilla">{{ ftl('footer-localize-mozilla') }}</a></li>
+            <li><a href="https://support.mozilla.org/?{{ utm_params }}&utm_content=support" data-link-position="footer" data-link-text="Product Help">{{ ftl('footer-product-help', fallback='footer-support') }}</a></li>
+            <li><a href="https://bugzilla.mozilla.org/?{{ utm_params }}&utm_content=support" data-link-position="footer" data-link-text="File a Bug">{{ ftl('footer-file-a-bug') }}</a></li>
+            <li><a href="https://pontoon.mozilla.org/?{{ utm_params }}&utm_content=support" data-link-position="footer" data-link-text="Localise Mozilla">{{ ftl('footer-localize-mozilla') }}</a></li>
           </ul>
         </section>
 
@@ -72,31 +72,31 @@ <h2 class="mzp-c-footer-heading" data-testid="footer-heading-developers">
             {{ ftl('footer-developers') }}
           </h2>
           <ul class="mzp-c-footer-list" data-testid="footer-list-developers">
-            <li><a href="{{ url('firefox.developer.index') }}" data-link-type="footer" data-link-text="Firefox Developer Edition">{{ ftl('footer-developer-edition') }}</a></li>
-            <li><a href="{{ url('firefox.channel.desktop') }}#beta" data-link-type="footer" data-link-text="Firefox Beta">{{ ftl('footer-beta') }}</a></li>
-            <li><a href="{{ url('firefox.channel.android') }}#beta" data-link-type="footer" data-link-text="Firefox Beta for Android">{{ ftl('footer-beta-for-android') }}</a></li>
-            <li><a href="{{ url('firefox.channel.desktop') }}#nightly" data-link-type="footer" data-link-text="Firefox Nightly">{{ ftl('footer-nightly') }}</a></li>
-            <li><a href="{{ url('firefox.channel.android') }}#nightly" data-link-type="footer" data-link-text="Firefox Nightly for Android">{{ ftl('footer-nightly-for-android') }}</a></li>
-            <li><a href="{{ url('firefox.enterprise.index') }}" data-link-type="footer" data-link-text="Firefox for Enterprise">{{ ftl('footer-enterprise') }}</a></li>
-            <li><a href="https://firefox-source-docs.mozilla.org/devtools-user/?{{ utm_params }}&utm_content=developers" rel="external" data-link-type="footer" data-link-text="Tools">{{ ftl('footer-tools') }}</a></li>
+            <li><a href="{{ url('firefox.developer.index') }}" data-link-position="footer" data-link-text="Firefox Developer Edition">{{ ftl('footer-developer-edition') }}</a></li>
+            <li><a href="{{ url('firefox.channel.desktop') }}#beta" data-link-position="footer" data-link-text="Firefox Beta">{{ ftl('footer-beta') }}</a></li>
+            <li><a href="{{ url('firefox.channel.android') }}#beta" data-link-position="footer" data-link-text="Firefox Beta for Android">{{ ftl('footer-beta-for-android') }}</a></li>
+            <li><a href="{{ url('firefox.channel.desktop') }}#nightly" data-link-position="footer" data-link-text="Firefox Nightly">{{ ftl('footer-nightly') }}</a></li>
+            <li><a href="{{ url('firefox.channel.android') }}#nightly" data-link-position="footer" data-link-text="Firefox Nightly for Android">{{ ftl('footer-nightly-for-android') }}</a></li>
+            <li><a href="{{ url('firefox.enterprise.index') }}" data-link-position="footer" data-link-text="Firefox for Enterprise">{{ ftl('footer-enterprise') }}</a></li>
+            <li><a href="https://firefox-source-docs.mozilla.org/devtools-user/?{{ utm_params }}&utm_content=developers" rel="external" data-link-position="footer" data-link-text="Tools">{{ ftl('footer-tools') }}</a></li>
           </ul>
         </section>
 
         <section class="mzp-c-footer-section">
           <h2 class="mzp-c-footer-heading-social">{{ ftl('footer-follow-mozilla') }}</h2>
           <ul class="mzp-c-footer-links-social">
-            <li><a class="twitter" href="{{ mozilla_twitter_url() }}" data-link-type="footer" data-link-text="Twitter (@mozilla)">{{ ftl('footer-x-formerly-twitter', fallback='footer-twitter') }}<span> (@mozilla)</span></a></li>
-            <li><a class="instagram" href="{{ mozilla_instagram_url() }}" data-link-type="footer" data-link-text="Instagram (@mozilla)">{{ ftl('footer-instagram') }}<span> (@mozilla)</span></a></li>
-            <li><a class="linkedin" href="https://www.linkedin.com/company/mozilla-corporation/" data-link-type="footer" data-link-text="LinkedIn (@mozilla)">{{ ftl('footer-linkedin') }}<span> (@mozilla)</span></a></li>
-            <li><a class="tiktok" href="https://www.tiktok.com/@mozilla" data-link-type="footer" data-link-text="TikTok (@mozilla)">{{ ftl('footer-tiktok') }}<span> (@mozilla)</span></a></li>
-            <li><a class="spotify" href="https://open.spotify.com/show/0vT7LJMeVDxyQ2ZamHKu08?si=_uDRD6bRR_6M5YZyISGXgA" data-link-type="footer" data-link-text="Spotify (@mozilla)">{{ ftl('footer-spotify') }}<span> (@mozilla)</span></a></li>
+            <li><a class="twitter" href="{{ mozilla_twitter_url() }}" data-link-position="footer" data-link-text="Twitter (@mozilla)">{{ ftl('footer-x-formerly-twitter', fallback='footer-twitter') }}<span> (@mozilla)</span></a></li>
+            <li><a class="instagram" href="{{ mozilla_instagram_url() }}" data-link-position="footer" data-link-text="Instagram (@mozilla)">{{ ftl('footer-instagram') }}<span> (@mozilla)</span></a></li>
+            <li><a class="linkedin" href="https://www.linkedin.com/company/mozilla-corporation/" data-link-position="footer" data-link-text="LinkedIn (@mozilla)">{{ ftl('footer-linkedin') }}<span> (@mozilla)</span></a></li>
+            <li><a class="tiktok" href="https://www.tiktok.com/@mozilla" data-link-position="footer" data-link-text="TikTok (@mozilla)">{{ ftl('footer-tiktok') }}<span> (@mozilla)</span></a></li>
+            <li><a class="spotify" href="https://open.spotify.com/show/0vT7LJMeVDxyQ2ZamHKu08?si=_uDRD6bRR_6M5YZyISGXgA" data-link-position="footer" data-link-text="Spotify (@mozilla)">{{ ftl('footer-spotify') }}<span> (@mozilla)</span></a></li>
           </ul>
 
           <h2 class="mzp-c-footer-heading-social">{{ ftl('footer-follow-firefox') }}</h2>
           <ul class="mzp-c-footer-links-social">
-            <li><a class="twitter" href="{{ firefox_twitter_url() }}" data-link-type="footer" data-link-text="Twitter (@firefox)">{{ ftl('footer-x-formerly-twitter', fallback='footer-twitter') }}<span> (@firefox)</span></a></li>
-            <li><a class="instagram" href="https://www.instagram.com/firefox/" data-link-type="footer" data-link-text="Instagram (@firefox)">{{ ftl('footer-instagram') }}<span> (@firefox)</span></a></li>
-            <li><a class="youtube" href="https://www.youtube.com/user/firefoxchannel" data-link-type="footer" data-link-text="YouTube (@firefoxchannel)">{{ ftl('footer-youtube') }}<span> (@firefoxchannel)</span></a></li>
+            <li><a class="twitter" href="{{ firefox_twitter_url() }}" data-link-position="footer" data-link-text="Twitter (@firefox)">{{ ftl('footer-x-formerly-twitter', fallback='footer-twitter') }}<span> (@firefox)</span></a></li>
+            <li><a class="instagram" href="https://www.instagram.com/firefox/" data-link-position="footer" data-link-text="Instagram (@firefox)">{{ ftl('footer-instagram') }}<span> (@firefox)</span></a></li>
+            <li><a class="youtube" href="https://www.youtube.com/user/firefoxchannel" data-link-position="footer" data-link-text="YouTube (@firefoxchannel)">{{ ftl('footer-youtube') }}<span> (@firefoxchannel)</span></a></li>
           </ul>
         </section>
       </div>
@@ -107,20 +107,20 @@ <h2 class="mzp-c-footer-heading-social">{{ ftl('footer-follow-firefox') }}</h2>
       </div>
       <div class="mzp-c-footer-legal">
         <ul class="mzp-c-footer-terms">
-          <li><a href="{{ url('privacy.notices.websites') }}" data-link-type="footer" data-link-text="Privacy">{{ ftl('footer-websites-privacy-notice') }}</a></li>
+          <li><a href="{{ url('privacy.notices.websites') }}" data-link-position="footer" data-link-text="Privacy">{{ ftl('footer-websites-privacy-notice') }}</a></li>
           <li>
             {# Link to /privacy/websites/cookie-settings/ is a legal requirement and should not be removed. It must be present on every page (Issue 14213). #}
-            <a href="{{ url('privacy.cookie-settings') }}" data-link-type="footer" data-link-text="Cookies">{{ ftl('footer-websites-cookies') }}</a>
+            <a href="{{ url('privacy.cookie-settings') }}" data-link-position="footer" data-link-text="Cookies">{{ ftl('footer-websites-cookies') }}</a>
           </li>
-          <li><a href="{{ url('legal.index') }}" data-link-type="footer" data-link-text="Legal">{{ ftl('footer-websites-legal') }}</a></li>
-          <li><a href="{{ url('mozorg.about.governance.policies.participation') }}" data-link-type="footer" data-link-text="Community Participation Guidelines">{{ ftl('footer-community-participation-guidelines') }}</a></li>
+          <li><a href="{{ url('legal.index') }}" data-link-position="footer" data-link-text="Legal">{{ ftl('footer-websites-legal') }}</a></li>
+          <li><a href="{{ url('mozorg.about.governance.policies.participation') }}" data-link-position="footer" data-link-text="Community Participation Guidelines">{{ ftl('footer-community-participation-guidelines') }}</a></li>
           {% if ftl_has_messages('footer-about-this-site') %}
-            <li><a href="{{ url('mozorg.about.this-site') }}" data-link-type="footer" data-link-text="About this site">{{ ftl('footer-about-this-site') }}</a></li>
+            <li><a href="{{ url('mozorg.about.this-site') }}" data-link-position="footer" data-link-text="About this site">{{ ftl('footer-about-this-site') }}</a></li>
           {% endif %}
         </ul>
         <p class="mzp-c-footer-license" rel="license">
-          {% set moco_link = 'href="%s" data-link-type="footer" data-link-text="Mozilla Corporation"'|safe|format(url('mozorg.home')) %}
-          {% set mofo_link = 'href="https://foundation.mozilla.org/?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=footer" rel="external noopener" data-link-type="footer" data-link-text="Mozilla Foundation"'|safe %}
+          {% set moco_link = 'href="%s" data-link-position="footer" data-link-text="Mozilla Corporation"'|safe|format(url('mozorg.home')) %}
+          {% set mofo_link = 'href="https://foundation.mozilla.org/?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=footer" rel="external noopener" data-link-position="footer" data-link-text="Mozilla Foundation"'|safe %}
           {{ ftl('footer-visit-mozilla-corporations', moco_link=moco_link, mofo_link=mofo_link) }}<br>
           {{ ftl('footer-portions-of-this-content', url=url('foundation.licensing.website-content'), current_year=current_year|string) }}
         </p>
diff --git a/bedrock/base/templates/includes/protocol/navigation/menus-refresh/about-us.html b/bedrock/base/templates/includes/protocol/navigation/menus-refresh/about-us.html
index 377c3654f7a..2f856bbc152 100644
--- a/bedrock/base/templates/includes/protocol/navigation/menus-refresh/about-us.html
+++ b/bedrock/base/templates/includes/protocol/navigation/menus-refresh/about-us.html
@@ -13,42 +13,42 @@
          <ul class="mzp-l-content">
           <li>
             <section class="c-menu-item">
-              <a class="c-menu-item-link" href="{{ url('mozorg.about.index') }}" data-link-text="About us" data-link-type="nav" data-link-position="topnav" data-link-group="about-us">
+              <a class="c-menu-item-link" href="{{ url('mozorg.about.index') }}" data-link-text="About us" data-link-position="topnav - about">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-about-us') }}</h4>
               </a>
             </section>
           </li>
           <li>
             <section class="c-menu-item">
-              <a class="c-menu-item-link" href="{{ url('mozorg.about.manifesto') }}" data-link-text="Mozilla manifesto" data-link-type="nav" data-link-position="topnav" data-link-group="about-us">
+              <a class="c-menu-item-link" href="{{ url('mozorg.about.manifesto') }}" data-link-text="Mozilla manifesto" data-link-position="topnav - about">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-mozilla-manifesto') }}</h4>
               </a>
             </section>
           </li>
           <li>
             <section class="c-menu-item">
-              <a class="c-menu-item-link" href="https://foundation.mozilla.org/?{{ utm_params }}" data-link-text="Mozilla Foundation" data-link-type="nav" data-link-position="topnav" data-link-group="about-us">
+              <a class="c-menu-item-link" href="https://foundation.mozilla.org/?{{ utm_params }}" data-link-text="Mozilla Foundation" data-link-position="topnav - about">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-mozilla-foundation') }}</h4>
               </a>
             </section>
           </li>
           <li>
             <section class="c-menu-item">
-              <a class="c-menu-item-link" href="{{ url('mozorg.contribute') }}" data-link-text="Get Involved" data-link-type="nav" data-link-position="topnav" data-link-group="about-us">
+              <a class="c-menu-item-link" href="{{ url('mozorg.contribute') }}" data-link-text="Get Involved" data-link-position="topnav - about">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-get-involved') }}</h4>
               </a>
             </section>
           </li>
           <li>
             <section class="c-menu-item">
-              <a class="c-menu-item-link" href="https://future.mozilla.org/?{{ utm_params }}" data-link-text="Mozilla Innovation Projects" data-link-type="nav" data-link-position="topnav" data-link-group="about-us">
+              <a class="c-menu-item-link" href="https://future.mozilla.org/?{{ utm_params }}" data-link-text="Mozilla Innovation Projects" data-link-position="topnav - about">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-innovation-projects') }}</h4>
               </a>
             </section>
           </li>
           <li>
             <section class="c-menu-item">
-              <a class="c-menu-item-link" href="https://blog.mozilla.org/?{{ utm_params }}" data-link-text="Blog" data-link-type="nav" data-link-position="topnav" data-link-group="about-us">
+              <a class="c-menu-item-link" href="https://blog.mozilla.org/?{{ utm_params }}" data-link-text="Blog" data-link-position="topnav - about">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-blog') }}</h4>
               </a>
             </section>
diff --git a/bedrock/base/templates/includes/protocol/navigation/menus-refresh/firefox.html b/bedrock/base/templates/includes/protocol/navigation/menus-refresh/firefox.html
index 51ef8770caf..5fba6df803c 100644
--- a/bedrock/base/templates/includes/protocol/navigation/menus-refresh/firefox.html
+++ b/bedrock/base/templates/includes/protocol/navigation/menus-refresh/firefox.html
@@ -18,7 +18,7 @@
         <ul class="mzp-l-content">
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="{{ url('firefox.new') }}" data-link-text="Firefox Desktop Browser" data-link-type="nav" data-link-position="topnav" data-link-group="firefox" data-testid="navigation-menu-link-firefox-desktop">
+              <a class="c-menu-item-link" href="{{ url('firefox.new') }}" data-link-text="Firefox Desktop Browser" data-link-position="topnav - firefox" data-testid="navigation-menu-link-firefox-desktop">
                 <img loading="lazy" src="{{ static('protocol/img/logos/firefox/browser/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-firefox-for-desktop') }}</h4>
               </a>
@@ -26,7 +26,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-firefox-for-desktop') }
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.ios') }}" data-link-text="Firefox for iOS" data-link-type="nav" data-link-position="topnav" data-link-group="firefox">
+              <a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.ios') }}" data-link-text="Firefox for iOS" data-link-position="topnav - firefox">
                 <img loading="lazy" src="{{ static('protocol/img/logos/firefox/browser/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-firefox-for-ios') }}</h4>
               </a>
@@ -34,7 +34,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-firefox-for-ios') }}</h
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.android') }}" data-link-text="Firefox for Android" data-link-type="nav" data-link-position="topnav" data-link-group="firefox">
+              <a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.android') }}" data-link-text="Firefox for Android" data-link-position="topnav - firefox">
                 <img loading="lazy" src="{{ static('protocol/img/logos/firefox/browser/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-firefox-for-android') }}</h4>
               </a>
@@ -42,7 +42,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-firefox-for-android') }
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.focus') }}" data-link-text="Firefox Focus" data-link-type="nav" data-link-position="topnav" data-link-group="firefox">
+              <a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.focus') }}" data-link-text="Firefox Focus" data-link-position="topnav - firefox">
                 <img loading="lazy" src="{{ static('protocol/img/logos/firefox/browser/focus/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-firefox-focus') }}</h4>
               </a>
@@ -50,7 +50,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-firefox-focus') }}</h4>
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="https://blog.mozilla.org/firefox/?{{ utm_params }}" data-link-text="Firefox Blog" data-link-type="nav" data-link-position="topnav" data-link-group="firefox">
+              <a class="c-menu-item-link" href="https://blog.mozilla.org/firefox/?{{ utm_params }}" data-link-text="Firefox Blog" data-link-position="topnav - firefox">
                 <svg class="c-menu-item-icon" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path fill="#42435a" d="M21.1 7.5c-.2-.2-.2-.5 0-.7l.5-.5c.8-.8 2.1-.8 2.9 0l1.2 1.2c.8.8.8 2.1 0 2.9l-.5.5c-.2.2-.5.2-.7 0l-3.4-3.4zm2.3 4.5c.2.2.2.5 0 .7L12.7 23.4c-.2.2-.4.3-.6.4l-5.7 2.4c-.3.1-.6 0-.7-.3-.1-.1-.1-.3 0-.4L8.1 20c.1-.2.3-.5.4-.6L19.2 8.6c.2-.2.5-.2.7 0l3.5 3.4zM11.5 22.7l-3.9 1.7 1.7-3.9c0-.1.1-.2.2-.2l2.3 2.3c-.1 0-.2.1-.3.1z"></path></svg>
                 <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-firefox-blog') }}</h4>
               </a>
diff --git a/bedrock/base/templates/includes/protocol/navigation/menus-refresh/products.html b/bedrock/base/templates/includes/protocol/navigation/menus-refresh/products.html
index 085b78af9cf..4fd765d315d 100644
--- a/bedrock/base/templates/includes/protocol/navigation/menus-refresh/products.html
+++ b/bedrock/base/templates/includes/protocol/navigation/menus-refresh/products.html
@@ -15,7 +15,7 @@
         <ul class="mzp-l-content">
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="{{ url('products.vpn.landing') }}" data-link-text="Mozilla VPN" data-link-type="nav" data-link-position="topnav" data-link-group="products">
+              <a class="c-menu-item-link" href="{{ url('products.vpn.landing') }}" data-link-text="Mozilla VPN" data-link-position="topnav - products">
                 <img loading="lazy" src="{{ static('protocol/img/logos/mozilla/vpn/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-mozilla-vpn') }}</h4>
               </a>
@@ -23,7 +23,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-mozilla-vpn') }}</h4>
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="https://monitor.mozilla.org/?{{ utm_params }}" data-link-text="Mozilla Monitor" data-link-type="nav" data-link-position="topnav" data-link-group="products">
+              <a class="c-menu-item-link" href="https://monitor.mozilla.org/?{{ utm_params }}" data-link-text="Mozilla Monitor" data-link-position="topnav - products">
                 <img loading="lazy" src="{{ static('protocol/img/logos/firefox/monitor/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-mozilla-monitor') }}</h4>
               </a>
@@ -31,7 +31,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-mozilla-monitor') }}</h
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="https://relay.firefox.com/?{{ utm_params }}" data-link-text="Firefox Relay" data-link-type="nav" data-link-position="topnav" data-link-group="products">
+              <a class="c-menu-item-link" href="https://relay.firefox.com/?{{ utm_params }}" data-link-text="Firefox Relay" data-link-position="topnav - products">
                 <img loading="lazy" src="{{ static('protocol/img/logos/firefox/relay/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-firefox-relay') }}</h4>
               </a>
@@ -39,7 +39,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-firefox-relay') }}</h4>
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="https://getpocket.com/firefox_learnmore/?{{ utm_params }}" data-link-text="Pocket" data-link-type="nav" data-link-position="topnav" data-link-group="products">
+              <a class="c-menu-item-link" href="https://getpocket.com/firefox_learnmore/?{{ utm_params }}" data-link-text="Pocket" data-link-position="topnav - products">
                 <img loading="lazy" src="{{ static('protocol/img/logos/pocket/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-pocket') }}</h4>
               </a>
@@ -47,7 +47,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-pocket') }}</h4>
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="https://developer.mozilla.org/plus?{{ utm_params }}" data-link-text="MDN Plus" data-link-type="nav" data-link-position="topnav" data-link-group="products">
+              <a class="c-menu-item-link" href="https://developer.mozilla.org/plus?{{ utm_params }}" data-link-text="MDN Plus" data-link-position="topnav - products">
                 <img loading="lazy" src="{{ static('img/nav/icons/icon-mdn-plus.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-mdn-plus') }}</h4>
               </a>
@@ -55,7 +55,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-mdn-plus') }}</h4>
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="https://fakespot.com/?{{ utm_params }}" data-link-text="Fakespot" data-link-type="nav" data-link-position="topnav" data-link-group="projects">
+              <a class="c-menu-item-link" href="https://fakespot.com/?{{ utm_params }}" data-link-text="Fakespot" data-link-position="topnav - products">
                 <img loading="lazy" src="{{ static('img/logos/fakespot/logo-blue.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-fakespot') }}</h4>
               </a>
@@ -63,7 +63,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-fakespot') }}</h4>
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="https://www.thunderbird.net/{{ referrals }}" data-link-text="Thunderbird" data-link-type="nav" data-link-position="topnav" data-link-group="products">
+              <a class="c-menu-item-link" href="https://www.thunderbird.net/{{ referrals }}" data-link-text="Thunderbird" data-link-position="topnav - products">
                 <img loading="lazy" src="{{ static('img/logos/thunderbird/logo-thunderbird.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-thunderbird') }}</h4>
               </a>
@@ -71,7 +71,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-refresh-thunderbird') }}</h4>
           </li>
         </ul>
         <p class="c-menu-category-link">
-          <a href="{{ url('products.landing') }}" data-link-text="Go to all browsers and products" data-link-type="nav" data-link-position="topnav" data-link-group="firefox">
+          <a href="{{ url('products.landing') }}" data-link-text="Go to all browsers and products" data-link-position="topnav - products">
             {{ ftl('navigation-refresh-all-products') }}
             <svg fill="none" height="24" width="24" xmlns="http://www.w3.org/2000/svg"><clipPath id="a"><path d="M0 0h24v24H0z"/></clipPath><g clip-path="url(#a)"><path d="M10.45 10.789v1.806H5V10.79zm8.55.903L10.45 4.5v6.289h1.806v-2.41l3.938 3.313-3.938 3.312v-2.409H10.45v6.289z" fill="#fff"/></g></svg>
           </a>
diff --git a/bedrock/base/templates/includes/protocol/navigation/menus/firefox.html b/bedrock/base/templates/includes/protocol/navigation/menus/firefox.html
index b87e73963d6..5e86dba43f7 100644
--- a/bedrock/base/templates/includes/protocol/navigation/menus/firefox.html
+++ b/bedrock/base/templates/includes/protocol/navigation/menus/firefox.html
@@ -15,7 +15,7 @@
         <ul class="mzp-l-rows-three">
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="{{ url('firefox.new') }}" data-link-text="Firefox Desktop Browser" data-link-type="nav" data-link-position="topnav" data-link-group="firefox" data-testid="navigation-menu-link-firefox-desktop">
+              <a class="c-menu-item-link" href="{{ url('firefox.new') }}" data-link-text="Firefox Desktop Browser" data-link-position="topnav - firefox" data-testid="navigation-menu-link-firefox-desktop">
                 <img loading="lazy" src="{{ static('protocol/img/logos/firefox/browser/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-for-desktop', fallback='navigation-firefox-browser-for-desktop') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-v2-get-the-not-for-profit-backed', fallback='navigation-get-the-browser-that-respects') }}</p>
@@ -25,7 +25,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-for-desktop', fallba
         {% if ftl_has_messages('navigation-v2-firefox-for-ios', 'navigation-v2-firefox-for-android') %}
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.android') }}" data-link-text="Firefox for Android" data-link-type="nav" data-link-position="topnav" data-link-group="firefox">
+              <a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.android') }}" data-link-text="Firefox for Android" data-link-position="topnav - firefox">
                 <img loading="lazy" src="{{ static('protocol/img/logos/firefox/browser/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-for-android') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-v2-get-the-customizable-mobile') }}</p>
@@ -34,7 +34,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-for-android') }}</h4
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.ios') }}" data-link-text="Firefox for iOS" data-link-type="nav" data-link-position="topnav" data-link-group="firefox">
+              <a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.ios') }}" data-link-text="Firefox for iOS" data-link-position="topnav - firefox">
                 <img loading="lazy" src="{{ static('protocol/img/logos/firefox/browser/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-for-ios') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-v2-get-the-mobile-browser') }}</p>
@@ -44,7 +44,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-for-ios') }}</h4>
         {% else %}
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.index') }}" data-link-text="Firefox for Mobile" data-link-type="nav" data-link-position="topnav" data-link-group="firefox">
+              <a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.index') }}" data-link-text="Firefox for Mobile" data-link-position="topnav - firefox">
                 <img loading="lazy" src="{{ static('protocol/img/logos/firefox/browser/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-firefox-browser-for-mobile') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-take-speed-privacy-and') }}</p>
@@ -54,7 +54,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-firefox-browser-for-mobile') }}
         {% endif %}
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.focus') }}" data-link-text="Firefox Focus" data-link-type="nav" data-link-position="topnav" data-link-group="firefox">
+              <a class="c-menu-item-link" href="{{ url('firefox.browsers.mobile.focus') }}" data-link-text="Firefox Focus" data-link-position="topnav - firefox">
                 <img loading="lazy" src="{{ static('protocol/img/logos/firefox/browser/focus/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-focus') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-v2-simply-private-mobile') }}</p>
@@ -63,7 +63,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-focus') }}</h4>
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="https://blog.mozilla.org/firefox/?{{ utm_params }}" data-link-text="Firefox Blog" data-link-type="nav" data-link-position="topnav" data-link-group="firefox">
+              <a class="c-menu-item-link" href="https://blog.mozilla.org/firefox/?{{ utm_params }}" data-link-text="Firefox Blog" data-link-position="topnav - firefox">
                 <svg class="c-menu-item-icon" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path fill="#42435a" d="M21.1 7.5c-.2-.2-.2-.5 0-.7l.5-.5c.8-.8 2.1-.8 2.9 0l1.2 1.2c.8.8.8 2.1 0 2.9l-.5.5c-.2.2-.5.2-.7 0l-3.4-3.4zm2.3 4.5c.2.2.2.5 0 .7L12.7 23.4c-.2.2-.4.3-.6.4l-5.7 2.4c-.3.1-.6 0-.7-.3-.1-.1-.1-.3 0-.4L8.1 20c.1-.2.3-.5.4-.6L19.2 8.6c.2-.2.5-.2.7 0l3.5 3.4zM11.5 22.7l-3.9 1.7 1.7-3.9c0-.1.1-.2.2-.2l2.3 2.3c-.1 0-.2.1-.3.1z"></path></svg>
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-blog') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-v2-read-about-new-firefox-features', fallback='navigation-read-about-new-firefox') }}</p>
@@ -72,7 +72,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-blog') }}</h4>
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="/firefox/{{ latest_firefox_version }}/releasenotes/" data-link-text="Release Notes" data-link-type="nav" data-link-position="topnav" data-link-group="firefox">
+              <a class="c-menu-item-link" href="/firefox/{{ latest_firefox_version }}/releasenotes/" data-link-text="Release Notes" data-link-position="topnav - firefox">
                 <svg class="c-menu-item-icon" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path fill="#42435a" d="M2.7 23.6c0 2.4 2 4.4 4.4 4.4h5.6c1.4 0 2.3.5 3.3 1.5 1-1 2-1.5 3.3-1.5h5.6c2.4 0 4.4-2 4.4-4.4V8.4c0-2.4-2-4.4-4.4-4.4h-5.6C18 4 17 4.2 16 5.2c-1-1-2-1.2-3.3-1.2H7.1C4.6 4 2.7 6 2.7 8.4v15.2zm24 0c0 1-.8 1.7-1.7 1.7h-5.6c-1.3 0-2.3.2-3.3 1.2-1-1-2-1.2-3.3-1.2H7.1c-1 0-1.7-.8-1.7-1.7V8.4c0-1 .8-1.7 1.7-1.7h5.6c1.3 0 2.3.5 3.3 1.5 1-1 2-1.5 3.3-1.5h5.6c1 0 1.7.8 1.7 1.7v15.2zM13.3 10.7H8c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7h5.3c.4 0 .7.3.7.7 0 .4-.3.7-.7.7zm-5.3 4h5.3c.4 0 .7-.3.7-.7s-.3-.7-.7-.7H8c-.4 0-.7.3-.7.7s.3.7.7.7zm5.3 4H8c-.4 0-.7-.3-.7-.7s.3-.7.7-.7h5.3c.4 0 .7.3.7.7s-.3.7-.7.7zm-5.3 4h3.4c.4 0 .7-.3.7-.7s-.3-.7-.7-.7H8c-.4 0-.7.3-.7.7s.3.7.7.7z"></path></svg>
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-release-notes', fallback='navigation-release-notes') }}</h4>
               {% if ftl_has_messages('navigation-v2-get-the-details-on-the') %}
@@ -82,7 +82,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-release-notes', fallback='na
             </section>
           </li>
         </ul>
-        <p class="c-menu-category-link"><a href="{{ url('firefox') }}" data-link-text="View all Firefox Browsers" data-link-type="nav" data-link-position="topnav" data-link-group="firefox">{{ ftl('navigation-v2-view-all-firefox-browsers') }}</a></p>
+        <p class="c-menu-category-link"><a href="{{ url('firefox') }}" data-link-text="View all Firefox Browsers" data-link-position="topnav - firefox">{{ ftl('navigation-v2-view-all-firefox-browsers') }}</a></p>
       </div>
     </div><!-- close .c-menu-panel-container -->
   </div><!-- close .c-menu-panel -->
diff --git a/bedrock/base/templates/includes/protocol/navigation/menus/innovation.html b/bedrock/base/templates/includes/protocol/navigation/menus/innovation.html
index fd7e2e14aea..fa11b398a31 100644
--- a/bedrock/base/templates/includes/protocol/navigation/menus/innovation.html
+++ b/bedrock/base/templates/includes/protocol/navigation/menus/innovation.html
@@ -15,7 +15,7 @@
         <ul class="mzp-l-rows-two">
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="{{ url('firefox.developer.index') }}" data-link-text="Firefox Developer Edition" data-link-type="nav" data-link-position="topnav" data-link-group="innovation">
+              <a class="c-menu-item-link" href="{{ url('firefox.developer.index') }}" data-link-text="Firefox Developer Edition" data-link-position="topnav - innovation">
                 <img loading="lazy" src="{{ static('protocol/img/logos/firefox/browser/developer/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-developer-edition', fallback='navigation-firefox-developer-edition') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-v2-get-the-firefox-browser-built', fallback='navigation-firefox-built-just-for') }}</p>
@@ -24,7 +24,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-developer-edition',
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="https://developer.mozilla.org/?{{ utm_params }}" data-link-text="MDN Web Docs" data-link-type="nav" data-link-position="topnav" data-link-group="innovation">
+              <a class="c-menu-item-link" href="https://developer.mozilla.org/?{{ utm_params }}" data-link-text="MDN Web Docs" data-link-position="topnav - innovation">
                 <img loading="lazy" class="c-menu-item-icon" src="{{ static('img/nav/icons/icon-mdn-web-docs.svg') }}" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-mdn-web-docs') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-v2-check-out-the-home-for-web', fallback='navigation-resources-for-developers') }}</p>
@@ -33,7 +33,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-mdn-web-docs') }}</h4>
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="https://future.mozilla.org/?{{ utm_params }}" data-link-text="Mozilla Innovation Projects" data-link-type="nav" data-link-position="topnav" data-link-group="innovation">
+              <a class="c-menu-item-link" href="https://future.mozilla.org/?{{ utm_params }}" data-link-text="Mozilla Innovation Projects" data-link-position="topnav - innovation">
                 <img loading="lazy" class="c-menu-item-icon" src="{{ static('img/nav/icons/icon-innovation-projects.svg') }}" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-mozilla-innovation-projects') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-v2-discover-ways-to-bring') }}</p>
@@ -42,7 +42,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-mozilla-innovation-projects'
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="https://commonvoice.mozilla.org/?{{ utm_params }}" data-link-text="Common Voice" data-link-type="nav" data-link-position="topnav" data-link-group="innovation">
+              <a class="c-menu-item-link" href="https://commonvoice.mozilla.org/?{{ utm_params }}" data-link-text="Common Voice" data-link-position="topnav - innovation">
                 <img loading="lazy" class="c-menu-item-icon" src="{{ static('img/nav/icons/icon-common-voice.svg') }}" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-common-voice') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-v2-donate-your-voice-so-the-future', fallback='navigation-donate-your-voice-to') }}</p>
diff --git a/bedrock/base/templates/includes/protocol/navigation/menus/products.html b/bedrock/base/templates/includes/protocol/navigation/menus/products.html
index 25e6afead51..03712bb8587 100644
--- a/bedrock/base/templates/includes/protocol/navigation/menus/products.html
+++ b/bedrock/base/templates/includes/protocol/navigation/menus/products.html
@@ -15,7 +15,7 @@
         <ul class="mzp-l-rows-four">
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="https://monitor.mozilla.org/?{{ utm_params }}" data-link-text="Mozilla Monitor" data-link-type="nav" data-link-position="topnav" data-link-group="products">
+              <a class="c-menu-item-link" href="https://monitor.mozilla.org/?{{ utm_params }}" data-link-text="Mozilla Monitor" data-link-position="topnav - products">
                 <img loading="lazy" src="{{ static('protocol/img/logos/firefox/monitor/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-mozilla-monitor') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-v2-see-if-your-email-has', fallback='navigation-see-if-your-personal') }}</p>
@@ -24,7 +24,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-mozilla-monitor') }}</h4>
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="{{ url('firefox.facebookcontainer.index') }}" data-link-text="Facebook Container" data-link-type="nav" data-link-position="topnav" data-link-group="products">
+              <a class="c-menu-item-link" href="{{ url('firefox.facebookcontainer.index') }}" data-link-text="Facebook Container" data-link-position="topnav - products">
                 <svg class="c-menu-item-icon" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path fill="#f80073" d="M27 1H5C2.8 1 1 2.8 1 5v22c0 2.2 1.8 4 4 4h22c2.2 0 4-1.8 4-4V5c0-2.2-1.8-4-4-4z"></path><path fill="#fff" d="M26 8.8l-1.4-1.4c-.1-.1-.2-.1-.3 0l-1.4 1.4-.1.1v2.8h-2.3V8.9L19 7.4c-.1-.1-.2-.1-.3 0l-1.4 1.4-.1.1v2.8h-2.3V8.9l-1.4-1.4c-.1-.1-.2-.1-.3 0l-1.4 1.4-.1.1v2.8H9.2V8.9L7.8 7.4c-.1-.1-.2-.1-.3 0L6 8.8l-.1.1v15c0 .1.1.2.2.2H9c.1 0 .2-.1.2-.2v-2.8h2.3V24c0 .1.1.2.2.2h2.8c.1 0 .2-.1.2-.2v-2.8H17V24c0 .1.1.2.2.2H20c.1 0 .2-.1.2-.2v-2.8h2.3V24c0 .1.1.2.2.2h2.8c.1 0 .2-.1.2-.2V9c.4-.1.3-.2.3-.2zm-14.7 11H9.2v-6.6h2.3v6.6h-.2zm5.6 0h-2.1v-6.6h2.3v6.6h-.2zm5.7 0h-2.1v-6.6h2.3v6.6h-.2z"></path></svg>
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-facebook-container') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-v2-help-prevent-facebook-from') }}</p>
@@ -33,7 +33,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-facebook-container') }}</h4>
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="https://getpocket.com/firefox_learnmore/?{{ utm_params }}" data-link-text="Pocket" data-link-type="nav" data-link-position="topnav" data-link-group="products">
+              <a class="c-menu-item-link" href="https://getpocket.com/firefox_learnmore/?{{ utm_params }}" data-link-text="Pocket" data-link-position="topnav - products">
                 <img loading="lazy" src="{{ static('protocol/img/logos/pocket/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-pocket') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-v2-save-and-discover-the-best', fallback='navigation-save-quality-content') }}</p>
@@ -42,7 +42,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-pocket') }}</h4>
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="{{ url('products.vpn.landing') }}" data-link-text="Mozilla VPN" data-link-type="nav" data-link-position="topnav" data-link-group="products">
+              <a class="c-menu-item-link" href="{{ url('products.vpn.landing') }}" data-link-text="Mozilla VPN" data-link-position="topnav - products">
                 <img loading="lazy" src="{{ static('protocol/img/logos/mozilla/vpn/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-mozilla-vpn') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-v2-get-protection-beyond-your-browser', fallback='navigation-protect-your-entire-device') }}</p>
@@ -51,7 +51,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-mozilla-vpn') }}</h4>
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="https://relay.firefox.com/?{{ utm_params }}" data-link-text="Firefox Relay" data-link-type="nav" data-link-position="topnav" data-link-group="projects">
+              <a class="c-menu-item-link" href="https://relay.firefox.com/?{{ utm_params }}" data-link-text="Firefox Relay" data-link-position="topnav - projects">
                 <img loading="lazy" src="{{ static('protocol/img/logos/firefox/relay/logo.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-relay', fallback='navigation-v2-firefox-relay-beta') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-v2-sign-up-for-new-accounts') }}</p>
@@ -60,7 +60,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-firefox-relay', fallback='na
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="https://developer.mozilla.org/plus?{{ utm_params }}" data-link-text="MDN Plus" data-link-type="nav" data-link-position="topnav" data-link-group="projects">
+              <a class="c-menu-item-link" href="https://developer.mozilla.org/plus?{{ utm_params }}" data-link-text="MDN Plus" data-link-position="topnav - projects">
                 <img loading="lazy" src="{{ static('img/nav/icons/icon-mdn-plus.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-mdn-plus') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-v2-new-features-and-tools') }}</p>
@@ -69,7 +69,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-mdn-plus') }}</h4>
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="https://fakespot.com/?{{ utm_params }}" data-link-text="Fakespot" data-link-type="nav" data-link-position="topnav" data-link-group="projects">
+              <a class="c-menu-item-link" href="https://fakespot.com/?{{ utm_params }}" data-link-text="Fakespot" data-link-position="topnav - projects">
                 <img loading="lazy" src="{{ static('img/logos/fakespot/logo-blue.svg') }}" class="c-menu-item-icon" width="32" height="32" alt="">
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-fakespot') }}</h4>
               {% if ftl_has_messages('navigation-v2-use-ai-to-detect') %}
@@ -79,7 +79,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-fakespot') }}</h4>
             </section>
           </li>
         </ul>
-        <p class="c-menu-category-link"><a href="{{ url('products.landing') }}" data-link-text="View all Products" data-link-type="nav" data-link-position="topnav" data-link-group="products">{{ ftl('navigation-v2-view-all-products') }}</a></p>
+        <p class="c-menu-category-link"><a href="{{ url('products.landing') }}" data-link-text="View all Products" data-link-position="topnav - products">{{ ftl('navigation-v2-view-all-products') }}</a></p>
       </div>
     </div><!-- close .c-menu-panel-container -->
   </div><!-- close .c-menu-panel -->
diff --git a/bedrock/base/templates/includes/protocol/navigation/menus/whoweare.html b/bedrock/base/templates/includes/protocol/navigation/menus/whoweare.html
index bf4f3f18d47..0646c598a48 100644
--- a/bedrock/base/templates/includes/protocol/navigation/menus/whoweare.html
+++ b/bedrock/base/templates/includes/protocol/navigation/menus/whoweare.html
@@ -15,7 +15,7 @@
         <ul class="mzp-l-rows-four">
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="{{ url('mozorg.about.manifesto') }}" data-link-text="Mozilla Manifesto" data-link-type="nav" data-link-position="topnav" data-link-group="who-we-are">
+              <a class="c-menu-item-link" href="{{ url('mozorg.about.manifesto') }}" data-link-text="Mozilla Manifesto" data-link-position="topnav - who-we-are">
                 <svg class="c-menu-item-icon" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path fill="#42435a" d="M9.5 28.6h13.1c2.6 0 4.6-2.1 4.6-4.6V8.1c0-2.6-2.1-4.6-4.6-4.6H9.5c-2.6 0-4.6 2.1-4.6 4.6V24c-.1 2.5 2 4.6 4.6 4.6zM7.6 8.1c0-1 .8-1.8 1.8-1.8h13.1c1 0 1.8.8 1.8 1.8V24c0 1-.8 1.8-1.8 1.8h-13c-1 0-1.8-.8-1.8-1.8V8.1zm12.6 2.3h-8.4c-.4 0-.7-.3-.7-.7 0-.4.3-.7.7-.7h8.4c.4 0 .7.3.7.7 0 .4-.3.7-.7.7zm-8.4 4.2h8.4c.4 0 .7-.3.7-.7s-.3-.7-.7-.7h-8.4c-.4 0-.7.3-.7.7s.3.7.7.7zm8.4 4.2h-8.4c-.4 0-.7-.3-.7-.7s.3-.7.7-.7h8.4c.4 0 .7.3.7.7s-.3.7-.7.7zM11.8 23h3.6c.4 0 .7-.3.7-.7s-.3-.7-.7-.7h-3.6c-.4 0-.7.3-.7.7s.3.7.7.7z"></path></svg>
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-mozilla-manifesto', fallback='navigation-mozilla-manifesto') }}</h4>
               {% if ftl_has_messages('navigation-v2-learn-about-the-values') %}
@@ -26,7 +26,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-mozilla-manifesto', fallback
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="https://foundation.mozilla.org/?{{ utm_params }}" data-link-text="Mozilla Foundation" data-link-type="nav" data-link-position="topnav" data-link-group="who-we-are">
+              <a class="c-menu-item-link" href="https://foundation.mozilla.org/?{{ utm_params }}" data-link-text="Mozilla Foundation" data-link-position="topnav - who-we-are">
                 <svg class="c-menu-item-icon" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path fill="#42435a" d="M16 9.3V4H2.7v24h26.7V9.3H16zm-8 16H5.3v-2.7H8v2.7zM8 20H5.3v-2.7H8V20zm0-5.3H5.3V12H8v2.7zm0-5.4H5.3V6.7H8v2.6zm5.3 16h-2.7v-2.7h2.7v2.7zm0-5.3h-2.7v-2.7h2.7V20zm0-5.3h-2.7V12h2.7v2.7zm0-5.4h-2.7V6.7h2.7v2.6zm13.4 16H16v-2.7h2.7V20H16v-2.7h2.7v-2.7H16V12h10.7v13.3zM24 14.7h-2.7v2.7H24v-2.7zm0 5.3h-2.7v2.7H24V20z"></path></svg>
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-mozilla-foundation') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-v2-meet-the-not-for-profit-behind', fallback='navigation-the-non-profit-behind') }}</p>
@@ -35,7 +35,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-mozilla-foundation') }}</h4>
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="{{ url('mozorg.about.leadership.index') }}" data-link-text="Leadership" data-link-type="nav" data-link-position="topnav" data-link-group="who-we-are">
+              <a class="c-menu-item-link" href="{{ url('mozorg.about.leadership.index') }}" data-link-text="Leadership" data-link-position="topnav - who-we-are">
                 <svg class="c-menu-item-icon" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path fill="#42435a" d="M22.7 13.9V2.7H9.3v11.2c0 .5.2.9.7 1.1l5.6 3.3-1.3 3.1-4.5.4 3.5 3-1.1 4.4L16 27l3.9 2.4-1-4.4 3.5-3-4.5-.4-1.3-3.1 5.6-3.3c.2-.4.5-.8.5-1.3zm-5.4 2.4l-1.3.8-1.3-.8V4h2.7v12.3z"></path></svg>
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-leadership', fallback='navigation-leadership') }}</h4>
               {% if ftl_has_messages('navigation-v2-meet-the-team-thats-building') %}
@@ -46,7 +46,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-leadership', fallback='navig
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="{{ url('mozorg.contribute') }}" data-link-text="Get Involved" data-link-type="nav" data-link-position="topnav" data-link-group="who-we-are">
+              <a class="c-menu-item-link" href="{{ url('mozorg.contribute') }}" data-link-text="Get Involved" data-link-position="topnav - who-we-are">
                 <svg class="c-menu-item-icon" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path fill="#42435a" d="M12 22.7l4-3.9c-.5-.1-.9-.1-1.3-.1C11.1 18.7 4 20.5 4 24v2.7h12l-4-4zm2.7-6.7c2.9 0 5.3-2.4 5.3-5.3s-2.4-5.3-5.3-5.3-5.3 2.4-5.3 5.3c-.1 2.9 2.3 5.3 5.3 5.3z"></path><path fill="#42435a" d="M20.6 27.3L16 22.7l1.9-1.9 2.8 2.8 6.8-6.9 1.9 1.9-8.8 8.7z"></path></svg>
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-get-involved', fallback='navigation-get-involved') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-v2-join-the-fight-for-a', fallback='navigation-join-the-fight-for-a') }}</p>
@@ -55,7 +55,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-get-involved', fallback='nav
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="{{ url('careers.home') }}" data-link-text="Careers" data-link-type="nav" data-link-position="topnav" data-link-group="who-we-are">
+              <a class="c-menu-item-link" href="{{ url('careers.home') }}" data-link-text="Careers" data-link-position="topnav - who-we-are">
                 <svg class="c-menu-item-icon" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="32" height="32"><path fill="#42435a" d="M13.3 21.3V20H4v5.3C4 26.8 5.2 28 6.7 28h18.7c1.5 0 2.7-1.2 2.7-2.7V20h-9.3v1.3h-5.5zm13.4-12h-5.3V6.7L18.7 4h-5.3l-2.7 2.7v2.7H5.3c-1.5 0-2.7 1.2-2.7 2.7v4c0 1.5 1.2 2.7 2.7 2.7h8V16h5.3v2.7h8c1.5 0 2.7-1.2 2.7-2.7v-4c0-1.5-1.2-2.7-2.6-2.7zm-8 0h-5.3V6.7h5.3v2.6z"></path></svg>
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-careers', fallback='navigation-careers') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-v2-work-for-a-mission-driven-updated', fallback='navigation-work-for-a-mission-driven') }}</p>
@@ -64,7 +64,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-careers', fallback='navigati
           </li>
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="https://blog.mozilla.org/?{{ utm_params }}" data-link-text="Mozilla Blog" data-link-type="nav" data-link-position="topnav" data-link-group="who-we-are">
+              <a class="c-menu-item-link" href="https://blog.mozilla.org/?{{ utm_params }}" data-link-text="Mozilla Blog" data-link-position="topnav - who-we-are">
                 <svg class="c-menu-item-icon" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><path fill="#42435a" d="M21.1 7.5c-.2-.2-.2-.5 0-.7l.5-.5c.8-.8 2.1-.8 2.9 0l1.2 1.2c.8.8.8 2.1 0 2.9l-.5.5c-.2.2-.5.2-.7 0l-3.4-3.4zm2.3 4.5c.2.2.2.5 0 .7L12.7 23.4c-.2.2-.4.3-.6.4l-5.7 2.4c-.3.1-.6 0-.7-.3-.1-.1-.1-.3 0-.4L8.1 20c.1-.2.3-.5.4-.6L19.2 8.6c.2-.2.5-.2.7 0l3.5 3.4zM11.5 22.7l-3.9 1.7 1.7-3.9c0-.1.1-.2.2-.2l2.3 2.3c-.1 0-.2.1-.3.1z"></path></svg>
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-mozilla-blog') }}</h4>
               {% if ftl_has_messages('navigation-v2-learn-about-mozilla-and') %}
@@ -76,7 +76,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-mozilla-blog') }}</h4>
         {% if ftl_has_messages('navigation-v2-impact', 'navigation-v2-find-out-how') and switch('impact-report-active') %}
           <li>
             <section class="c-menu-item mzp-has-icon">
-              <a class="c-menu-item-link" href="{{ url('mozorg.impact-report.index') }}" data-link-text="Impact" data-link-type="nav" data-link-position="topnav" data-link-group="who-we-are">
+              <a class="c-menu-item-link" href="{{ url('mozorg.impact-report.index') }}" data-link-text="Impact" data-link-position="topnav - who-we-are">
                   <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" class="c-menu-item-icon"><g transform="translate(4 1)" fill="none"><path d="M.4 14.7 4 12v7l-2.4 1.8A1 1 0 0 1 0 20v-4.5a1 1 0 0 1 .4-.8zM15.6 14.7 12 12v7l2.4 1.8A1 1 0 0 0 16 20v-4.5a1 1 0 0 0-.4-.8z" stroke="#42435a" stroke-width="2"/><path d="M5.137 4.14 7.127.569a1 1 0 0 1 1.747 0l1.989 3.57A9 9 0 0 1 12 8.52V19.02H4V8.52a9 9 0 0 1 1.137-4.38z" stroke="#42435a" stroke-width="2"/><circle cx="8" cy="8" r="1.5" fill="#42435a"/><path d="M7.95 16v6" stroke="#42435a" stroke-linecap="round" stroke-width="2"/></g></svg>
                 <h4 class="c-menu-item-title">{{ ftl('navigation-v2-impact') }}</h4>
                 <p class="c-menu-item-desc">{{ ftl('navigation-v2-find-out-how') }}</p>
@@ -86,7 +86,7 @@ <h4 class="c-menu-item-title">{{ ftl('navigation-v2-impact') }}</h4>
         {% endif %}
         </ul>
         <p class="c-menu-category-link">
-          <a href="{{ url('mozorg.about.index') }}" data-link-text="More About Mozilla" data-link-type="nav" data-link-position="topnav" data-link-group="who-we-are">{{ ftl('navigation-v2-more-about-mozilla') }}</a>
+          <a href="{{ url('mozorg.about.index') }}" data-link-text="More About Mozilla" data-link-position="topnav - who-we-are">{{ ftl('navigation-v2-more-about-mozilla') }}</a>
         </p>
       </div>
     </div><!-- close .c-menu-panel-container -->
diff --git a/bedrock/base/templates/includes/protocol/navigation/nav-cta.html b/bedrock/base/templates/includes/protocol/navigation/nav-cta.html
index c8e23c4482a..2e3e8b830f1 100644
--- a/bedrock/base/templates/includes/protocol/navigation/nav-cta.html
+++ b/bedrock/base/templates/includes/protocol/navigation/nav-cta.html
@@ -19,7 +19,7 @@
           class_name='mzp-t-product mzp-t-secondary mzp-t-md',
           optional_attributes= {
             'data-cta-text' : 'Get Mozilla VPN',
-            'data-cta-type' : 'button',
+            'data-cta-type' : 'vpn',
             'data-cta-position' : 'navigation'
           }
         ) }}
diff --git a/bedrock/base/templates/includes/protocol/navigation/navigation-refresh.html b/bedrock/base/templates/includes/protocol/navigation/navigation-refresh.html
index 7d14e132f44..0a837a694e4 100644
--- a/bedrock/base/templates/includes/protocol/navigation/navigation-refresh.html
+++ b/bedrock/base/templates/includes/protocol/navigation/navigation-refresh.html
@@ -9,7 +9,7 @@
     <div class="c-navigation-container">
       <button class="c-navigation-menu-button" type="button" aria-controls="c-navigation-items" data-testid="navigation-refresh-menu-button">{{ ftl('ui-menu') }}</button>
       <div class="c-navigation-logo">
-        <a href="{{ url('mozorg.home') }}" data-link-text="mozilla home icon" data-link-type="nav">
+        <a href="{{ url('mozorg.home') }}" data-link-text="mozilla home icon" data-link-position="nav">
           <img loading="lazy" class="c-navigation-logo-image" src="{{ static('img/logos/m24/lockup-black.svg') }}" alt="{{ ftl('navigation-refresh-mozilla') }}" width="88" height="21">
         </a>
       </div>
diff --git a/bedrock/base/templates/includes/protocol/navigation/navigation.html b/bedrock/base/templates/includes/protocol/navigation/navigation.html
index b1b50dbe973..e53160fbdba 100644
--- a/bedrock/base/templates/includes/protocol/navigation/navigation.html
+++ b/bedrock/base/templates/includes/protocol/navigation/navigation.html
@@ -21,7 +21,7 @@
       <div class="c-navigation-container">
         <button class="c-navigation-menu-button" type="button" aria-controls="c-navigation-items" data-testid="navigation-menu-button">{{ ftl('navigation-v2-menu') }}</button>
         <div class="c-navigation-logo">
-          <a href="{{ url('mozorg.home') }}" data-link-text="mozilla home icon" data-link-type="nav">
+          <a href="{{ url('mozorg.home') }}" data-link-text="mozilla home icon" data-link-position="nav">
           {% if switch('m24-logo') %}
             <img class="c-navigation-logo-image m24-logo" src="{{ static('img/logos/m24/lockup-black.svg') }}" alt="{{ logo_alt }}" width="88" height="21">
           {% else %}
diff --git a/bedrock/base/templates/macros-protocol.html b/bedrock/base/templates/macros-protocol.html
index fdc077632ff..94f3e8b1049 100644
--- a/bedrock/base/templates/macros-protocol.html
+++ b/bedrock/base/templates/macros-protocol.html
@@ -38,7 +38,7 @@
         <h{{ heading_level }} class="mzp-c-billboard-title">{{ title }}</h{{ heading_level }}>
         <p class="mzp-c-billboard-desc">{{ desc }}</p>
         {% if link_url and link_cta %}
-          <a class="mzp-c-cta-link" href="{{ link_url }}" data-link-text="{{ ga_title }}" data-link-type="link">{{ link_cta }}</a>
+          <a class="mzp-c-cta-link" href="{{ link_url }}" data-link-text="{{ ga_title }}">{{ link_cta }}</a>
         {% endif %}
       </div>
     </div>
@@ -223,7 +223,7 @@
   youtube_id=None
 ) -%}
 <section class="mzp-c-card {% if class %}{{ class }}{% endif %} {% if aspect_ratio %}{{ aspect_ratio }}{% endif %} {% if media_icon %}{{ media_icon }}{% endif %} {% if youtube_id %}mzp-has-video has-video-embed{% endif %}" {% if attributes %}{{attributes|safe}}{% endif %}>
-  <a class="mzp-c-card-block-link" href="{{ link_url }}" data-link-text="{{ ga_title }}" data-link-type="link" data-link-group="card" {% if tag_label %}data-card-tag="{{ tag_label }}"{% endif %}  {% if link_target %}target="{{ link_target }}"{% endif %} {% if link_rel %}rel="{{ link_rel }}"{% endif %} {% if link_title %}title="{{ link_title }}"{% endif %}>
+  <a class="mzp-c-card-block-link" href="{{ link_url }}" data-link-text="{{ ga_title }}" data-link-position="card" {% if tag_label %}data-card-tag="{{ tag_label }}"{% endif %}  {% if link_target %}target="{{ link_target }}"{% endif %} {% if link_rel %}rel="{{ link_rel }}"{% endif %} {% if link_title %}title="{{ link_title }}"{% endif %}>
     {% if image %}
       <div class="mzp-c-card-media-wrapper">{{ image|safe }}</div>
     {% endif %}
diff --git a/bedrock/base/templates/macros.html b/bedrock/base/templates/macros.html
index b6b9b2da436..6a6987ed266 100644
--- a/bedrock/base/templates/macros.html
+++ b/bedrock/base/templates/macros.html
@@ -197,7 +197,7 @@ <h2 class="mzp-c-form-title">{{ form_title }}</h2>
     <div class="c-sub-navigation-content">
       <h2 class="c-sub-navigation-title">
         {% if title.href %}
-          <a href="{{ title.href }}" data-link-type="nav" data-link-position="subnav" {% if title.cta_name %}data-link-text="{{ title.cta_name }}"{% endif %}>
+          <a href="{{ title.href }}" data-link-position="subnav" {% if title.cta_name %}data-link-text="{{ title.cta_name }}"{% endif %}>
             {% if title.icon %}<img class="c-sub-navigation-icon" src="{{ title.icon }}" width="24" height="24" alt="">{% endif %}
             {{ title.text }}
           </a>
@@ -214,7 +214,6 @@ <h2 class="c-sub-navigation-title">
         <li class="c-sub-navigation-item">
           <a
             href="{{ link.href }}"
-            data-link-type="nav"
             data-link-position="subnav"
             data-link-text="{{ link.cta_name }}"
             {% if current_page == link.href %} aria-current="page"{% endif %}
diff --git a/bedrock/base/tests/test_macros.py b/bedrock/base/tests/test_macros.py
index 41ef9ae08fb..49fa5ae8745 100644
--- a/bedrock/base/tests/test_macros.py
+++ b/bedrock/base/tests/test_macros.py
@@ -31,9 +31,9 @@ def inner_html(el):
 EXPECTED_NAV_HTML = {
     "title_text": """Testing title""",
     "title_icon": """<img class="c-sub-navigation-icon" src="icon.png" width="24" height="24" alt="">""",
-    "title_link": """<a href="/category" data-link-type="nav" data-link-position="subnav" data-link-text="Test Title">""",
-    "current_link": """<a href="/current" data-link-type="nav" data-link-position="subnav" data-link-text="Test Link" aria-current="page"> Testing current link </a>""",  # noqa: E501
-    "regular_link": """<a href="/regular" data-link-type="nav" data-link-position="subnav" data-link-text="Test Link"> Testing link </a>""",
+    "title_link": """<a href="/category" data-link-position="subnav" data-link-text="Test Title">""",
+    "current_link": """<a href="/current" data-link-position="subnav" data-link-text="Test Link" aria-current="page"> Testing current link </a>""",  # noqa: E501
+    "regular_link": """<a href="/regular" data-link-position="subnav" data-link-text="Test Link"> Testing link </a>""",
     "is_summary": """is-summary""",
     "is_details_default_closed": """is-details is-closed""",
 }
diff --git a/bedrock/careers/templates/careers/benefits.html b/bedrock/careers/templates/careers/benefits.html
index 324c7db9d79..39c79a10a07 100644
--- a/bedrock/careers/templates/careers/benefits.html
+++ b/bedrock/careers/templates/careers/benefits.html
@@ -16,7 +16,7 @@ <h1 class="c-text-hero-title">Benefits for real life</h1>
           set us apart from other companies in our industry.</p>
 
         <p class="c-careers-button-wrapper">
-          <a href="{{ url('careers.listings') }}" class="mzp-c-button mzp-t-dark" data-cta-type="button" data-cta-text="See our open roles">See our open roles</a>
+          <a href="{{ url('careers.listings') }}" class="mzp-c-button mzp-t-dark" data-cta-text="See our open roles">See our open roles</a>
         </p>
       </div>
     </div>
diff --git a/bedrock/careers/templates/careers/home.html b/bedrock/careers/templates/careers/home.html
index b0acffd7cad..e4b24db5085 100644
--- a/bedrock/careers/templates/careers/home.html
+++ b/bedrock/careers/templates/careers/home.html
@@ -165,7 +165,7 @@ <h2 class="c-careers-section-title">
       </p>
 
       <p class="c-careers-button-wrapper">
-        <a href="{{ url('careers.diversity') }}" data-cta-type="button" data-cta-text="Read more" class="mzp-c-button mzp-t-secondary">Read more</a>
+        <a href="{{ url('careers.diversity') }}" data-cta-text="Read more" class="mzp-c-button mzp-t-secondary">Read more</a>
       </p>
     </div>
   </section>
@@ -266,7 +266,7 @@ <h2 class="c-careers-section-title">
       </ul>
 
       <p class="c-careers-button-wrapper">
-        <a href="{{ url('careers.benefits') }}" data-cta-type="button" data-cta-text="Read more about our benefits" class="mzp-c-button mzp-t-secondary">Read more about our benefits</a>
+        <a href="{{ url('careers.benefits') }}" data-cta-text="Read more about our benefits" class="mzp-c-button mzp-t-secondary">Read more about our benefits</a>
       </p>
     </div>
   </section>
@@ -276,7 +276,7 @@ <h2 class="c-careers-section-title">
     <div class="c-mozillians-content">
       <h2 class="c-careers-section-title">See yourself on one of our teams?</h2>
       <p class="c-careers-button-wrapper">
-        <a href="{{ url('careers.listings') }}" data-cta-type="button" data-cta-text="Find your role" class="mzp-c-button mzp-t-dark">Find your role</a>
+        <a href="{{ url('careers.listings') }}" data-cta-text="Find your role" class="mzp-c-button mzp-t-dark">Find your role</a>
       </p>
     </div>
   </section>
@@ -379,7 +379,7 @@ <h2 class="c-careers-section-title">
       </ul>
 
       <p class="c-careers-button-wrapper">
-        <a href="{{ url('careers.teams') }}" data-cta-type="button" data-cta-text="View all teams" class="mzp-c-button mzp-t-secondary">View all teams</a>
+        <a href="{{ url('careers.teams') }}" data-cta-text="View all teams" class="mzp-c-button mzp-t-secondary">View all teams</a>
       </p>
     </div>
   </section>
@@ -410,7 +410,7 @@ <h2 class="c-careers-section-title">
       </div>
 
       <p class="c-careers-button-wrapper">
-        <a href="{{ url('careers.locations') }}" data-cta-type="button" data-cta-text="Read more about the future of work at Mozilla" class="mzp-c-button mzp-t-secondary">Read more about the future of work at Mozilla</a>
+        <a href="{{ url('careers.locations') }}" data-cta-text="Read more about the future of work at Mozilla" class="mzp-c-button mzp-t-secondary">Read more about the future of work at Mozilla</a>
       </p>
     </div>
   </section>
diff --git a/bedrock/careers/templates/careers/locations.html b/bedrock/careers/templates/careers/locations.html
index 5c97f6df8c2..7d652139a4c 100644
--- a/bedrock/careers/templates/careers/locations.html
+++ b/bedrock/careers/templates/careers/locations.html
@@ -15,7 +15,7 @@ <h1 class="c-text-hero-title">We’ll meet you where you are — office optional
           choose where they do it.</p>
 
         <div class="c-careers-button-wrapper">
-          <a href="https://blog.mozilla.org/careers/future-of-work-at-mozilla/" class="mzp-c-button mzp-t-dark" data-cta-type="button" data-cta-text="Read more about how we work">Read more about how we work</a>
+          <a href="https://blog.mozilla.org/careers/future-of-work-at-mozilla/" class="mzp-c-button mzp-t-dark" data-cta-text="Read more about how we work">Read more about how we work</a>
         </div>
       </div>
     </div>
diff --git a/bedrock/careers/templates/careers/teams.html b/bedrock/careers/templates/careers/teams.html
index cfd23a0f299..6077c2430fd 100644
--- a/bedrock/careers/templates/careers/teams.html
+++ b/bedrock/careers/templates/careers/teams.html
@@ -15,7 +15,7 @@ <h1 class="c-text-hero-title">Meet Mozilla’s teams</h1>
           builders and creators working together to keep the internet open and
           accessible to all.</p>
         <div class="c-careers-button-wrapper">
-          <a href="{{ url('careers.listings') }}" class="mzp-c-button mzp-t-dark" data-cta-type="button" data-cta-text="See our open roles">See our open roles</a>
+          <a href="{{ url('careers.listings') }}" class="mzp-c-button mzp-t-dark" data-cta-text="See our open roles">See our open roles</a>
         </div>
       </div>
     </div>
diff --git a/bedrock/contentful/api.py b/bedrock/contentful/api.py
index 67a9ba5903a..2963545dc30 100644
--- a/bedrock/contentful/api.py
+++ b/bedrock/contentful/api.py
@@ -296,7 +296,7 @@ def render(self, node):
             rel = ' rel="external noopener"'
             # add analytics
             cta_text = _make_plain_text(node)
-            data_cta = f' data-cta-type="link" data-cta-text="{cta_text}"'
+            data_cta = f' data-cta-text="{cta_text}"'
 
         return f'<a href="{urlunparse(url)}{ref}"{data_cta}{rel}>{self._render_content(node)}</a>'
 
diff --git a/bedrock/contentful/templates/includes/contentful/cta.html b/bedrock/contentful/templates/includes/contentful/cta.html
index 5d4397e0bdb..b511c475c98 100644
--- a/bedrock/contentful/templates/includes/contentful/cta.html
+++ b/bedrock/contentful/templates/includes/contentful/cta.html
@@ -16,7 +16,7 @@
 
 {% elif action == 'Explore Firefox' %}
 
-  <a href="{{ url('firefox') }}" class="mzp-c-button {{ button_class }}" data-cta-text="{{ cta_text }}" data-cta-type="link">{{ label }}</a>
+  <a href="{{ url('firefox') }}" class="mzp-c-button {{ button_class }}" data-cta-text="{{ cta_text }}" >{{ label }}</a>
 
 {% elif action == 'Create a Firefox Account' %}
 
@@ -30,18 +30,18 @@
 
 {% elif action == 'Get Pocket' %}
 
-  <a href="https://getpocket.com/{{ referral|safe }}" class="mzp-c-button {{ button_class }}" rel="external noopener" data-cta-type="link" data-cta-text="{{ cta_text }}">{{ label }}</a>
+  <a href="https://getpocket.com/{{ referral|safe }}" class="mzp-c-button {{ button_class }}" rel="external noopener" data-cta-text="{{ cta_text }}" data-cta-type="pocket">{{ label }}</a>
 
 {% elif action == 'Get Mozilla VPN' %}
 
-  <a href="{{ url('products.vpn.landing') }}" class="mzp-c-button {{ button_class }}" data-cta-text="{{ cta_text }}" data-cta-type="link">{{ label }}</a>
+  <a href="{{ url('products.vpn.landing') }}" class="mzp-c-button {{ button_class }}" data-cta-text="{{ cta_text }}" data-cta-type="vpn">{{ label }}</a>
 
 {% elif action == 'Try Relay' %}
 
-  <a href="https://relay.firefox.com/{{ referral|safe }}" class="mzp-c-button {{ button_class }}" rel="external noopener" data-cta-text="{{ cta_text }}" data-cta-type="link">{{ label }}</a>
+  <a href="https://relay.firefox.com/{{ referral|safe }}" class="mzp-c-button {{ button_class }}" rel="external noopener" data-cta-text="{{ cta_text }}" data-cta-type="relay">{{ label }}</a>
 
 {% elif action == 'Get MDN Plus' %}
 
-  <a href="https://developer.mozilla.org/plus{{ referral|safe }}" class="mzp-c-button {{ button_class }}" rel="external noopener" data-cta-text="{{ cta_text }}" data-cta-type="link">{{ label }}</a>
+  <a href="https://developer.mozilla.org/plus{{ referral|safe }}" class="mzp-c-button {{ button_class }}" rel="external noopener" data-cta-text="{{ cta_text }}">{{ label }}</a>
 
 {% endif %}
diff --git a/bedrock/contentful/tests/data.py b/bedrock/contentful/tests/data.py
index 23dd9e00899..91b0f4ce14f 100644
--- a/bedrock/contentful/tests/data.py
+++ b/bedrock/contentful/tests/data.py
@@ -27,7 +27,7 @@
     "entries": [
         {
             "component": "text",
-            "body": '<p>Virtual private networks (VPNs) and secure web proxies are solutions for better privacy and security online, but it can be confusing to figure out which one is right for you. Here\u2019s a look at how these services protect you and how to choose the best option for when you\u2019re online.</p>\n<h3>Stop ISPs from spying on you</h3>\n<p>When you <a href="https://www.mozilla.org/firefox/new/">use Firefox</a>,<a href="https://blog.mozilla.org/products/firefox/control-trackers-with-firefox/?utm_source=www.mozilla.org-vpn-or-proxy&utm_medium=referral&utm_campaign=products-vpn-more" data-cta-type="link" data-cta-text=" Enhanced Tracking Protection" rel="external noopener"> Enhanced Tracking Protection</a> automatically blocks many third party <a href="https://blog.mozilla.org/internet-culture/mozilla-explains/what-is-a-web-tracker/?utm_source=www.mozilla.org-vpn-or-proxy&utm_medium=referral&utm_campaign=products-vpn-more" data-cta-type="link" data-cta-text="web trackers" rel="external noopener">web trackers</a> from following you around the web. But here\u2019s an interesting fact: your internet service provider (ISP) that you are paying for an internet connection \u2014 can still observe and track you.</p>\n<p>Because your internet traffic moves to and from your devices (computer, phone, tv, tablet) through your ISP, they can see where you go online. An ISP can see what sites you visit, how long you\u2019re on them, your location and information about your devices. An ISP may not know the specifics of what you did on those sites (like what you bought, searched for or read) thanks to encryption, but they could make inferences about you based on the sites that you visited. That personal data can be used to create detailed profiles about you. Why would ISPs do that? In short: this data is valuable.</p>\n<p>ISPs can use this information for their own ad targeting or for monetization opportunities that could include sharing your information with third parties interested in data mining, marketing and targeted advertising, which means less privacy and more tracking. Browsing in private mode doesn\u2019t prevent ISPs from seeing where you go online. But sending your web traffic through a web proxy or VPN can make it much harder.</p>\n<h3>When should you choose a VPN or a secure proxy?</h3>\n<p>VPNs and secure web proxies have shared goals: they secure connections. They can, and do, mask your original IP address and protect web traffic that you send between you and your VPN or secure proxy provider. But when would you want to use a VPN vs a proxy?</p>\n<img src="https://images.ctfassets.net/w5er3c7zdgmd/6hMCIKPtlifGYMi7eCTGNT/659d66ba583772a9571e3dd76945cd53/vpn-proxy-high-res.959f123061fe.png?w=688" srcset="https://images.ctfassets.net/w5er3c7zdgmd/6hMCIKPtlifGYMi7eCTGNT/659d66ba583772a9571e3dd76945cd53/vpn-proxy-high-res.959f123061fe.png?w=1376 1.5x" alt="" loading="lazy">\n\n<h3>Secure web proxy: browser-level protection</h3>\n<p>A secure web proxy works for tasks that you might do only in your browser. This can amount to a lot of activity like shopping, paying bills, logging into social media and reading emails. A secure web proxy serves as an intermediary between your browser and the internet. Your web browsing data will pass through a secure tunnel to the internet directly from your browser, masking your IP address, so the web server you are contacting doesn\u2019t know exactly where you are in the world. And that makes you harder to track and target.</p>\n<p>A proxy is useful when you\u2019re browsing the web on a public WiFi. When a proxy is enabled, it will stop eavesdroppers on the same network from spying on your browsing activity or reading your transactions on unencrypted sites. It sounds harmless, but public WiFi networks can be like a backdoor for<a href="https://www.consumer.ftc.gov/articles/0014-tips-using-public-wi-fi-networks" data-cta-type="link" data-cta-text=" hackers" rel="external noopener"> hackers</a>.</p>\n<p><a href="https://fpn.firefox.com/?utm_source=www.mozilla.org-vpn-or-proxy&utm_medium=referral&utm_campaign=products-vpn-more" data-cta-type="link" data-cta-text="Firefox Private Network" rel="external noopener">Firefox Private Network</a> is an easy to install browser extension that provides a secure, encrypted tunnel to the web to protect your browser connection anywhere you use Firefox. It\'s fast and easy to turn on whenever you need it for extra security in your browser</p>\n<h3>VPNs: device-level protection</h3>\n<p>VPNs do more than proxies in that a proxy only protects what you do in your browser, whereas a VPN protects all your traffic, including your browser, wherever you have a VPN installed and enabled. VPNs provide added security and privacy for all your online activity \u2014 an important consideration if you want to keep your activity to yourself and make it more difficult for data hungry trackers and ISPs to create a profile of you across all your devices, like your phone, computer and tablet.</p>\n<p>A VPN works by creating a secure \u201ctunnel\u201d between your device and the internet at large. It protects your privacy in two key ways:</p>\n<ol class=\'mzp-u-list-styled\'><li>Concealing your IP address, protecting your identity and obscuring your location.</li><li>Encrypting your traffic between you and your VPN provider so that no one on your local network can decipher or modify it.</li></ol>\n<p>A VPN also offers security on open and public WiFi connections. Open WiFi can be risky, and it\u2019s impossible to be sure that someone else isn\u2019t connecting to the same network to snoop on what you\u2019re doing. Even if your traffic is encrypted, they can still see which sites you are visiting. And if you\u2019re using an app that doesn\u2019t have encryption \u2014 and even today, many don\u2019t \u2014 then they can see everything you are doing in that app. Mozilla VPN is a fast, secure, trustworthy service that can help close the security gap for you. <a href="https://www.mozilla.org/products/vpn/">Mozilla VPN</a> also lets you choose your \u201clocation\u201d (where your traffic appears to be coming from) from more than 30 countries.</p>\n<h3>Choose a trustworthy service</h3>\n<p>The most important thing to consider when picking either a VPN or a proxy service is choosing a trustworthy company. Be sure you understand the terms you\u2019re agreeing to. Many claim to be great and focused on privacy, but a large number of them fall short on their promise. Not all proxy and VPN services are secure and private. Some <a href="https://www.cnet.com/news/why-you-should-be-skeptical-about-a-vpns-no-logs-claims/" data-cta-type="link" data-cta-text="will" rel="external noopener">will</a><a href="https://www.pcmag.com/news/7-vpn-services-found-recording-user-logs-despite-no-log-pledge" data-cta-type="link" data-cta-text=" log" rel="external noopener"> log</a> your online activities so they can sell your data and information to marketing firms themselves. Other services will try to convince you to install malware on your devices.</p>\n<p>We\u2019ve done the legwork to ensure that both the <a href="https://www.mozilla.org/products/vpn/">Mozilla VPN</a> and <a href="https://fpn.firefox.com/?utm_source=www.mozilla.org-vpn-or-proxy&utm_medium=referral&utm_campaign=products-vpn-more" data-cta-type="link" data-cta-text="Firefox Private Network" rel="external noopener">Firefox Private Network</a> proxy extension actually respect your privacy, and it\u2019s something we\u2019re willing to stake our reputation on. Mozilla has a reputation for building products that help you keep your information safe. We follow our easy to read, no-nonsense <a href="https://www.mozilla.org/privacy/principles/">Data Privacy Principles</a> which allow us to focus only on the information we need to provide a service. And since we are backed by a <a href="https://www.mozilla.org/mission/">mission-driven</a> company, you can trust that the dollars you spend for this product will not only ensure you have top-notch security, but also are making the internet better for everyone.</p>\n',
+            "body": '<p>Virtual private networks (VPNs) and secure web proxies are solutions for better privacy and security online, but it can be confusing to figure out which one is right for you. Here\u2019s a look at how these services protect you and how to choose the best option for when you\u2019re online.</p>\n<h3>Stop ISPs from spying on you</h3>\n<p>When you <a href="https://www.mozilla.org/firefox/new/">use Firefox</a>,<a href="https://blog.mozilla.org/products/firefox/control-trackers-with-firefox/?utm_source=www.mozilla.org-vpn-or-proxy&utm_medium=referral&utm_campaign=products-vpn-more" data-cta-text=" Enhanced Tracking Protection" rel="external noopener"> Enhanced Tracking Protection</a> automatically blocks many third party <a href="https://blog.mozilla.org/internet-culture/mozilla-explains/what-is-a-web-tracker/?utm_source=www.mozilla.org-vpn-or-proxy&utm_medium=referral&utm_campaign=products-vpn-more" data-cta-text="web trackers" rel="external noopener">web trackers</a> from following you around the web. But here\u2019s an interesting fact: your internet service provider (ISP) that you are paying for an internet connection \u2014 can still observe and track you.</p>\n<p>Because your internet traffic moves to and from your devices (computer, phone, tv, tablet) through your ISP, they can see where you go online. An ISP can see what sites you visit, how long you\u2019re on them, your location and information about your devices. An ISP may not know the specifics of what you did on those sites (like what you bought, searched for or read) thanks to encryption, but they could make inferences about you based on the sites that you visited. That personal data can be used to create detailed profiles about you. Why would ISPs do that? In short: this data is valuable.</p>\n<p>ISPs can use this information for their own ad targeting or for monetization opportunities that could include sharing your information with third parties interested in data mining, marketing and targeted advertising, which means less privacy and more tracking. Browsing in private mode doesn\u2019t prevent ISPs from seeing where you go online. But sending your web traffic through a web proxy or VPN can make it much harder.</p>\n<h3>When should you choose a VPN or a secure proxy?</h3>\n<p>VPNs and secure web proxies have shared goals: they secure connections. They can, and do, mask your original IP address and protect web traffic that you send between you and your VPN or secure proxy provider. But when would you want to use a VPN vs a proxy?</p>\n<img src="https://images.ctfassets.net/w5er3c7zdgmd/6hMCIKPtlifGYMi7eCTGNT/659d66ba583772a9571e3dd76945cd53/vpn-proxy-high-res.959f123061fe.png?w=688" srcset="https://images.ctfassets.net/w5er3c7zdgmd/6hMCIKPtlifGYMi7eCTGNT/659d66ba583772a9571e3dd76945cd53/vpn-proxy-high-res.959f123061fe.png?w=1376 1.5x" alt="" loading="lazy">\n\n<h3>Secure web proxy: browser-level protection</h3>\n<p>A secure web proxy works for tasks that you might do only in your browser. This can amount to a lot of activity like shopping, paying bills, logging into social media and reading emails. A secure web proxy serves as an intermediary between your browser and the internet. Your web browsing data will pass through a secure tunnel to the internet directly from your browser, masking your IP address, so the web server you are contacting doesn\u2019t know exactly where you are in the world. And that makes you harder to track and target.</p>\n<p>A proxy is useful when you\u2019re browsing the web on a public WiFi. When a proxy is enabled, it will stop eavesdroppers on the same network from spying on your browsing activity or reading your transactions on unencrypted sites. It sounds harmless, but public WiFi networks can be like a backdoor for<a href="https://www.consumer.ftc.gov/articles/0014-tips-using-public-wi-fi-networks" data-cta-text=" hackers" rel="external noopener"> hackers</a>.</p>\n<p><a href="https://fpn.firefox.com/?utm_source=www.mozilla.org-vpn-or-proxy&utm_medium=referral&utm_campaign=products-vpn-more" data-cta-text="Firefox Private Network" rel="external noopener">Firefox Private Network</a> is an easy to install browser extension that provides a secure, encrypted tunnel to the web to protect your browser connection anywhere you use Firefox. It\'s fast and easy to turn on whenever you need it for extra security in your browser</p>\n<h3>VPNs: device-level protection</h3>\n<p>VPNs do more than proxies in that a proxy only protects what you do in your browser, whereas a VPN protects all your traffic, including your browser, wherever you have a VPN installed and enabled. VPNs provide added security and privacy for all your online activity \u2014 an important consideration if you want to keep your activity to yourself and make it more difficult for data hungry trackers and ISPs to create a profile of you across all your devices, like your phone, computer and tablet.</p>\n<p>A VPN works by creating a secure \u201ctunnel\u201d between your device and the internet at large. It protects your privacy in two key ways:</p>\n<ol class=\'mzp-u-list-styled\'><li>Concealing your IP address, protecting your identity and obscuring your location.</li><li>Encrypting your traffic between you and your VPN provider so that no one on your local network can decipher or modify it.</li></ol>\n<p>A VPN also offers security on open and public WiFi connections. Open WiFi can be risky, and it\u2019s impossible to be sure that someone else isn\u2019t connecting to the same network to snoop on what you\u2019re doing. Even if your traffic is encrypted, they can still see which sites you are visiting. And if you\u2019re using an app that doesn\u2019t have encryption \u2014 and even today, many don\u2019t \u2014 then they can see everything you are doing in that app. Mozilla VPN is a fast, secure, trustworthy service that can help close the security gap for you. <a href="https://www.mozilla.org/products/vpn/">Mozilla VPN</a> also lets you choose your \u201clocation\u201d (where your traffic appears to be coming from) from more than 30 countries.</p>\n<h3>Choose a trustworthy service</h3>\n<p>The most important thing to consider when picking either a VPN or a proxy service is choosing a trustworthy company. Be sure you understand the terms you\u2019re agreeing to. Many claim to be great and focused on privacy, but a large number of them fall short on their promise. Not all proxy and VPN services are secure and private. Some <a href="https://www.cnet.com/news/why-you-should-be-skeptical-about-a-vpns-no-logs-claims/" data-cta-text="will" rel="external noopener">will</a><a href="https://www.pcmag.com/news/7-vpn-services-found-recording-user-logs-despite-no-log-pledge" data-cta-text=" log" rel="external noopener"> log</a> your online activities so they can sell your data and information to marketing firms themselves. Other services will try to convince you to install malware on your devices.</p>\n<p>We\u2019ve done the legwork to ensure that both the <a href="https://www.mozilla.org/products/vpn/">Mozilla VPN</a> and <a href="https://fpn.firefox.com/?utm_source=www.mozilla.org-vpn-or-proxy&utm_medium=referral&utm_campaign=products-vpn-more" data-cta-text="Firefox Private Network" rel="external noopener">Firefox Private Network</a> proxy extension actually respect your privacy, and it\u2019s something we\u2019re willing to stake our reputation on. Mozilla has a reputation for building products that help you keep your information safe. We follow our easy to read, no-nonsense <a href="https://www.mozilla.org/privacy/principles/">Data Privacy Principles</a> which allow us to focus only on the information we need to provide a service. And since we are backed by a <a href="https://www.mozilla.org/mission/">mission-driven</a> company, you can trust that the dollars you spend for this product will not only ensure you have top-notch security, but also are making the internet better for everyone.</p>\n',
             "width_class": "mzp-t-content-md",
         }
     ],
diff --git a/bedrock/contentful/tests/test_contentful_api.py b/bedrock/contentful/tests/test_contentful_api.py
index ecceabdf957..1a304f54475 100644
--- a/bedrock/contentful/tests/test_contentful_api.py
+++ b/bedrock/contentful/tests/test_contentful_api.py
@@ -520,7 +520,7 @@ def test_LinkRenderer__mozilla_link(mock_get_current_request):
     output = LinkRenderer({"text": TextRenderer}).render(mozilla_mock_hyperlink_node)
     expected = (
         '<a href="https://subdomain.mozilla.org/test/page/?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=TEST" '
-        'data-cta-type="link" data-cta-text="Example" rel="external noopener">Example</a>'
+        'data-cta-text="Example" rel="external noopener">Example</a>'
     )
 
     assert output == expected
@@ -534,10 +534,7 @@ def test_LinkRenderer__mozilla_link__existing_utm(mock_get_current_request):
     mozilla_mock_hyperlink_node = deepcopy(mock_hyperlink_node)
     mozilla_mock_hyperlink_node["data"]["uri"] = "https://mozilla.org/test/page/?utm_source=UTMTEST"
     output = LinkRenderer({"text": TextRenderer}).render(mozilla_mock_hyperlink_node)
-    expected = (
-        '<a href="https://mozilla.org/test/page/?utm_source=UTMTEST" '
-        'data-cta-type="link" data-cta-text="Example" rel="external noopener">Example</a>'
-    )
+    expected = '<a href="https://mozilla.org/test/page/?utm_source=UTMTEST" ' 'data-cta-text="Example" rel="external noopener">Example</a>'
 
     assert output == expected
 
@@ -549,7 +546,7 @@ def test_LinkRenderer__non_mozilla():
                 "text": TextRenderer,
             }
         ).render(mock_hyperlink_node)
-        == '<a href="https://example.com" data-cta-type="link" data-cta-text="Example" rel="external noopener">Example</a>'
+        == '<a href="https://example.com" data-cta-text="Example" rel="external noopener">Example</a>'
     )
 
 
diff --git a/bedrock/firefox/templates/firefox/all/download.html b/bedrock/firefox/templates/firefox/all/download.html
index f409250c833..56016564730 100644
--- a/bedrock/firefox/templates/firefox/all/download.html
+++ b/bedrock/firefox/templates/firefox/all/download.html
@@ -23,7 +23,7 @@ <h2 {% if not (product and platform and locale) %} class="c-step-name t-step-dis
   {% if platform.startswith("linux") %}
     {# Linux preamble #}
     <p class="c-linux-debian"><br>
-      {{ ftl('download-button-using-debian', attrs='href="https://support.mozilla.org/kb/install-firefox-linux#w_install-firefox-deb-package-for-debian-based-distributions" rel="external noopener" data-cta-type="link" data-cta-text="You can set up our APT repository instead"'|safe) }}
+      {{ ftl('download-button-using-debian', attrs='href="https://support.mozilla.org/kb/install-firefox-linux#w_install-firefox-deb-package-for-debian-based-distributions" rel="external noopener" data-cta-text="You can set up our APT repository instead"'|safe) }}
     </p>
   {% endif %}
   {% if product.slug.startswith("desktop") %}
diff --git a/bedrock/firefox/templates/firefox/all/mobile.html b/bedrock/firefox/templates/firefox/all/mobile.html
index 996548b4034..0df8311e7ca 100644
--- a/bedrock/firefox/templates/firefox/all/mobile.html
+++ b/bedrock/firefox/templates/firefox/all/mobile.html
@@ -47,7 +47,7 @@
   {% endif %}
 
   {% if product.slug.startswith('mobile') %}
-    <p><a href="{{ url('firefox.browsers.mobile.get-app') }}" class="c-get-app" data-cta-type="link" data-cta-text="Send a link">{{ ftl('firefox-all-product-send-link') }}</a></p>
+    <p><a href="{{ url('firefox.browsers.mobile.get-app') }}" class="c-get-app" data-cta-text="Send a link">{{ ftl('firefox-all-product-send-link') }}</a></p>
   {% endif %}
 
 </div>
diff --git a/bedrock/firefox/templates/firefox/browsers/chromebook.html b/bedrock/firefox/templates/firefox/browsers/chromebook.html
index ed68e163630..8df3f2b1407 100644
--- a/bedrock/firefox/templates/firefox/browsers/chromebook.html
+++ b/bedrock/firefox/templates/firefox/browsers/chromebook.html
@@ -115,7 +115,7 @@ <h2>{{ ftl('browsers-chromebook-is-it-hard') }}</h2>
           }
         ) }}
 
-        <p>{{ ftl('browsers-chromebook-install-firefox-as', url='href="https://support.mozilla.org/kb/run-firefox-chromeos?utm_source=www.mozilla.org-firefox-browsers-chromebook&amp;utm_medium=referral&amp;utm_campaign=seo" rel="external noopener" data-cta-text="Install Firefox for Chromebook" data-cta-type="link"'|safe) }}</p>
+        <p>{{ ftl('browsers-chromebook-install-firefox-as', url='href="https://support.mozilla.org/kb/run-firefox-chromeos?utm_source=www.mozilla.org-firefox-browsers-chromebook&amp;utm_medium=referral&amp;utm_campaign=seo" rel="external noopener" data-cta-text="Install Firefox for Chromebook" '|safe) }}</p>
       </div>
     </div>
   </section>
diff --git a/bedrock/firefox/templates/firefox/browsers/compare/brave.html b/bedrock/firefox/templates/firefox/browsers/compare/brave.html
index f61d78fa5f7..95bcc3cd958 100644
--- a/bedrock/firefox/templates/firefox/browsers/compare/brave.html
+++ b/bedrock/firefox/templates/firefox/browsers/compare/brave.html
@@ -20,8 +20,8 @@
 
 <p>{{ ftl('compare-shared-we-also-offer-easy') }}</p>
 <ul class="mzp-u-list-styled">
-  <li>{{ ftl('compare-shared-edit-pdfs-on-the-go', pdf='href="%s" data-link-text="Edit PDFs" data-link-type="link"'|safe|format(url('firefox.features.pdf-editor'))) }}</li>
-  <li>{{ ftl('compare-shared-translate-a-web-page', translate='href="%s" data-link-text="Translate a web page" data-link-type="link"'|safe|format(url('firefox.features.translate'))) }}</li>
+  <li>{{ ftl('compare-shared-edit-pdfs-on-the-go', pdf='href="%s" data-link-text="Edit PDFs"'|safe|format(url('firefox.features.pdf-editor'))) }}</li>
+  <li>{{ ftl('compare-shared-translate-a-web-page', translate='href="%s" data-link-text="Translate a web page"'|safe|format(url('firefox.features.translate'))) }}</li>
 </ul>
 
 <h2>{{ ftl('compare-shared-its-easy-to-switch') }}</h2>
diff --git a/bedrock/firefox/templates/firefox/browsers/compare/edge.html b/bedrock/firefox/templates/firefox/browsers/compare/edge.html
index bebb97d1e48..cb8e5ee50d2 100644
--- a/bedrock/firefox/templates/firefox/browsers/compare/edge.html
+++ b/bedrock/firefox/templates/firefox/browsers/compare/edge.html
@@ -18,8 +18,8 @@
 
 <p>{{ ftl('compare-shared-we-also-offer-easy') }}</p>
 <ul class="mzp-u-list-styled">
-  <li>{{ ftl('compare-shared-edit-pdfs-on-the-go', pdf='href="%s" data-link-text="Edit PDFs" data-link-type="link"'|safe|format(url('firefox.features.pdf-editor'))) }}</li>
-  <li>{{ ftl('compare-shared-translate-a-web-page', translate='href="%s" data-link-text="Translate a web page" data-link-type="link"'|safe|format(url('firefox.features.translate'))) }}</li>
+  <li>{{ ftl('compare-shared-edit-pdfs-on-the-go', pdf='href="%s" data-link-text="Edit PDFs"'|safe|format(url('firefox.features.pdf-editor'))) }}</li>
+  <li>{{ ftl('compare-shared-translate-a-web-page', translate='href="%s" data-link-text="Translate a web page"'|safe|format(url('firefox.features.translate'))) }}</li>
 </ul>
 
 <p>{{ ftl('compare-edge-and-we-make-it-easy-for-you') }}</p>
diff --git a/bedrock/firefox/templates/firefox/browsers/compare/index.html b/bedrock/firefox/templates/firefox/browsers/compare/index.html
index d5171262c0e..c20d416651d 100644
--- a/bedrock/firefox/templates/firefox/browsers/compare/index.html
+++ b/bedrock/firefox/templates/firefox/browsers/compare/index.html
@@ -14,7 +14,7 @@
   ga_title
 ) -%}
 <li class="c-compare-item">
-  <a href="{{ link }}" data-link-text="{{ ga_title }}" data-link-type="link">
+  <a href="{{ link }}" data-link-text="{{ ga_title }}">
     <h3 class="c-compare-item-title">{{ title }}</h3>
     <p class="c-compare-item-cta">{{ ftl('ui-learn-more') }}</p>
   </a>
diff --git a/bedrock/firefox/templates/firefox/browsers/compare/opera.html b/bedrock/firefox/templates/firefox/browsers/compare/opera.html
index e3afc1786f7..a3a24aa7777 100644
--- a/bedrock/firefox/templates/firefox/browsers/compare/opera.html
+++ b/bedrock/firefox/templates/firefox/browsers/compare/opera.html
@@ -16,8 +16,8 @@
 
 <p>{{ ftl('compare-shared-firefox-also-has-built-in') }}</p>
 <ul class="mzp-u-list-styled">
-  <li>{{ ftl('compare-shared-edit-pdfs-on-the-go', pdf='href="%s" data-link-text="Edit PDFs" data-link-type="link"'|safe|format(url('firefox.features.pdf-editor'))) }}</li>
-  <li>{{ ftl('compare-shared-translate-a-web-page', translate='href="%s" data-link-text="Translate a web page" data-link-type="link"'|safe|format(url('firefox.features.translate'))) }}</li>
+  <li>{{ ftl('compare-shared-edit-pdfs-on-the-go', pdf='href="%s" data-link-text="Edit PDFs"'|safe|format(url('firefox.features.pdf-editor'))) }}</li>
+  <li>{{ ftl('compare-shared-translate-a-web-page', translate='href="%s" data-link-text="Translate a web page"'|safe|format(url('firefox.features.translate'))) }}</li>
 </ul>
 
 <p>{{ ftl('compare-opera-firefox-offers-a-wide-range-of') }}</p>
diff --git a/bedrock/firefox/templates/firefox/browsers/compare/safari.html b/bedrock/firefox/templates/firefox/browsers/compare/safari.html
index 22608278c39..8769058eeac 100644
--- a/bedrock/firefox/templates/firefox/browsers/compare/safari.html
+++ b/bedrock/firefox/templates/firefox/browsers/compare/safari.html
@@ -17,8 +17,8 @@
 <p>{{ ftl('compare-safari-but-firefox-also-has-built-in') }}</p>
 
 <ul class="mzp-u-list-styled">
-  <li>{{ ftl('compare-shared-edit-pdfs-on-the-go', pdf='href="%s" data-link-text="Edit PDFs" data-link-type="link"'|safe|format(url('firefox.features.pdf-editor'))) }}</li>
-  <li>{{ ftl('compare-shared-translate-a-web-page', translate='href="%s" data-link-text="Translate a web page" data-link-type="link"'|safe|format(url('firefox.features.translate'))) }}</li>
+  <li>{{ ftl('compare-shared-edit-pdfs-on-the-go', pdf='href="%s" data-link-text="Edit PDFs"'|safe|format(url('firefox.features.pdf-editor'))) }}</li>
+  <li>{{ ftl('compare-shared-translate-a-web-page', translate='href="%s" data-link-text="Translate a web page"'|safe|format(url('firefox.features.translate'))) }}</li>
 </ul>
 
 <p>{{ ftl('compare-safari-firefox-offers-a-wide-range-of') }}</p>
diff --git a/bedrock/firefox/templates/firefox/browsers/mobile/index.html b/bedrock/firefox/templates/firefox/browsers/mobile/index.html
index bd83d023736..7864f230b64 100644
--- a/bedrock/firefox/templates/firefox/browsers/mobile/index.html
+++ b/bedrock/firefox/templates/firefox/browsers/mobile/index.html
@@ -83,14 +83,14 @@ <h1>{{ ftl('browsers-mobile-go-your-own-way') }}</h1>
           'height': '263'
         }
       ) }}
-      <h2 class="c-landing-grid-title"><a href="{{ url('firefox.browsers.mobile.android') }}" data-cta-type="link" data-cta-text="Firefox for Android">{{ ftl('browsers-mobile-firefox-for-android') }}</a></h2>
+      <h2 class="c-landing-grid-title"><a href="{{ url('firefox.browsers.mobile.android') }}" data-cta-text="Firefox for Android">{{ ftl('browsers-mobile-firefox-for-android') }}</a></h2>
       <p>{{ ftl('browsers-mobile-infinitely-customizable-private') }}</p>
 
       <p id="android-download">
         <a class="mzp-c-cta-link ga-product-download" href="{{ android_url }}" rel="external noopener" data-cta-text="Download (Android)" data-cta-type="firefox_mobile">{{ ftl('browsers-mobile-download') }}</a>
       </p>
 
-      <p><a class="mzp-c-cta-link ga-product-download" href="{{ url('firefox.browsers.mobile.android') }}" data-cta-type="link" data-cta-text="Android Learn More">{{ ftl('ui-learn-more') }}</a></p>
+      <p><a class="mzp-c-cta-link ga-product-download" href="{{ url('firefox.browsers.mobile.android') }}" data-cta-text="Android Learn More">{{ ftl('ui-learn-more') }}</a></p>
     </div>
 
     <div class="c-landing-grid-item">
@@ -105,14 +105,14 @@ <h2 class="c-landing-grid-title"><a href="{{ url('firefox.browsers.mobile.androi
           'height': '218'
         }
       ) }}
-      <h2 class="c-landing-grid-title"><a href="{{ url('firefox.browsers.mobile.ios') }}" data-cta-type="link" data-cta-text="Firefox for iOS">{{ ftl('browsers-mobile-firefox-for-ios') }}</a></h2>
+      <h2 class="c-landing-grid-title"><a href="{{ url('firefox.browsers.mobile.ios') }}" data-cta-text="Firefox for iOS">{{ ftl('browsers-mobile-firefox-for-ios') }}</a></h2>
       <p>{{ ftl('browsers-mobile-get-enhanced-tracking-protection') }}</p>
 
       <p id="ios-download">
         <a class="mzp-c-cta-link ga-product-download" href="{{ ios_url }}" rel="external noopener" data-cta-text="Download (iOS)" data-cta-type="firefox_mobile">{{ ftl('browsers-mobile-download') }}</a>
       </p>
 
-      <p><a class="mzp-c-cta-link ga-product-download" href="{{ url('firefox.browsers.mobile.ios') }}" data-cta-type="link" data-cta-text="iOS Learn More">{{ ftl('ui-learn-more') }}</a></p>
+      <p><a class="mzp-c-cta-link ga-product-download" href="{{ url('firefox.browsers.mobile.ios') }}" data-cta-text="iOS Learn More">{{ ftl('ui-learn-more') }}</a></p>
     </div>
 
     <div class="c-landing-grid-item">
@@ -128,7 +128,7 @@ <h2 class="c-landing-grid-title"><a href="{{ url('firefox.browsers.mobile.ios')
           'height': '218'
         }
       ) }}
-      <h2 class="c-landing-grid-title"><a href="{{ url('firefox.browsers.mobile.focus') }}" data-cta-type="link" data-cta-text="Firefox Focus">{{ ftl('browsers-mobile-firefox-focus') }}</a></h2>
+      <h2 class="c-landing-grid-title"><a href="{{ url('firefox.browsers.mobile.focus') }}" data-cta-text="Firefox Focus">{{ ftl('browsers-mobile-firefox-focus') }}</a></h2>
       <p>{{ ftl('browsers-mobile-looking-for-a-streamlined') }}</p>
 
       <div id="menu-focus-wrapper"  class="mzp-c-menu-list mzp-t-cta mzp-t-download">
@@ -139,7 +139,7 @@ <h3 class="mzp-c-menu-list-title">{{ ftl('browsers-mobile-download') }}</h3>
         </ul>
       </div>
 
-      <p><a class="mzp-c-cta-link" href="{{ url('firefox.browsers.mobile.focus') }}" data-cta-type="link" data-cta-text="Focus Learn More">{{ ftl('ui-learn-more') }}</a></p>
+      <p><a class="mzp-c-cta-link" href="{{ url('firefox.browsers.mobile.focus') }}" data-cta-text="Focus Learn More">{{ ftl('ui-learn-more') }}</a></p>
     </div>
 
   </section>
@@ -154,7 +154,7 @@ <h3 class="mzp-c-menu-list-title">{{ ftl('browsers-mobile-download') }}</h3>
     ) %}
       <h2>{{ ftl('browsers-mobile-see-how-firefox-for-desktop-compare-v2') }}</h2>
       <p class="c-compare-title mzp-has-zap-06">{{ ftl('browsers-mobile-see-how-firefox-for-desktop-strong-v2') }}</p>
-      <p><a class="mzp-c-cta-link" href="{{ url('firefox.browsers.compare.index') }}" data-cta-type="link" data-cta-text="Compare">{{ ftl('browsers-mobile-compare') }}</a></p>
+      <p><a class="mzp-c-cta-link" href="{{ url('firefox.browsers.compare.index') }}" data-cta-text="Compare">{{ ftl('browsers-mobile-compare') }}</a></p>
     {% endcall %}
   </section>
 
diff --git a/bedrock/firefox/templates/firefox/built-for-you/landing.de.html b/bedrock/firefox/templates/firefox/built-for-you/landing.de.html
index 0453c55c309..973300623d0 100644
--- a/bedrock/firefox/templates/firefox/built-for-you/landing.de.html
+++ b/bedrock/firefox/templates/firefox/built-for-you/landing.de.html
@@ -46,7 +46,7 @@
     <h1 class="mzp-u-title-lg">Gemacht mit Blick auf deine Sicherheit</h1>
     <p class="c-hero-tagline">Keine Kompromisse, bei den Dingen, die dir wichtig sind: Sicherheit, Produktivität und die Freiheit, so zu sein, wie du willst – mit Firefox.</p>
     <div class="cta-is-firefox">
-      <a id="set-as-default-button" href="{{ url('firefox.set-as-default.thanks') }}" class="mzp-c-button" data-cta-text="Mach Firefox zu deinem Standardbrowser" data-cta-type="button" data-cta-position="page-hero">
+      <a id="set-as-default-button" href="{{ url('firefox.set-as-default.thanks') }}" class="mzp-c-button" data-cta-text="Mach Firefox zu deinem Standardbrowser" data-cta-position="page-hero">
         Mach Firefox zu deinem Standardbrowser
       </a>
     </div>
@@ -167,7 +167,7 @@ <h3 class="c-feature-title">
     <h2 class="mzp-u-title-md">Rase durchs Web</h2>
     <p>Dank Firefox vergisst du, was Lag bedeutet. Unser Browser war nie schneller und lädt jetzt YouTube-Videos schneller als jemals zuvor.</p>
     <div class="cta-is-firefox">
-      <a id="set-as-default-button" href="{{ url('firefox.set-as-default.thanks') }}" class="mzp-c-button" data-cta-text="Mach Firefox zu deinem Standardbrowser" data-cta-type="button" data-cta-position="speed-section">
+      <a id="set-as-default-button" href="{{ url('firefox.set-as-default.thanks') }}" class="mzp-c-button" data-cta-text="Mach Firefox zu deinem Standardbrowser" data-cta-position="speed-section">
         Mach Firefox zu deinem Standardbrowser
       </a>
     </div>
@@ -188,7 +188,7 @@ <h2 class="mzp-u-title-md">Rase durchs Web</h2>
         <img class="mzp-c-callout-media" src="{{ static('img/firefox/built-for-you/choose.svg') }}" width="184" height="116" alt="">
         <h2 class="mzp-c-callout-title mzp-u-title-md">Wähle einen Browser, der für dich gemacht ist</h2>
         <div class="cta-is-firefox">
-          <a id="set-as-default-button" href="{{ url('firefox.set-as-default.thanks') }}" class="mzp-c-button" data-cta-text="Mach Firefox zu deinem Standardbrowser" data-cta-type="button" data-cta-position="page-footer">
+          <a id="set-as-default-button" href="{{ url('firefox.set-as-default.thanks') }}" class="mzp-c-button" data-cta-text="Mach Firefox zu deinem Standardbrowser" data-cta-position="page-footer">
             Mach Firefox zu deinem Standardbrowser
           </a>
         </div>
diff --git a/bedrock/firefox/templates/firefox/built-for-you/landing.fr.html b/bedrock/firefox/templates/firefox/built-for-you/landing.fr.html
index 8af0aa27d6f..e71731205de 100644
--- a/bedrock/firefox/templates/firefox/built-for-you/landing.fr.html
+++ b/bedrock/firefox/templates/firefox/built-for-you/landing.fr.html
@@ -46,7 +46,7 @@
     <h1 class="mzp-u-title-lg">Conçu pour ta sécurité</h1>
     <p class="c-hero-tagline">Ne fais plus de compromis sur ce qui compte pour toi : être en sécurité, plus productif et libre d’être qui tu veux, avec Firefox.</p>
     <div class="cta-is-firefox">
-      <a id="set-as-default-button" href="{{ url('firefox.set-as-default.thanks') }}" class="mzp-c-button" data-cta-text="Faites de Firefox votre navigateur par défaut" data-cta-type="button" data-cta-position="page-hero">
+      <a id="set-as-default-button" href="{{ url('firefox.set-as-default.thanks') }}" class="mzp-c-button" data-cta-text="Faites de Firefox votre navigateur par défaut" data-cta-position="page-hero">
         Faites de Firefox votre navigateur par défaut
       </a>
     </div>
@@ -167,7 +167,7 @@ <h3 class="c-feature-title">
     <h2 class="mzp-u-title-md">Accélère ton expérience web</h2>
     <p>Avec Firefox, fini le temps des pages lentes à charger. Notre navigateur n’a jamais été aussi rapide ; les vidéos Youtube se chargent en un éclair.</p>
     <div class="cta-is-firefox">
-      <a href="{{ url('firefox.set-as-default.thanks') }}" class="mzp-c-button" data-cta-text="Faites de Firefox votre navigateur par défaut" data-cta-type="button" data-cta-position="speed-section">
+      <a href="{{ url('firefox.set-as-default.thanks') }}" class="mzp-c-button" data-cta-text="Faites de Firefox votre navigateur par défaut" data-cta-position="speed-section">
         Faites de Firefox votre navigateur par défaut
       </a>
     </div>
@@ -188,7 +188,7 @@ <h2 class="mzp-u-title-md">Accélère ton expérience web</h2>
         <img class="mzp-c-callout-media" src="{{ static('img/firefox/built-for-you/choose.svg') }}" width="184" height="116" alt="">
         <h2 class="mzp-c-callout-title mzp-u-title-md">Choisis un navigateur pensé pour toi</h2>
         <div class="cta-is-firefox">
-          <a href="{{ url('firefox.set-as-default.thanks') }}" class="mzp-c-button" data-cta-text="Faites de Firefox votre navigateur par défaut" data-cta-type="button" data-cta-position="page-footer">
+          <a href="{{ url('firefox.set-as-default.thanks') }}" class="mzp-c-button" data-cta-text="Faites de Firefox votre navigateur par défaut" data-cta-position="page-footer">
             Faites de Firefox votre navigateur par défaut
           </a>
         </div>
diff --git a/bedrock/firefox/templates/firefox/challenge-the-default/landing-base.html b/bedrock/firefox/templates/firefox/challenge-the-default/landing-base.html
index 389399b0afc..5ac4c942479 100644
--- a/bedrock/firefox/templates/firefox/challenge-the-default/landing-base.html
+++ b/bedrock/firefox/templates/firefox/challenge-the-default/landing-base.html
@@ -36,8 +36,8 @@
 {% endblock %}
 
 {% macro cta_group(position) -%}
-  <a href="{{ url('firefox.set-as-default.thanks')}}" class="is-not-default mzp-c-button mzp-t-lg" data-cta-type="button" data-cta-text="Set as default" data-cta-position="{{ position }}">{{ cta_default }}</a>
-  <a href="{{ url('firefox.browsers.mobile.index') }}" class="is-default mzp-c-button mzp-t-lg" data-cta-type="button" data-cta-text="Firefox for Mobile" data-cta-position="{{ position }}">{{ cta_mobile }}</a>
+  <a href="{{ url('firefox.set-as-default.thanks')}}" class="is-not-default mzp-c-button mzp-t-lg" data-cta-text="Set as default" data-cta-position="{{ position }}">{{ cta_default }}</a>
+  <a href="{{ url('firefox.browsers.mobile.index') }}" class="is-default mzp-c-button mzp-t-lg" data-cta-text="Firefox for Mobile" data-cta-position="{{ position }}">{{ cta_mobile }}</a>
   {{ download_firefox_thanks(button_class='not-firefox', alt_copy=cta_download, download_location=position, locale_in_transition=True) }}
 {%- endmacro %}
 
@@ -390,7 +390,7 @@ <h3>{{ cred_community_title }}</h3>
 
   <section class="mzp-l-content mzp-t-content-md c-ctd-footer">
     <h3>{{ footer_title }}</h3>
-    <p>{{ footer_body|format('href="https://community.mozilla.org/" target="_blank" rel="noopener noreferrer" data-cta-type="link" data-cta-text="Community"')|safe }}</p>
+    <p>{{ footer_body|format('href="https://community.mozilla.org/" target="_blank" rel="noopener noreferrer" data-cta-text="Community"')|safe }}</p>
     {{ cta_group('footer') }}
     <p class="text-bottom mobile">{{ footer_mobile }}</p>
     <p class="text-bottom desktop">{{ footer_desktop }}</p>
diff --git a/bedrock/firefox/templates/firefox/channel/desktop.html b/bedrock/firefox/templates/firefox/channel/desktop.html
index b93975a7c1d..8eedd8afe36 100644
--- a/bedrock/firefox/templates/firefox/channel/desktop.html
+++ b/bedrock/firefox/templates/firefox/channel/desktop.html
@@ -67,7 +67,7 @@
   {% endcall %}
   <div class="l-notes mzp-l-content">
     <p class="show-linux">{{ ftl('download-button-using-debian', attrs='href="https://support.mozilla.org/products/firefox/install-and-update-firefox" rel="external noopener"
-    data-cta-type="link" data-cta-text="Get help with your installation"') }}</p>
+     data-cta-text="Get help with your installation"') }}</p>
     <ul>
       <li><a href="{{ firefox_url('desktop', 'notes', 'developer') }}">{{ ftl('firefox-channel-release-notes') }}</a></li>
       <li><a href="{{ url('firefox.developer.index') }}">{{ ftl('ui-learn-more') }}</a></li>
@@ -104,7 +104,7 @@
   <div class="l-notes mzp-l-content">
     <p class="show-linux">{{ ftl('download-button-using-debian',
       attrs='href="https://support.mozilla.org/products/firefox/install-and-update-firefox" rel="external noopener"
-      data-cta-type="link" data-cta-text="Get help with your installation"') }}</p>
+       data-cta-text="Get help with your installation"') }}</p>
     <ul>
       <li><a href="{{ firefox_url('desktop', 'notes', 'nightly') }}">{{ ftl('firefox-channel-release-notes') }}</a></li>
       <li><a rel="external" href="https://blog.nightly.mozilla.org/">{{ ftl('firefox-channel-nightly-blog') }}</a></li>
diff --git a/bedrock/firefox/templates/firefox/developer/index.html b/bedrock/firefox/templates/firefox/developer/index.html
index c208494e6cd..90395ed03e1 100644
--- a/bedrock/firefox/templates/firefox/developer/index.html
+++ b/bedrock/firefox/templates/firefox/developer/index.html
@@ -70,7 +70,7 @@ <h1>{{ ftl('firefox-developer-firefox-developer-edition') }}</h1>
     {{ download_firefox('alpha', platform='desktop', dom_id='intro-download', download_location='primary cta') }}
 
     <p class="show-linux">{{ ftl('download-button-using-debian', attrs='href="https://support.mozilla.org/products/firefox/install-and-update-firefox#w_install-firefox-deb-package-for-debian-based-distributions" rel="external noopener"
-    data-cta-type="link" data-cta-text="Get help with your installation"')}}</p>
+     data-cta-text="Get help with your installation"')}}</p>
     <p class="intro-feedback-note">
       {{ ftl('firefox-developer-firefox-developer-edition-sends') }}
       <a href="{{ url('privacy.notices.firefox') }}#pre-release" class="more">{{ ftl('ui-learn-more') }}</a>
diff --git a/bedrock/firefox/templates/firefox/developer/whatsnew-mdnplus.html b/bedrock/firefox/templates/firefox/developer/whatsnew-mdnplus.html
index 9bf11f24c8d..d63bb5b85d6 100644
--- a/bedrock/firefox/templates/firefox/developer/whatsnew-mdnplus.html
+++ b/bedrock/firefox/templates/firefox/developer/whatsnew-mdnplus.html
@@ -31,7 +31,7 @@
       <h1 class="c-mdn-header-title">{{ ftl('developer-mdnplus-more-mdn-your-mdn') }}</h1>
       <p class="c-mdn-header-intro">{{ ftl('developer-mdnplus-mdn-is-an-open-source') }}</p>
       <p class="c-mdn-header-tagline">{{ ftl('developer-mdnplus-support-mdn-and-make') }}</p>
-      <p class="c-mdn-header-cta"><a class="mzp-c-button mzp-t-button-lg mzp-t-dark" href="https://developer.mozilla.org/plus/?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=fxdev-whatsnew" data-cta-text="Get Started" data-cta-type="link" data-cta-position="primary">{{ ftl('developer-mdnplus-get-started') }}</a></p>
+      <p class="c-mdn-header-cta"><a class="mzp-c-button mzp-t-button-lg mzp-t-dark" href="https://developer.mozilla.org/plus/?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=fxdev-whatsnew" data-cta-text="Get Started" data-cta-position="primary">{{ ftl('developer-mdnplus-get-started') }}</a></p>
     </div>
 
     <div class="mandala-wrapper">
@@ -93,7 +93,7 @@ <h4 class="c-mdn-feature-title">{{ ftl('developer-mdnplus-mdns-entire-library-at
 
   <aside class="c-mdn-footer">
     <div class="mzp-l-content">
-      <p>{{ ftl('developer-mdnplus-resources-for-developers') }} <a class="mzp-c-button" href="https://developer.mozilla.org/plus/?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=fxdev-whatsnew" data-cta-text="Learn more" data-cta-type="link" data-cta-position="secondary">{{ ftl('ui-learn-more') }}</a></p>
+      <p>{{ ftl('developer-mdnplus-resources-for-developers') }} <a class="mzp-c-button" href="https://developer.mozilla.org/plus/?utm_source=www.mozilla.org&utm_medium=referral&utm_campaign=fxdev-whatsnew" data-cta-text="Learn more" data-cta-position="secondary">{{ ftl('ui-learn-more') }}</a></p>
     </div>
   </aside>
 </main>
diff --git a/bedrock/firefox/templates/firefox/family/includes/agreement.html b/bedrock/firefox/templates/firefox/family/includes/agreement.html
index 4c99e3f2dde..6e7ac3095ed 100644
--- a/bedrock/firefox/templates/firefox/family/includes/agreement.html
+++ b/bedrock/firefox/templates/firefox/family/includes/agreement.html
@@ -56,7 +56,7 @@
         <h3 class="c-subtitle">You made it! Now, it’s time to chat!</h3>
         <p>Be sure to discuss and sign this family agreement. Then your next move
           is probably hanging it on the refrigerator, huh?</p>
-        <a class="c-download" href="https://assets.mozilla.net/pdf/Firefox_FamilyAgreement.pdf" download data-cta-text="Download PDF" data-cta-type="button">Download PDF</a>
+        <a class="c-download" href="https://assets.mozilla.net/pdf/Firefox_FamilyAgreement.pdf" download data-cta-text="Download PDF" >Download PDF</a>
       </div> <!-- .c-content -->
     </div> <!-- .l-grid -->
   </div> <!-- .mzp-l-content -->
diff --git a/bedrock/firefox/templates/firefox/family/includes/download-firefox.html b/bedrock/firefox/templates/firefox/family/includes/download-firefox.html
index 561b94d913e..534a45a0044 100644
--- a/bedrock/firefox/templates/firefox/family/includes/download-firefox.html
+++ b/bedrock/firefox/templates/firefox/family/includes/download-firefox.html
@@ -17,13 +17,13 @@ <h2 class="c-download-firefox-title">We <img src="{{ static('img/firefox/family/
     </div>
 
     <div class="show-not-default">
-      <a class="mzp-c-button mzp-t-product" href="{{ url('firefox.set-as-default.thanks') }}" data-cta-text="Set Firefox as your default browser" data-cta-type="button">
+      <a class="mzp-c-button mzp-t-product" href="{{ url('firefox.set-as-default.thanks') }}" data-cta-text="Set Firefox as your default browser" >
         Set Firefox as your default browser
       </a>
     </div>
 
     <div class="show-mobile">
-      <a class="mzp-c-button mzp-t-product" href="{{ url('firefox.browsers.mobile.get-app') }}" data-cta-text="Get Firefox on your phone" data-cta-type="button">
+      <a class="mzp-c-button mzp-t-product" href="{{ url('firefox.browsers.mobile.get-app') }}" data-cta-text="Get Firefox on your phone" >
         Get Firefox on your phone
       </a>
     </div>
diff --git a/bedrock/firefox/templates/firefox/family/includes/modules/faq.html b/bedrock/firefox/templates/firefox/family/includes/modules/faq.html
index 43b70feb8db..1ef1f654ec4 100644
--- a/bedrock/firefox/templates/firefox/family/includes/modules/faq.html
+++ b/bedrock/firefox/templates/firefox/family/includes/modules/faq.html
@@ -13,7 +13,7 @@
     {{ module_tag(title='FAQs', anchor='faq') }}
     <div class="c-card t-shadow">
       <h3 class="c-subtitle">Not-so FAQs, answered by <span class="c-faq-logo">Common Sense Media</span></h3>
-      <p>Our friends at <a rel="external" data-cta-type="link" data-cta-position="firefox-for-families-faq" data-cta-text="Common Sense Media" href="https://www.commonsensemedia.org/{{ csm_utm_params }}">Common Sense Media</a> lend their expert advice on some of today’s toughest online  parenting scenarios.</p>
+      <p>Our friends at <a rel="external" data-cta-position="firefox-for-families-faq" data-cta-text="Common Sense Media" href="https://www.commonsensemedia.org/{{ csm_utm_params }}">Common Sense Media</a> lend their expert advice on some of today’s toughest online  parenting scenarios.</p>
     </div>
     <h4 class="c-faq-intro">Here are some toughies</h4>
     <!-- INSTAGRAM -->
@@ -30,12 +30,12 @@ <h5>I watched <i>The Social Dilemma</i>, now I’m considering banishing my kids
           <li>Do you ever feel like you've spent too much time online?</li>
           <li>Do you ever feel pressured to be online?</li>
         </ul>
-        <p>Next, <a rel="external" data-cta-type="link" data-cta-position="firefox-for-families-faq" data-cta-text="have a conversation" href="https://www.commonsensemedia.org/articles/4-conversations-to-have-with-older-kids-and-teens-about-their-screen-time-habits{{ csm_utm_params }}" >have a conversation</a> with them about their social media habits, and create a <a rel="external" data-cta-type="link" data-cta-position="firefox-for-families-faq" data-cta-text="family tech planner" href="https://www.commonsensemedia.org/family-tech-planners{{ csm_utm_params }}">family tech planner</a> with consistent rules. Consider having them take a break from social media for a set number of days (or hours).</p>
+        <p>Next, <a rel="external" data-cta-position="firefox-for-families-faq" data-cta-text="have a conversation" href="https://www.commonsensemedia.org/articles/4-conversations-to-have-with-older-kids-and-teens-about-their-screen-time-habits{{ csm_utm_params }}" >have a conversation</a> with them about their social media habits, and create a <a rel="external" data-cta-position="firefox-for-families-faq" data-cta-text="family tech planner" href="https://www.commonsensemedia.org/family-tech-planners{{ csm_utm_params }}">family tech planner</a> with consistent rules. Consider having them take a break from social media for a set number of days (or hours).</p>
 
         <h6 class="c-faq-more">More information to explore</h6>
         <ul class="mzp-u-list-styled">
-          <li><a rel="external" data-cta-type="link" data-cta-position="firefox-for-families-faq" data-cta-text="Parents' ultimate guide to Instagram" href="https://www.commonsensemedia.org/articles/parents-ultimate-guide-to-instagram{{ csm_utm_params }}">Parents' ultimate guide to Instagram</a></li>
-          <li><a rel="external" data-cta-type="link" data-cta-position="firefox-for-families-faq" data-cta-text="Practical tips for easing kids' social media anxiety" href="https://www.commonsensemedia.org/articles/practical-tips-for-easing-kids-social-media-anxiety{{ csm_utm_params }}">Practical tips for easing kids' social media anxiety</a></li>
+          <li><a rel="external" data-cta-position="firefox-for-families-faq" data-cta-text="Parents' ultimate guide to Instagram" href="https://www.commonsensemedia.org/articles/parents-ultimate-guide-to-instagram{{ csm_utm_params }}">Parents' ultimate guide to Instagram</a></li>
+          <li><a rel="external" data-cta-position="firefox-for-families-faq" data-cta-text="Practical tips for easing kids' social media anxiety" href="https://www.commonsensemedia.org/articles/practical-tips-for-easing-kids-social-media-anxiety{{ csm_utm_params }}">Practical tips for easing kids' social media anxiety</a></li>
         </ul>
       </div> <!-- .c-faq-answer -->
     </details>
@@ -45,12 +45,12 @@ <h6 class="c-faq-more">More information to explore</h6>
           <h5>What's the deal with Fortnite anyway?</h5>
       </summary>
       <div class="c-faq-answer">
-        <p><a rel="external" data-cta-type="link" data-cta-position="firefox-for-families-faq" data-cta-text="Fortnite" href="https://www.commonsensemedia.org/game-reviews/fortnite{{ csm_utm_params }}">Fortnite</a> is a fantastic action game, best suited for kids age 13+. Just watch out for in-game purchases and monitor the online chat, where kids could be paired with random teammates in public matches.</p>
+        <p><a rel="external" data-cta-position="firefox-for-families-faq" data-cta-text="Fortnite" href="https://www.commonsensemedia.org/game-reviews/fortnite{{ csm_utm_params }}">Fortnite</a> is a fantastic action game, best suited for kids age 13+. Just watch out for in-game purchases and monitor the online chat, where kids could be paired with random teammates in public matches.</p>
         <p>Kids love Fortnite for lots of reasons. Younger gamers are drawn to it because it has a more cartoonish look than other, more gory video games. Older kids like that it’s a way of interacting with peers and socializing with friends — as well as complete strangers — so it could require parental moderation.</p>
         <h6 class="c-faq-more">More information to explore</h6>
         <ul class="mzp-u-list-styled">
-          <li><a rel="external" data-cta-type="link" data-cta-position="firefox-for-families-faq" data-cta-text="Parents' ultimate guide to Fortnite" href="https://www.commonsensemedia.org/articles/parents-ultimate-guide-to-fortnite{{ csm_utm_params }}">Parents' ultimate guide to Fortnite</a></li>
-          <li><a rel="external" data-cta-type="link" data-cta-position="firefox-for-families-faq" data-cta-text="How do I talk to my kids about violence on TV and in movies or games?" href="https://www.commonsensemedia.org/articles/how-do-i-talk-to-my-kids-about-violence-on-tv-and-in-movies-or-games{{ csm_utm_params }}">How do I talk to my kids about violence on TV and in movies or games?</a></li>
+          <li><a rel="external" data-cta-position="firefox-for-families-faq" data-cta-text="Parents' ultimate guide to Fortnite" href="https://www.commonsensemedia.org/articles/parents-ultimate-guide-to-fortnite{{ csm_utm_params }}">Parents' ultimate guide to Fortnite</a></li>
+          <li><a rel="external" data-cta-position="firefox-for-families-faq" data-cta-text="How do I talk to my kids about violence on TV and in movies or games?" href="https://www.commonsensemedia.org/articles/how-do-i-talk-to-my-kids-about-violence-on-tv-and-in-movies-or-games{{ csm_utm_params }}">How do I talk to my kids about violence on TV and in movies or games?</a></li>
         </ul>
       </div> <!-- .c-faq-answer -->
     </details>
@@ -60,12 +60,12 @@ <h6 class="c-faq-more">More information to explore</h6>
           <h5>How long is too long to stick my preschooler in front of the iPad?</h5>
       </summary>
       <div class="c-faq-answer">
-        <p>Kids are spending more time with digital devices — and at younger ages — than ever before. <a href="https://www.healthychildren.org/English/family-life/Media/Pages/Where-We-Stand-TV-Viewing-Time.aspx" rel="external" data-cta-type="link" data-cta-position="firefox-for-families-faq" data-cta-text="The American Academy of Pediatrics">The American Academy of Pediatrics</a> has helpful guidelines for limiting screen time for young kids. They recommend preschoolers age 2-5 have no more than 1 hour of high-quality screen time each day. That's because little kids learn best from interacting with the physical world and with caring grown-ups.</p>
+        <p>Kids are spending more time with digital devices — and at younger ages — than ever before. <a href="https://www.healthychildren.org/English/family-life/Media/Pages/Where-We-Stand-TV-Viewing-Time.aspx" rel="external" data-cta-position="firefox-for-families-faq" data-cta-text="The American Academy of Pediatrics">The American Academy of Pediatrics</a> has helpful guidelines for limiting screen time for young kids. They recommend preschoolers age 2-5 have no more than 1 hour of high-quality screen time each day. That's because little kids learn best from interacting with the physical world and with caring grown-ups.</p>
         <p>The reality is, there's no magic number that's perfect for every kid. What's important is the quality and age-appropriateness of your kids' content, and how your kids engage with it, and balancing their time with and without screens in a way that's healthy and supports their development. With any entertainment you choose for your kids — movies, games, TV shows, apps — you want to look for how it engages your child. For example, if it makes them happy and gets them learning new skills and life lessons — great. But if it's stressing them out and teaching them negative behaviors — it's time to pull back from that media.</p>
         <h6 class="c-faq-more">More information to explore</h6>
         <ul class="mzp-u-list-styled">
-          <li><a rel="external" data-cta-type="link" data-cta-position="firefox-for-families-faq" data-cta-text="How much screen time is okay for my kid(s)?" href="https://www.commonsensemedia.org/articles/how-much-screen-time-is-ok-for-my-kids{{ csm_utm_params }}">How much screen time is okay for my kid(s)?</a></li>
-          <li><a rel="external" data-cta-type="link" data-cta-position="firefox-for-families-faq" data-cta-text="Be a role model: 4 ways to balance screen time around children" href="https://www.commonsensemedia.org/articles/be-a-role-model-4-ways-to-balance-screen-time-around-children{{ csm_utm_params }}">Be a role model: 4 ways to balance screen time around children</a></li>
+          <li><a rel="external" data-cta-position="firefox-for-families-faq" data-cta-text="How much screen time is okay for my kid(s)?" href="https://www.commonsensemedia.org/articles/how-much-screen-time-is-ok-for-my-kids{{ csm_utm_params }}">How much screen time is okay for my kid(s)?</a></li>
+          <li><a rel="external" data-cta-position="firefox-for-families-faq" data-cta-text="Be a role model: 4 ways to balance screen time around children" href="https://www.commonsensemedia.org/articles/be-a-role-model-4-ways-to-balance-screen-time-around-children{{ csm_utm_params }}">Be a role model: 4 ways to balance screen time around children</a></li>
         </ul>
       </div> <!-- .c-faq-answer -->
     </details>
@@ -83,11 +83,11 @@ <h5>Some kid made a TikTok about my kid, but didn't mention her by name. Is this
           <li>Hacking accounts</li>
           <li>Spreading mean rumors online</li>
         </ul>
-        <p>If you think your child is being bullied online, help them take a break. Then, think about whether they're being hurt on purpose or repeatedly. If the answer is no, talk with them about <a rel="external" data-cta-type="link" data-cta-position="firefox-for-families-faq" data-cta-text="dealing with hurtful online behavior" href="https://www.commonsensemedia.org/articles/what-should-i-teach-my-child-about-safe-online-behavior{{ csm_utm_params }}">dealing with hurtful online behavior</a>. If the answer is yes, <a rel="external" data-cta-type="link" data-cta-position="firefox-for-families-faq" data-cta-text="give your child strategies to try to stop the bullying" href="https://www.commonsensemedia.org/articles/what-should-i-do-if-my-child-is-bullied-online{{ csm_utm_params }}">give your child strategies to try to stop the bullying</a>.</p>
+        <p>If you think your child is being bullied online, help them take a break. Then, think about whether they're being hurt on purpose or repeatedly. If the answer is no, talk with them about <a rel="external" data-cta-position="firefox-for-families-faq" data-cta-text="dealing with hurtful online behavior" href="https://www.commonsensemedia.org/articles/what-should-i-teach-my-child-about-safe-online-behavior{{ csm_utm_params }}">dealing with hurtful online behavior</a>. If the answer is yes, <a rel="external" data-cta-position="firefox-for-families-faq" data-cta-text="give your child strategies to try to stop the bullying" href="https://www.commonsensemedia.org/articles/what-should-i-do-if-my-child-is-bullied-online{{ csm_utm_params }}">give your child strategies to try to stop the bullying</a>.</p>
         <h6 class="c-faq-more">More information to explore</h6>
         <ul class="mzp-u-list-styled">
-          <li><a rel="external" data-cta-type="link" data-cta-position="firefox-for-families-faq" data-cta-text="What is cyberbullying?" href="https://www.commonsensemedia.org/articles/what-is-cyberbullying{{ csm_utm_params }}">What is cyberbullying?</a></li>
-          <li><a rel="external" data-cta-type="link" data-cta-position="firefox-for-families-faq" data-cta-text="What is online harassment?" href="https://www.commonsensemedia.org/articles/what-is-online-harassment{{ csm_utm_params }}">What is online harassment?</a></li>
+          <li><a rel="external" data-cta-position="firefox-for-families-faq" data-cta-text="What is cyberbullying?" href="https://www.commonsensemedia.org/articles/what-is-cyberbullying{{ csm_utm_params }}">What is cyberbullying?</a></li>
+          <li><a rel="external" data-cta-position="firefox-for-families-faq" data-cta-text="What is online harassment?" href="https://www.commonsensemedia.org/articles/what-is-online-harassment{{ csm_utm_params }}">What is online harassment?</a></li>
         </ul>
       </div> <!-- .c-faq-answer -->
     </details>
@@ -99,11 +99,11 @@ <h5>C'mon, does it really matter if companies track what my kids do online? </h5
       <div class="c-faq-answer">
         <p>It's not about whether they collect it — it's a matter of what they do with it.</p>
         <p>Young people are the most surveilled and tracked generation ever. Their personal information, activities, hobbies and networks are exposed — and often for sale — from birth.  With this information, companies form detailed files that can determine children’s futures.</p>
-        <p>Kids’ online activity is largely on mobile devices, meaning their location, activities and conversations are tracked. And with an increase in community cameras, Bluetooth trackers and other sensors, kids are watched wherever they go. Luckily, there are <a rel="external" data-cta-type="link" data-cta-position="firefox-for-families-faq" data-cta-text="steps you can take to protect their privacy online" href="https://www.commonsensemedia.org/articles/how-do-i-protect-my-kids-privacy-online{{ csm_utm_params }}">steps you can take to protect their privacy online</a>.</p>
+        <p>Kids’ online activity is largely on mobile devices, meaning their location, activities and conversations are tracked. And with an increase in community cameras, Bluetooth trackers and other sensors, kids are watched wherever they go. Luckily, there are <a rel="external" data-cta-position="firefox-for-families-faq" data-cta-text="steps you can take to protect their privacy online" href="https://www.commonsensemedia.org/articles/how-do-i-protect-my-kids-privacy-online{{ csm_utm_params }}">steps you can take to protect their privacy online</a>.</p>
         <h6 class="c-faq-more">More information to explore</h6>
         <ul class="mzp-u-list-styled">
-          <li><a rel="external" data-cta-type="link" data-cta-position="firefox-for-families-faq" data-cta-text="A day in the life: Your privacy matters" href="https://www.commonsensemedia.org/videos/a-day-in-the-life-your-privacy-matters{{ csm_utm_params }}">A day in the life: Your privacy matters</a></li>
-          <li><a rel="external" data-cta-type="link" data-cta-position="firefox-for-families-faq" data-cta-text="How can I protect my family's data privacy?" href="https://www.commonsensemedia.org/articles/how-can-i-protect-my-familys-data-privacy{{ csm_utm_params }}">How can I protect my family's data privacy?</a></li>
+          <li><a rel="external" data-cta-position="firefox-for-families-faq" data-cta-text="A day in the life: Your privacy matters" href="https://www.commonsensemedia.org/videos/a-day-in-the-life-your-privacy-matters{{ csm_utm_params }}">A day in the life: Your privacy matters</a></li>
+          <li><a rel="external" data-cta-position="firefox-for-families-faq" data-cta-text="How can I protect my family's data privacy?" href="https://www.commonsensemedia.org/articles/how-can-i-protect-my-familys-data-privacy{{ csm_utm_params }}">How can I protect my family's data privacy?</a></li>
         </ul>
       </div> <!-- .c-faq-answer -->
     </details>
diff --git a/bedrock/firefox/templates/firefox/family/includes/resources.html b/bedrock/firefox/templates/firefox/family/includes/resources.html
index 70da06ebd49..7349858302e 100644
--- a/bedrock/firefox/templates/firefox/family/includes/resources.html
+++ b/bedrock/firefox/templates/firefox/family/includes/resources.html
@@ -73,6 +73,6 @@ <h3 class="c-subtitle">Can't get enough of this parenting/<br>internet stuff?</h
           desc="There are a few things to consider before giving parental controls a go."
         ) }}
     </div> <!-- .mzp-t-columns -->
-    <a class="mzp-c-button mzp-t-product" data-cta-type="link" data-cta-position="firefox-for-families-resources" data-cta-text="View more" href="https://blog.mozilla.org/en/uncategorized/the-tech-talk/">View more</a>
+    <a class="mzp-c-button mzp-t-product" data-cta-position="firefox-for-families-resources" data-cta-text="View more" href="https://blog.mozilla.org/en/uncategorized/the-tech-talk/">View more</a>
   </div> <!-- .mzp-l-content-->
 </section>
diff --git a/bedrock/firefox/templates/firefox/features/index.html b/bedrock/firefox/templates/firefox/features/index.html
index 3cf462d2488..c7362bf3487 100644
--- a/bedrock/firefox/templates/firefox/features/index.html
+++ b/bedrock/firefox/templates/firefox/features/index.html
@@ -15,7 +15,7 @@
   desc
 ) -%}
 <li class="c-feature-item">
-  <a href="{{ link }}" data-link-text="{{ ga_title }}" data-link-type="link">
+  <a href="{{ link }}" data-link-text="{{ ga_title }}">
     <h3 class="c-feature-item-title">{{ title }}</h3>
     <p>{{ desc }}</p>
     <p class="c-feature-item-cta">{{ ftl('ui-learn-more') }}</p>
diff --git a/bedrock/firefox/templates/firefox/features/translate.html b/bedrock/firefox/templates/firefox/features/translate.html
index f58802d21e9..7dd7d8c964c 100644
--- a/bedrock/firefox/templates/firefox/features/translate.html
+++ b/bedrock/firefox/templates/firefox/features/translate.html
@@ -69,5 +69,5 @@ <h2>{{ ftl('features-translate-what-languages-are-currently') }}</h2>
 <p>{{ ftl('features-translate-and-more-languages-are-in') }}</p>
 
 <h2>{{ ftl('features-translate-firefox-speaks-your-language') }}</h2>
-<p>{{ ftl('features-translate-the-firefox-translations-feature', download='href="%s" data-cta-type="link" data-cta-text="Get started in your preferred language"'|safe|format(url('firefox.new'))) }}</p>
+<p>{{ ftl('features-translate-the-firefox-translations-feature', download='href="%s" data-cta-text="Get started in your preferred language"'|safe|format(url('firefox.new'))) }}</p>
 {% endblock %}
diff --git a/bedrock/firefox/templates/firefox/includes/macros.html b/bedrock/firefox/templates/firefox/includes/macros.html
index 3a14d3d4549..a4eb92d03f8 100644
--- a/bedrock/firefox/templates/firefox/includes/macros.html
+++ b/bedrock/firefox/templates/firefox/includes/macros.html
@@ -82,7 +82,7 @@
         </strong>
       </a>
 
-      <p class="c-linux-debian">{{ ftl('download-button-using-debian', attrs='href="https://support.mozilla.org/kb/install-firefox-linux#w_install-firefox-deb-package-for-debian-based-distributions" rel="external noopener" data-cta-type="link"
+      <p class="c-linux-debian">{{ ftl('download-button-using-debian', attrs='href="https://support.mozilla.org/kb/install-firefox-linux#w_install-firefox-deb-package-for-debian-based-distributions" rel="external noopener"
       data-cta-text="You can set up our APT repository instead"')}}</p>
 
       <small class="mzp-c-button-download-privacy-link">
diff --git a/bedrock/firefox/templates/firefox/index.html b/bedrock/firefox/templates/firefox/index.html
index 1b568d005b1..105d1ff1639 100644
--- a/bedrock/firefox/templates/firefox/index.html
+++ b/bedrock/firefox/templates/firefox/index.html
@@ -75,13 +75,13 @@ <h1 class="mzp-has-zap-11">
           'height': '233'
         }
       ) }}
-      <h2 class="c-landing-grid-title"><a href="{{ url('firefox.new') }}" data-cta-type="link" data-cta-text="Desktop">{{ ftl('firefox-browsers-desktop') }}</a></h2>
+      <h2 class="c-landing-grid-title"><a href="{{ url('firefox.new') }}" data-cta-text="Desktop">{{ ftl('firefox-browsers-desktop') }}</a></h2>
       <p>{{ ftl('firefox-browsers-seriously-private-browsing') }}</p>
 
       <p id="desktop-download">
         {# Old IE users need to click a download button, the JS on the thank you page doesn't get them the right download if we send them there directly #}
         <!--[if IE]>
-          <a href="{{ url('firefox.new') }}" data-cta-type="link" data-cta-text="Firefox Desktop">{{ ftl('firefox-browsers-download-for-desktop') }}</a>
+          <a href="{{ url('firefox.new') }}" data-cta-text="Firefox Desktop">{{ ftl('firefox-browsers-download-for-desktop') }}</a>
         <![endif]-->
         <!--[if !IE]><!-->
           {# Download link should be locale neutral see issue 7982 #}
@@ -89,7 +89,7 @@ <h2 class="c-landing-grid-title"><a href="{{ url('firefox.new') }}" data-cta-typ
         <!--<![endif]-->
       </p>
 
-      <p><a class="mzp-c-cta-link" href="{{ url('firefox.new') }}" data-cta-type="link" data-cta-text="Desktop Learn More">{{ ftl('ui-learn-more') }}</a></p>
+      <p><a class="mzp-c-cta-link" href="{{ url('firefox.new') }}" data-cta-text="Desktop Learn More">{{ ftl('ui-learn-more') }}</a></p>
     </div>
 
     <div class="c-landing-grid-item">
@@ -104,7 +104,7 @@ <h2 class="c-landing-grid-title"><a href="{{ url('firefox.new') }}" data-cta-typ
           'height': '233'
         }
       ) }}
-      <h2 class="c-landing-grid-title "><a class="mzp-c-cta-link" href="{{ url('firefox.browsers.mobile.index') }}" data-cta-type="link" data-cta-text="Mobile">{{ ftl('firefox-browsers-mobile') }}</a></h2>
+      <h2 class="c-landing-grid-title "><a class="mzp-c-cta-link" href="{{ url('firefox.browsers.mobile.index') }}" data-cta-text="Mobile">{{ ftl('firefox-browsers-mobile') }}</a></h2>
       <p>{{ ftl('firefox-browsers-take-the-same-level-of-privacy') }}</p>
 
       <div class="appstore-android">
@@ -118,10 +118,10 @@ <h3 class="mzp-c-menu-list-title" data-testid="firefox-mobile-download-menu-butt
         <ul class="mzp-c-menu-list-list" id="menu-mobile">
           <li class="mzp-c-menu-list-item"><a href="{{ android_url }}" rel="external noopener" class="ga-product-download" data-cta-text="Download for Mobile - Android" data-cta-type="firefox_mobile" data-testid="firefox-android-menu-link">{{ ftl('firefox-browsers-android') }}</a></li>
           <li class="mzp-c-menu-list-item"><a href="{{ ios_url }}" rel="external noopener" class="ga-product-download" data-cta-text="Download for Mobile - iOS" data-cta-type="firefox_mobile" data-testid="firefox-ios-menu-link">{{ ftl('firefox-browsers-ios') }}</a></li>
-          <li class="mzp-c-menu-list-item t-getapp"><a href="{{ url('firefox.browsers.mobile.get-app') }}" data-cta-type="link" data-cta-text="Get App Mobile">{{ ftl('firefox-browsers-send-me-a-link') }}</a></li>
+          <li class="mzp-c-menu-list-item t-getapp"><a href="{{ url('firefox.browsers.mobile.get-app') }}" data-cta-text="Get App Mobile">{{ ftl('firefox-browsers-send-me-a-link') }}</a></li>
         </ul>
       </div>
-      <p><a class="mzp-c-cta-link" href="{{ url('firefox.browsers.mobile.index') }}" data-cta-type="link" data-cta-text="Mobile Learn More">{{ ftl('ui-learn-more') }}</a></p>
+      <p><a class="mzp-c-cta-link" href="{{ url('firefox.browsers.mobile.index') }}" data-cta-text="Mobile Learn More">{{ ftl('ui-learn-more') }}</a></p>
     </div>
 
     <div class="c-landing-grid-item">
@@ -136,10 +136,10 @@ <h3 class="mzp-c-menu-list-title" data-testid="firefox-mobile-download-menu-butt
           'height': '233'
         }
       ) }}
-      <h2 class="c-landing-grid-title"><a href="{{ url('firefox.enterprise.index') }}" data-cta-type="link" data-cta-text="Enterprise">{{ ftl('firefox-browsers-enterprise') }}</a></h2>
+      <h2 class="c-landing-grid-title"><a href="{{ url('firefox.enterprise.index') }}" data-cta-text="Enterprise">{{ ftl('firefox-browsers-enterprise') }}</a></h2>
       <p>{{ ftl('firefox-browsers-get-unmatched-data-protection') }}</p>
-      <p><a class="mzp-c-cta-link" href="{{ url('firefox.enterprise.index') }}#download" data-cta-type="link" data-cta-text="Enterprise packages">{{ ftl('firefox-browsers-enterprise-packages') }}</a></p>
-      <p><a class="mzp-c-cta-link" href="{{ url('firefox.enterprise.index') }}" data-cta-type="link" data-cta-text="Enterprise Learn More">{{ ftl('ui-learn-more') }}</a></p>
+      <p><a class="mzp-c-cta-link" href="{{ url('firefox.enterprise.index') }}#download" data-cta-text="Enterprise packages">{{ ftl('firefox-browsers-enterprise-packages') }}</a></p>
+      <p><a class="mzp-c-cta-link" href="{{ url('firefox.enterprise.index') }}" data-cta-text="Enterprise Learn More">{{ ftl('ui-learn-more') }}</a></p>
     </div>
   </div>
 
diff --git a/bedrock/firefox/templates/firefox/new/basic/thanks.html b/bedrock/firefox/templates/firefox/new/basic/thanks.html
index d479392fd80..38de65a8a2e 100644
--- a/bedrock/firefox/templates/firefox/new/basic/thanks.html
+++ b/bedrock/firefox/templates/firefox/new/basic/thanks.html
@@ -50,9 +50,9 @@ <h1 class="mzp-c-callout-title show-unknown">{{ ftl('firefox-new-download-interr
     {% if ftl_has_messages('firefox-new-if-you-see-a-prompt', 'firefox-new-visit-support-for-more') %}
       <aside class="c-windows-disclaimer mzp-c-emphasis-box show-windows-10-plus">
         <img class="c-windows-disclaimer-logo" src="{{ static('img/logos/windows/logo-windows-black.svg') }}" alt="{{ ftl('firefox-new-windows') }}" width="132" height="28">
-        <p>{{ ftl('firefox-new-if-you-see-a-prompt', attrs='href="https://support.mozilla.org/kb/windows-10-warns-me-use-microsoft-verified-app%s" rel="external noopener" data-cta-type="link" data-cta-text="Get help with your installation"'|safe|format(referrals)) }}</p>
+        <p>{{ ftl('firefox-new-if-you-see-a-prompt', attrs='href="https://support.mozilla.org/kb/windows-10-warns-me-use-microsoft-verified-app%s" rel="external noopener" data-cta-text="Get help with your installation"'|safe|format(referrals)) }}</p>
 
-        <p><a href="https://support.mozilla.org/kb/windows-10-warns-me-use-microsoft-verified-app{{ referrals }}" rel="external noopener" data-cta-type="link" data-cta-text="Visit Support for More Details">{{ ftl('firefox-new-visit-support-for-more') }}</a></p>
+        <p><a href="https://support.mozilla.org/kb/windows-10-warns-me-use-microsoft-verified-app{{ referrals }}" rel="external noopener" data-cta-text="Visit Support for More Details">{{ ftl('firefox-new-visit-support-for-more') }}</a></p>
       </aside>
     {% endif %}
 
@@ -65,7 +65,7 @@ <h1 class="mzp-c-callout-title show-unknown">{{ ftl('firefox-new-download-interr
               class="mzp-c-button mzp-t-product">{{ ftl('download-button-linux-64-v2') }}</a>
           </div>
           {% set attrs = 'href="https://support.mozilla.org/kb/install-firefox-linux%s#w_install-firefox-deb-package-for-debian-based-distributions" rel="external noopener"
-          data-cta-type="link" data-cta-text="You can set up our APT repository instead"'|safe|format(referrals) %}
+           data-cta-text="You can set up our APT repository instead"'|safe|format(referrals) %}
           <p class="linux-deb-text">{{ ftl('download-button-using-debian', attrs=attrs) }}</p>
         </div>
         {# Edge-case platform support messaging #}
diff --git a/bedrock/firefox/templates/firefox/new/desktop/download.html b/bedrock/firefox/templates/firefox/new/desktop/download.html
index e4775aa84f7..654b7d9a828 100644
--- a/bedrock/firefox/templates/firefox/new/desktop/download.html
+++ b/bedrock/firefox/templates/firefox/new/desktop/download.html
@@ -69,7 +69,7 @@
 
 {% if outdated %}
 
-  {% set update_url = 'href="%s" data-cta-type="link" data-cta-text="Update to the latest version"'|safe|format(('https://support.mozilla.org/kb/update-firefox-latest-release' + referrals)) %}
+  {% set update_url = 'href="%s" data-cta-text="Update to the latest version"'|safe|format(('https://support.mozilla.org/kb/update-firefox-latest-release' + referrals)) %}
 
   {% if ftl_has_messages('firefox-desktop-out-of-date') %}
     <aside class="c-page-header-notification">
@@ -93,7 +93,7 @@ <h2 class="mzp-has-zap-7">{{ ftl('firefox-desktop-download-get-the-browser') }}<
 
           <div class="c-intro-download-alt"><a href="{{ url('firefox.all') }}">{{ ftl('firefox-desktop-download-download-options') }}</a></div>
 
-          <div class="c-intro-download-alt"><a href="https://support.mozilla.org/products/firefox{{ referrals }}&utm_content=browser-support" rel="external noopener" data-cta-type="link" data-cta-text="Firefox browser support">{{ ftl('firefox-desktop-download-browser-support') }}</a></div>
+          <div class="c-intro-download-alt"><a href="https://support.mozilla.org/products/firefox{{ referrals }}&utm_content=browser-support" rel="external noopener" data-cta-text="Firefox browser support">{{ ftl('firefox-desktop-download-browser-support') }}</a></div>
         </div>
       </div>
       <div class="c-block-media l-v-center">
@@ -195,7 +195,7 @@ <h3 class="mzp-u-title-xs">{{ feature3_title }}</h3>
       </ul>
 
     {% if LANG.startswith('en-') %}
-      <p class="c-notes"><a class="mzp-c-cta-link" href="{{ url('firefox.notes') }}" data-cta-type="link" data-cta-text="See Release Notes">See Release Notes</a></p>
+      <p class="c-notes"><a class="mzp-c-cta-link" href="{{ url('firefox.notes') }}" data-cta-text="See Release Notes">See Release Notes</a></p>
     {% endif %}
     </div>
   </section>
@@ -228,7 +228,7 @@ <h3 class="mzp-u-title-xs">An extra layer of protection</h3>
         </li>
       </ul>
 
-      <p class="c-notes"><a class="mzp-c-cta-link" href="{{ url('firefox.notes') }}" data-cta-type="link" data-cta-text="See Release Notes">See Release Notes</a></p>
+      <p class="c-notes"><a class="mzp-c-cta-link" href="{{ url('firefox.notes') }}" data-cta-text="See Release Notes">See Release Notes</a></p>
     </div>
   </section>
 {% endif %}
@@ -265,7 +265,7 @@ <h3 class="mzp-u-title-sm">{{ ftl('firefox-desktop-download-we-block-the-ad') }}
         <div class="c-block-body l-v-center l-h-end">
           <h3 class="mzp-u-title-sm">{{ ftl('firefox-desktop-download-for-everyone') }}</h3>
           <p>{{ ftl('firefox-desktop-download-available-in-over') }}</p>
-          <p><a id="system-requirements" href="{{ url('firefox.sysreq') }}" class="mzp-c-cta-link" data-cta-type="link" data-cta-text="Review system requirements">{{ ftl('firefox-desktop-download-review-system-req') }}</a></p>
+          <p><a id="system-requirements" href="{{ url('firefox.sysreq') }}" class="mzp-c-cta-link" data-cta-text="Review system requirements">{{ ftl('firefox-desktop-download-review-system-req') }}</a></p>
         </div>
         <div class="c-block-media l-v-center l-h-start l-media-constrain-on-sm">
           {{ download_picture('everyone', 367, 302, '', 'mzp-c-block-media-img') }}
@@ -443,7 +443,7 @@ <h2 class="mzp-c-section-heading mzp-has-zap-16">{{ ftl('firefox-desktop-downloa
     <ul class="c-trio">
       <li>
         <h3 class="mzp-u-title-xs">{{ ftl('firefox-desktop-download-extensions-for-every') }}</h3>
-        {% set extensions_attrs = 'href="https://addons.mozilla.org/firefox/extensions/%s" rel="external noopener" data-cta-type="link" data-cta-text="extension for everyone"'|safe|format(referrals) %}
+        {% set extensions_attrs = 'href="https://addons.mozilla.org/firefox/extensions/%s" rel="external noopener" data-cta-text="extension for everyone"'|safe|format(referrals) %}
         <p>{{ ftl('firefox-desktop-download-from-security-to', attrs=extensions_attrs) }}</p>
       </li>
 
@@ -476,7 +476,7 @@ <h2 class="mzp-c-section-heading mzp-has-zap-9">{{ ftl('firefox-desktop-download
           }
         ) }}
         <h3 class="mzp-u-title-xs">{{ ftl('firefox-desktop-download-challenging-the-status') }}</h3>
-        {% set created_attrs = 'href="%s" data-cta-type="link" data-cta-text="created by Mozilla"'|safe|format(url('mozorg.about.index')) %}
+        {% set created_attrs = 'href="%s" data-cta-text="created by Mozilla"'|safe|format(url('mozorg.about.index')) %}
         <p>{{ ftl('firefox-desktop-download-firefox-was-created', attrs=created_attrs) }}</p>
       </div>
 
@@ -493,7 +493,7 @@ <h3 class="mzp-u-title-xs">{{ ftl('firefox-desktop-download-challenging-the-stat
           }
         ) }}
         <h3 class="mzp-u-title-xs">{{ ftl('firefox-desktop-download-your-privacy-comes') }}</h3>
-        {% set internet_attrs = 'href="%s" data-cta-type="link" data-cta-text="Personal Data Promise"'|safe|format(url('privacy')) %}
+        {% set internet_attrs = 'href="%s" data-cta-text="Personal Data Promise"'|safe|format(url('privacy')) %}
         <p>{{ ftl('firefox-desktop-download-as-the-internet', attrs=internet_attrs) }}</p>
       </div>
     </div>
@@ -513,7 +513,7 @@ <h3 class="mzp-u-title-xs">{{ ftl('firefox-desktop-download-works-with-google')
       <div class="mzp-c-card js-animate">
         {{ download_picture('contain-mr1', '131', 138) }}
         <h3 class="mzp-u-title-xs">{{ ftl('firefox-desktop-download-facebook-container') }}</h3>
-        {% set addon_attrs = 'href="https://addons.mozilla.org/firefox/addon/facebook-container/%s" rel="external noopener" data-cta-type="link" data-cta-text="Download this browser extension"'|safe|format(referrals) %}
+        {% set addon_attrs = 'href="https://addons.mozilla.org/firefox/addon/facebook-container/%s" rel="external noopener" data-cta-text="Download this browser extension"'|safe|format(referrals) %}
         <p>{{ ftl('firefox-desktop-download-download-this-browser', attrs=addon_attrs) }}</p>
       </div>
 
@@ -528,14 +528,14 @@ <h3 class="mzp-u-title-xs">{{ ftl('firefox-desktop-download-sync-your-devices')
       <div class="mzp-c-card js-animate">
         {{ download_picture('screenshots-mr1', '131', 138) }}
         <h3 class="mzp-u-title-xs">{{ ftl('firefox-desktop-download-screenshots') }}</h3>
-        {% set screenshot_attrs = 'href="https://support.mozilla.org/kb/firefox-screenshots%s" rel="external noopener" data-cta-type="link" data-cta-text="screenshot"'|safe|format(referrals) %}
+        {% set screenshot_attrs = 'href="https://support.mozilla.org/kb/firefox-screenshots%s" rel="external noopener" data-cta-text="screenshot"'|safe|format(referrals) %}
         <p>{{ ftl('firefox-desktop-download-grab-a-high', attrs=screenshot_attrs) }}</p>
       </div>
 
       <div class="mzp-c-card js-animate">
         {{ download_picture('etp', '134', 138) }}
         <h3 class="mzp-u-title-xs">{{ ftl('firefox-desktop-download-enhanced-tracking-protection') }}</h3>
-        {% set automatically_attrs = 'href="https://support.mozilla.org/kb/enhanced-tracking-protection-firefox-desktop%s" rel="external noopener" data-cta-type="link" data-cta-text="block many trackers"'|safe|format(referrals) %}
+        {% set automatically_attrs = 'href="https://support.mozilla.org/kb/enhanced-tracking-protection-firefox-desktop%s" rel="external noopener" data-cta-text="block many trackers"'|safe|format(referrals) %}
         <p>{{ ftl('firefox-desktop-download-firefox-automatically', attrs=automatically_attrs) }}</p>
       </div>
 
@@ -549,7 +549,7 @@ <h3 class="mzp-u-title-xs">{{ ftl('firefox-desktop-download-picture-in-picture')
   </section>
 
   <section class="c-support">
-    {% set questions_attrs = 'href="https://support.mozilla.org/products/firefox%s&utm_content=mozilla-support" rel="external noopener" data-cta-type="link" data-cta-text="Mozilla support"'|safe|format(referrals) %}
+    {% set questions_attrs = 'href="https://support.mozilla.org/products/firefox%s&utm_content=mozilla-support" rel="external noopener" data-cta-text="Mozilla support"'|safe|format(referrals) %}
     {{ ftl('firefox-desktop-download-questions', attrs=questions_attrs) }}
   </section>
 
diff --git a/bedrock/firefox/templates/firefox/new/desktop/thanks.html b/bedrock/firefox/templates/firefox/new/desktop/thanks.html
index 07dd45f7bb4..26dcd1c4eea 100644
--- a/bedrock/firefox/templates/firefox/new/desktop/thanks.html
+++ b/bedrock/firefox/templates/firefox/new/desktop/thanks.html
@@ -56,19 +56,19 @@ <h1 class="c-section-title show-unknown">{{ ftl('firefox-desktop-download-interr
   {% if ftl_has_messages('firefox-desktop-download-if-you-see-a-prompt', 'firefox-desktop-download-visit-support-for-more') %}
     <aside class="c-windows-disclaimer mzp-c-emphasis-box show-windows-10-plus">
       <img class="c-windows-disclaimer-logo" src="{{ static('img/logos/windows/logo-windows-black.svg') }}" alt="{{ ftl('firefox-desktop-download-windows') }}" width="132" height="28">
-      <p>{{ ftl('firefox-desktop-download-if-you-see-a-prompt', attrs='href="https://support.mozilla.org/kb/windows-10-warns-me-use-microsoft-verified-app%s" rel="external noopener" data-cta-type="link" data-cta-text="Get help with your installation"'|safe|format(referrals)) }}</p>
+      <p>{{ ftl('firefox-desktop-download-if-you-see-a-prompt', attrs='href="https://support.mozilla.org/kb/windows-10-warns-me-use-microsoft-verified-app%s" rel="external noopener" data-cta-text="Get help with your installation"'|safe|format(referrals)) }}</p>
 
-      <p><a href="https://support.mozilla.org/kb/windows-10-warns-me-use-microsoft-verified-app{{ referrals }}" rel="external noopener" data-cta-type="link" data-cta-text="Visit Support for More Details">{{ ftl('firefox-desktop-download-visit-support-for-more') }}</a></p>
+      <p><a href="https://support.mozilla.org/kb/windows-10-warns-me-use-microsoft-verified-app{{ referrals }}" rel="external noopener" data-cta-text="Visit Support for More Details">{{ ftl('firefox-desktop-download-visit-support-for-more') }}</a></p>
     </aside>
   {% endif %}
 
     <div class="c-support-install">
       <p class="show-mac">
-        {% set support_mac_attrs = 'href="https://support.mozilla.org/kb/how-download-and-install-firefox-mac%s" rel="external noopener" data-cta-type="link" data-cta-text="Get help with your installation"'|safe|format(referrals) %}
+        {% set support_mac_attrs = 'href="https://support.mozilla.org/kb/how-download-and-install-firefox-mac%s" rel="external noopener" data-cta-text="Get help with your installation"'|safe|format(referrals) %}
         {{ ftl('firefox-desktop-download-get-help', attrs=support_mac_attrs) }}
       </p>
       <p class="show-windows">
-        {% set support_windows_attrs = 'href="https://support.mozilla.org/kb/how-download-and-install-firefox-windows%s" rel="external noopener" data-cta-type="link" data-cta-text="Get help with your installation"'|safe|format(referrals) %}
+        {% set support_windows_attrs = 'href="https://support.mozilla.org/kb/how-download-and-install-firefox-windows%s" rel="external noopener" data-cta-text="Get help with your installation"'|safe|format(referrals) %}
         {{ ftl('firefox-desktop-download-get-help', attrs=support_windows_attrs) }}
       </p>
       <div class="show-linux">
@@ -76,11 +76,11 @@ <h1 class="c-section-title show-unknown">{{ ftl('firefox-desktop-download-interr
           <a href="{{ settings.BOUNCER_URL }}?product=firefox-latest-ssl&os=linux&lang={{ LANG }}" class="mzp-c-button mzp-t-product" data-testid="thanks-download-button-linux-32">{{ ftl('download-button-linux-32-v2') }}</a>
           <a href="{{ settings.BOUNCER_URL }}?product=firefox-latest-ssl&os=linux64&lang={{ LANG }}" class="mzp-c-button mzp-t-product" data-testid="thanks-download-button-linux-64">{{ ftl('download-button-linux-64-v2') }}</a>
         </div>
-        {% set attrs = 'href="https://support.mozilla.org/kb/install-firefox-linux%s#w_install-firefox-deb-package-for-debian-based-distributions" rel="external noopener" data-cta-type="link" data-cta-text="You can set up our APT repository instead"'|safe|format(referrals) %}
+        {% set attrs = 'href="https://support.mozilla.org/kb/install-firefox-linux%s#w_install-firefox-deb-package-for-debian-based-distributions" rel="external noopener" data-cta-text="You can set up our APT repository instead"'|safe|format(referrals) %}
         <p class="linux-deb-text">{{ ftl('download-button-using-debian', attrs=attrs) }}</p>
       </div>
       <p class="show-else">
-        {% set support_else_attrs = 'href="https://support.mozilla.org/products/firefox/install-and-update-firefox%s" rel="external noopener" data-cta-type="link" data-cta-text="Get help with your installation"'|safe|format(referrals) %}
+        {% set support_else_attrs = 'href="https://support.mozilla.org/products/firefox/install-and-update-firefox%s" rel="external noopener" data-cta-text="Get help with your installation"'|safe|format(referrals) %}
         {{ ftl('firefox-desktop-download-get-help', attrs=support_else_attrs) }}
       </p>
 
diff --git a/bedrock/firefox/templates/firefox/nightly/firstrun.html b/bedrock/firefox/templates/firefox/nightly/firstrun.html
index 124e658d201..ff165ce34f2 100644
--- a/bedrock/firefox/templates/firefox/nightly/firstrun.html
+++ b/bedrock/firefox/templates/firefox/nightly/firstrun.html
@@ -61,7 +61,7 @@ <h2 class="contribute-title">{{ ftl('nightly-firstrun-choose-an-area') }}</h2>
           base_el='li'
         ) %}
           <p>{{ ftl('nightly-firstrun-find-and-file-bugs') }}</p>
-          <a href="https://wiki.mozilla.org/Nightly#Filing_Bugs" class="mzp-c-button mzp-t-product mzp-t-dark" data-cta-type="button" data-cta-text="Start testing">{{ ftl('nightly-firstrun-start-testing') }}</a>
+          <a href="https://wiki.mozilla.org/Nightly#Filing_Bugs" class="mzp-c-button mzp-t-product mzp-t-dark" data-cta-text="Start testing">{{ ftl('nightly-firstrun-start-testing') }}</a>
         {% endcall %}
 
         {% call picto(
@@ -78,7 +78,7 @@ <h2 class="contribute-title">{{ ftl('nightly-firstrun-choose-an-area') }}</h2>
           base_el='li'
         ) %}
           <p>{{ ftl('nightly-firstrun-file-bugs-and-work') }}</p>
-          <a href="https://firefox-source-docs.mozilla.org/contributing/contributing_to_mozilla.html" class="mzp-c-button mzp-t-product mzp-t-dark" data-cta-type="button" data-cta-text="Start coding">{{ ftl('nightly-firstrun-start-coding') }}</a>
+          <a href="https://firefox-source-docs.mozilla.org/contributing/contributing_to_mozilla.html" class="mzp-c-button mzp-t-product mzp-t-dark" data-cta-text="Start coding">{{ ftl('nightly-firstrun-start-coding') }}</a>
         {% endcall %}
 
         {% call picto(
@@ -95,7 +95,7 @@ <h2 class="contribute-title">{{ ftl('nightly-firstrun-choose-an-area') }}</h2>
           base_el='li'
         ) %}
           <p>{{ ftl('nightly-firstrun-make-firefox-available') }}</p>
-          <a href="{{ ftl('nightly-firstrun-contribute-link') }}" class="mzp-c-button mzp-t-product mzp-t-dark" data-cta-type="button" data-cta-text="Start localizing">{{ ftl('nightly-firstrun-start-localizing') }}</a>
+          <a href="{{ ftl('nightly-firstrun-contribute-link') }}" class="mzp-c-button mzp-t-product mzp-t-dark" data-cta-text="Start localizing">{{ ftl('nightly-firstrun-start-localizing') }}</a>
         {% endcall %}
       </ul>
     </div>
diff --git a/bedrock/firefox/templates/firefox/nightly/whatsnew.html b/bedrock/firefox/templates/firefox/nightly/whatsnew.html
index bf1bc0f290b..4feec29415f 100644
--- a/bedrock/firefox/templates/firefox/nightly/whatsnew.html
+++ b/bedrock/firefox/templates/firefox/nightly/whatsnew.html
@@ -52,7 +52,7 @@ <h4 class="mzp-c-callout-title">¿Quieres ayudar en España?</h4>
                   <p>¿Quieres implicarte en uno de los proyectos open source más importantes en el mundo y ayudarnos a crear una web más abierta para todos?</p>
               </div>
 
-              <p><a href="https://chat.mozilla.org/#/room/#spain:mozilla.org" class="mzp-c-button mzp-t-dark" type="button" data-cta-type="button" data-cta-text="Join Spain channel">¡Entra en el chat y hablemos!</a></p>
+              <p><a href="https://chat.mozilla.org/#/room/#spain:mozilla.org" class="mzp-c-button mzp-t-dark" type="button" data-cta-text="Join Spain channel">¡Entra en el chat y hablemos!</a></p>
           </div>
       </section>
       <br>
diff --git a/bedrock/firefox/templates/firefox/nothing-personal/index.html b/bedrock/firefox/templates/firefox/nothing-personal/index.html
index 8cda3ef6ae4..1a1d77610c6 100644
--- a/bedrock/firefox/templates/firefox/nothing-personal/index.html
+++ b/bedrock/firefox/templates/firefox/nothing-personal/index.html
@@ -35,9 +35,9 @@ <h1 class="c-page-header-logo-fx">Firefox by Mozilla</h1>
       <div class="cta-group">
         <p>Feeling browser-curious? We won’t tell. <span aria-hidden="true">>>>>></span></p>
 
-        <a href="https://blog.mozilla.org/en/firefox/" class="is-default mzp-c-button mzp-t-lg" data-cta-type="button" data-cta-text="Learn more" data-cta-position="primary">Learn more</a>
+        <a href="https://blog.mozilla.org/en/firefox/" class="is-default mzp-c-button mzp-t-lg" data-cta-text="Learn more" data-cta-position="primary">Learn more</a>
 
-        <a href="{{ url('firefox.set-as-default.thanks')}}" class="is-not-default mzp-c-button mzp-t-lg" data-cta-type="button" data-cta-text="Set as default" data-cta-position="primary">Set as default</a>
+        <a href="{{ url('firefox.set-as-default.thanks')}}" class="is-not-default mzp-c-button mzp-t-lg" data-cta-text="Set as default" data-cta-position="primary">Set as default</a>
 
         {{ download_firefox_thanks(alt_copy='Download Firefox', dom_id='protocol-nav-download-firefox', button_class='mzp-t-primary mzp-t-lg c-download-firefox-cta', download_location='primary') }}
 
diff --git a/bedrock/firefox/templates/firefox/pocket.html b/bedrock/firefox/templates/firefox/pocket.html
index 777b2ea8a91..7b992d32940 100644
--- a/bedrock/firefox/templates/firefox/pocket.html
+++ b/bedrock/firefox/templates/firefox/pocket.html
@@ -45,7 +45,7 @@ <h1>
       An Award-Winning App From Firefox
     </h1>
     <p>Over 10 million users rely on Pocket to discover and savor the best articles, news, stories and videos. And as a member of the Firefox family, privacy is paramount.</p>
-    <p>{{ pocket_fxa_button(entrypoint=_entrypoint, button_text='Try Pocket Now', optional_parameters={'s': _source}, optional_attributes={'data-cta-text': 'Try Pocket Now', 'data-cta-type': 'activate pocket', 'data-cta-position': 'primary'}) }}</p>
+    <p>{{ pocket_fxa_button(entrypoint=_entrypoint, button_text='Try Pocket Now', optional_parameters={'s': _source}, optional_attributes={'data-cta-text': 'Try Pocket Now', 'data-cta-type': 'pocket', 'data-cta-position': 'primary'}) }}</p>
   {% endcall %}
 
   {% call split(
@@ -114,7 +114,7 @@ <h2 class="pocket-sidekick-title">
         },
         optional_attributes={
           'data-cta-text': 'Try Pocket Now',
-          'data-cta-type': 'activate pocket',
+          'data-cta-type': 'pocket',
           'data-cta-position': 'secondary'
         }
       ) }}
diff --git a/bedrock/firefox/templates/firefox/set-as-default/landing.html b/bedrock/firefox/templates/firefox/set-as-default/landing.html
index 675b8471929..f2db546c2cf 100644
--- a/bedrock/firefox/templates/firefox/set-as-default/landing.html
+++ b/bedrock/firefox/templates/firefox/set-as-default/landing.html
@@ -35,7 +35,7 @@
     ) %}
       <div class="cta-container">
         <div class="mzp-c-button-download-container">
-          <a id="set-as-default-button" href="{{ url('firefox.set-as-default.thanks') }}" class="mzp-c-button mzp-t-product" data-cta-text="Make Firefox your default browser" data-cta-type="button">
+          <a id="set-as-default-button" href="{{ url('firefox.set-as-default.thanks') }}" class="mzp-c-button mzp-t-product" data-cta-text="Make Firefox your default browser" >
             {{ ftl('set-as-default-landing-make-firefox-your-default') }}
           </a>
         </div>
diff --git a/bedrock/firefox/templates/firefox/switch.html b/bedrock/firefox/templates/firefox/switch.html
index c474b8b8099..3ecdef21e84 100644
--- a/bedrock/firefox/templates/firefox/switch.html
+++ b/bedrock/firefox/templates/firefox/switch.html
@@ -57,13 +57,13 @@ <h2 class="c-share-title">{{ ftl('switch-spread-the-word') }}</h2>
       {% set share_url = settings.CANONICAL_URL + canonical_path %}
       <ul class="c-share-options">
         <li>
-          <a class="facebook" data-link-type="social share" data-link-text="Facebook" href="https://www.facebook.com/sharer/sharer.php?s=100&p[url]={{ share_url|urlencode }}">
+          <a class="facebook" data-link-position="social share" data-link-text="Facebook" href="https://www.facebook.com/sharer/sharer.php?s=100&p[url]={{ share_url|urlencode }}">
             {{ ftl('switch-share-to-facebook-updated', fallback='switch-share-to-facebook') }}
           </a>
         </li>
         <li>
           {% set tweet_text = ftl('switch-firefox-makes-switching-fast-tweet') %}
-          <a class="twitter" data-link-type="social share" data-link-text="Twitter" href="https://www.twitter.com/intent/tweet?url={{ share_url|urlencode }}&text={{ tweet_text|urlencode }}">
+          <a class="twitter" data-link-position="social share" data-link-text="Twitter" href="https://www.twitter.com/intent/tweet?url={{ share_url|urlencode }}&text={{ tweet_text|urlencode }}">
             {{ ftl('switch-send-a-tweet') }}
           </a>
         </li>
@@ -74,7 +74,7 @@ <h2 class="c-share-title">{{ ftl('switch-spread-the-word') }}</h2>
           {% set email_end = ftl('switch-check-it-out')|mailtoencode %}
 
           {% set email_body = email_intro + '%0D%0A%0D%0A' + email_start + '%0D%0A%0D%0A' + email_end + '%20' + share_url|urlencode %}
-          <a class="email" data-link-type="social share" data-link-text="Email" href="{{ 'mailto:?subject=%s&body=%s'|format(email_subject, email_body)|e }}">
+          <a class="email" data-link-position="social share" data-link-text="Email" href="{{ 'mailto:?subject=%s&body=%s'|format(email_subject, email_body)|e }}">
             {{ ftl('switch-send-an-email') }}
           </a>
         </li>
diff --git a/bedrock/firefox/templates/firefox/welcome/page1.html b/bedrock/firefox/templates/firefox/welcome/page1.html
index 0358369e2c4..b82e1912251 100644
--- a/bedrock/firefox/templates/firefox/welcome/page1.html
+++ b/bedrock/firefox/templates/firefox/welcome/page1.html
@@ -23,7 +23,7 @@
 
 {% set _entrypoint = 'mozilla.org-firefox-welcome-1' %}
 {% set _utm_campaign = 'welcome-1-monitor' %}
-{% set _cta_type = 'lifecycle-monitor' %}
+{% set _cta_type = 'monitor' %}
 
 {% set hero_title = ftl('welcome-page1-stay-ahead-of-hackers-check-v2') %}
 
diff --git a/bedrock/firefox/templates/firefox/welcome/page10.html b/bedrock/firefox/templates/firefox/welcome/page10.html
index 104ad66c336..83410bb0a53 100644
--- a/bedrock/firefox/templates/firefox/welcome/page10.html
+++ b/bedrock/firefox/templates/firefox/welcome/page10.html
@@ -32,7 +32,7 @@ <h1 class="c-main-title">{{ ftl('welcome-page10-main-heading') }}</h1>
       <p class="c-main-tagline">{{ ftl('welcome-page10-main-description') }}</p>
 
       <div class="c-main-cta">
-        <a href="{{ url('products.vpn.landing') }}{{ source }}#pricing" class="mzp-c-button mzp-t-product mzp-t-xl" data-cta-text="Get Mozilla VPN" data-cta-type="button">{{ ftl('welcome-page10-get-mozilla-vpn') }}</a>
+        <a href="{{ url('products.vpn.landing') }}{{ source }}#pricing" class="mzp-c-button mzp-t-product mzp-t-xl" data-cta-text="Get Mozilla VPN" >{{ ftl('welcome-page10-get-mozilla-vpn') }}</a>
       </div>
     </div>
   </section>
diff --git a/bedrock/firefox/templates/firefox/welcome/page11.html b/bedrock/firefox/templates/firefox/welcome/page11.html
index 2e883cf0f4b..e2b4b1dab45 100644
--- a/bedrock/firefox/templates/firefox/welcome/page11.html
+++ b/bedrock/firefox/templates/firefox/welcome/page11.html
@@ -74,7 +74,7 @@ <h3 class="mzp-c-picto-title">{{ ftl('welcome-page11-it-protects-your-credit') }
             class_name='mzp-t-product mzp-t-xl',
             optional_attributes= {
                 'data-cta-text' : 'Get Mozilla VPN',
-                'data-cta-type' : 'button',
+                'data-cta-type' : 'vpn',
                 'data-cta-position' : 'primary-cta',
             }
         ) }}
diff --git a/bedrock/firefox/templates/firefox/welcome/page12.html b/bedrock/firefox/templates/firefox/welcome/page12.html
index c56052d97a2..bf6b70ab29a 100644
--- a/bedrock/firefox/templates/firefox/welcome/page12.html
+++ b/bedrock/firefox/templates/firefox/welcome/page12.html
@@ -65,7 +65,7 @@ <h3 class="mzp-c-picto-title">Access global info & entertainment</h3>
             class_name='mzp-t-product mzp-t-xl',
             optional_attributes= {
                 'data-cta-text' : 'Get Mozilla VPN',
-                'data-cta-type' : 'button',
+                'data-cta-type' : 'vpn',
                 'data-cta-position' : 'primary-cta',
             }
         ) }}
diff --git a/bedrock/firefox/templates/firefox/welcome/page13.html b/bedrock/firefox/templates/firefox/welcome/page13.html
index 3c281f895f2..e7dee6c760d 100644
--- a/bedrock/firefox/templates/firefox/welcome/page13.html
+++ b/bedrock/firefox/templates/firefox/welcome/page13.html
@@ -76,7 +76,7 @@ <h3 class="mzp-c-picto-title">{{ ftl('welcome-page13-cover-your-work') }}</h3>
             class_name='mzp-t-product mzp-t-xl',
             optional_attributes= {
                 'data-cta-text' : 'Get Mozilla VPN',
-                'data-cta-type' : 'button',
+                'data-cta-type' : 'vpn',
                 'data-cta-position' : 'primary-cta',
             }
         ) }}
diff --git a/bedrock/firefox/templates/firefox/welcome/page14.html b/bedrock/firefox/templates/firefox/welcome/page14.html
index 2ebbdbe9958..b40c0bb64d8 100644
--- a/bedrock/firefox/templates/firefox/welcome/page14.html
+++ b/bedrock/firefox/templates/firefox/welcome/page14.html
@@ -48,7 +48,7 @@ <h1 class="c-main-title"> {% if show_coupon %}{{ ftl('welcome-page14-page-title'
           page_anchor="#pricing",
           optional_attributes= {
                 'data-cta-text' : 'Get Mozilla VPN',
-                'data-cta-type' : 'button',
+                'data-cta-type' : 'vpn',
                 'data-cta-position' : 'primary-cta',
           }
         )}}
diff --git a/bedrock/firefox/templates/firefox/welcome/page16.html b/bedrock/firefox/templates/firefox/welcome/page16.html
index 5a8a4ff99f9..050857e82eb 100644
--- a/bedrock/firefox/templates/firefox/welcome/page16.html
+++ b/bedrock/firefox/templates/firefox/welcome/page16.html
@@ -92,7 +92,7 @@ <h1 class="c-main-title">This Cybersecurity Month, take 20% off your first year<
           },
           optional_attributes= {
                 'data-cta-text' : 'Get Mozilla VPN',
-                'data-cta-type' : 'button',
+                'data-cta-type' : 'vpn',
                 'data-cta-position' : 'primary-cta',
           }
         )}}
diff --git a/bedrock/firefox/templates/firefox/welcome/page17/page17-a.html b/bedrock/firefox/templates/firefox/welcome/page17/page17-a.html
index 086238c63d2..f9fec2c133f 100644
--- a/bedrock/firefox/templates/firefox/welcome/page17/page17-a.html
+++ b/bedrock/firefox/templates/firefox/welcome/page17/page17-a.html
@@ -90,7 +90,7 @@ <h2 class="c-main-title">{{ main_title }}</h2>
           class_name='mzp-t-product mzp-t-xl',
           optional_attributes= {
                 'data-cta-text' : 'Get Mozilla VPN',
-                'data-cta-type' : 'button',
+                'data-cta-type' : 'vpn',
                 'data-cta-position' : 'primary-cta',
           }
         )}}
diff --git a/bedrock/firefox/templates/firefox/welcome/page17/page17-c.html b/bedrock/firefox/templates/firefox/welcome/page17/page17-c.html
index 2477a4359b1..9f1944a1d68 100644
--- a/bedrock/firefox/templates/firefox/welcome/page17/page17-c.html
+++ b/bedrock/firefox/templates/firefox/welcome/page17/page17-c.html
@@ -75,7 +75,7 @@
   <section class="c-content-main">
     <div class="mzp-l-content mzp-t-content-md">
       <h1 class="c-main-title">{{ main_title }}</h1>
-      <p class="c-main-cta"><a class="mzp-c-button mzp-t-product mzp-t-xl" href="{{ url('firefox.features.picture-in-picture') }}" data-cta-text="Try it now" data-cta-type="button">{{ main_cta }}</a></p>
+      <p class="c-main-cta"><a class="mzp-c-button mzp-t-product mzp-t-xl" href="{{ url('firefox.features.picture-in-picture') }}" data-cta-text="Try it now" >{{ main_cta }}</a></p>
 
       <img src="{{ static('img/firefox/welcome/page17/pip-hero.jpg') }}" alt="" class="c-main-image">
       <h2 class="c-main-subheading">{{ main_tagline }}</h2>
diff --git a/bedrock/firefox/templates/firefox/welcome/page18.html b/bedrock/firefox/templates/firefox/welcome/page18.html
index d9c4eac3a74..c95b06e7429 100644
--- a/bedrock/firefox/templates/firefox/welcome/page18.html
+++ b/bedrock/firefox/templates/firefox/welcome/page18.html
@@ -51,8 +51,8 @@ <h1 class="c-main-title">Shop summer sales with confidence</h1>
     <p class="c-main-tagline has-rc-icon">New in Firefox: Review Checker analyzes
       product reviews and checks them for authenticity. Click on the price tag
       icon <span></span> when you shop on Amazon, Best Buy, or Walmart.
-      <a href="https://support.mozilla.org/kb/review-checker-review-quality/?{{ utm_params }}" rel="external noopener" target="_blank" data-cta-type="link" data-cta-text="Learn more">Learn more</a></p>
-    <p class="c-main-cta"><a href="https://www.amazon.com/dp/B01N22BMJB" class="mzp-c-button mzp-t-product" rel="external" data-cta-text="Try it now" data-cta-type="button">Try it now</a></p>
+      <a href="https://support.mozilla.org/kb/review-checker-review-quality/?{{ utm_params }}" rel="external noopener" target="_blank" data-cta-text="Learn more">Learn more</a></p>
+    <p class="c-main-cta"><a href="https://www.amazon.com/dp/B01N22BMJB" class="mzp-c-button mzp-t-product" rel="external" data-cta-text="Try it now" >Try it now</a></p>
 
     {{ resp_img('img/firefox/welcome/page18/fakespot-rc.png',
       srcset={
diff --git a/bedrock/firefox/templates/firefox/welcome/page2.html b/bedrock/firefox/templates/firefox/welcome/page2.html
index 56ae494b812..7bc975ff3e0 100644
--- a/bedrock/firefox/templates/firefox/welcome/page2.html
+++ b/bedrock/firefox/templates/firefox/welcome/page2.html
@@ -33,7 +33,7 @@
   ) %}
 
     <p class="primary-cta">
-      {{ pocket_fxa_button(entrypoint=_entrypoint, button_text=ftl('welcome-page2-activate-pocket'), optional_parameters={'s': _source, 'utm_campaign': _utm_campaign}, optional_attributes={'data-cta-text': 'Activate Pocket', 'data-cta-type': 'activate pocket', 'data-cta-position': 'primary'}) }}
+      {{ pocket_fxa_button(entrypoint=_entrypoint, button_text=ftl('welcome-page2-activate-pocket'), optional_parameters={'s': _source, 'utm_campaign': _utm_campaign}, optional_attributes={'data-cta-text': 'Activate Pocket', 'data-cta-type': 'pocket', 'data-cta-position': 'primary'}) }}
     </p>
   {% endcall %}
 {% endblock %}
@@ -78,7 +78,7 @@ <h3 class="c-picto-block-title">{{ ftl('welcome-page2-discover-new-stories') }}<
 
 {% block secondary_cta %}
   <p class="secondary-cta">
-    {{ pocket_fxa_button(entrypoint=_entrypoint, button_text=ftl('welcome-page2-activate-pocket'), optional_parameters={'s': _source, 'utm_campaign': _utm_campaign}, optional_attributes={'data-cta-text': 'Activate Pocket', 'data-cta-type': 'activate pocket', 'data-cta-position': 'secondary'}) }}
+    {{ pocket_fxa_button(entrypoint=_entrypoint, button_text=ftl('welcome-page2-activate-pocket'), optional_parameters={'s': _source, 'utm_campaign': _utm_campaign}, optional_attributes={'data-cta-text': 'Activate Pocket', 'data-cta-type': 'pocket', 'data-cta-position': 'secondary'}) }}
   </p>
 {% endblock %}
 
diff --git a/bedrock/firefox/templates/firefox/welcome/page4.html b/bedrock/firefox/templates/firefox/welcome/page4.html
index 6d61bb9957d..7cb619d2bc5 100644
--- a/bedrock/firefox/templates/firefox/welcome/page4.html
+++ b/bedrock/firefox/templates/firefox/welcome/page4.html
@@ -109,7 +109,7 @@ <h3 class="c-picto-block-title">{{ ftl('welcome-page4-go-faster-do-more', fallba
 
 {% block secondary_cta %}
 <div class="secondary-cta">
-  <a class="mzp-c-button" data-cta-position="secondary" data-cta-type="button" data-cta-text="Get the Firefox App" href="#get-firefox">
+  <a class="mzp-c-button" data-cta-position="secondary" data-cta-text="Get the Firefox App" href="#get-firefox">
     {{ ftl('welcome-page4-get-the-firefox-mobile') }}
   </a>
 </div>
diff --git a/bedrock/firefox/templates/firefox/welcome/page6.html b/bedrock/firefox/templates/firefox/welcome/page6.html
index a243aeac3a2..934d5d2850f 100644
--- a/bedrock/firefox/templates/firefox/welcome/page6.html
+++ b/bedrock/firefox/templates/firefox/welcome/page6.html
@@ -36,7 +36,7 @@
 
   <div class="primary-cta">
     <div class="state-not-default">
-      <a id="set-as-default-button" href="{{ url('firefox.set-as-default.thanks') }}" class="mzp-c-button mzp-t-product" data-cta-text="Make Firefox your default browser" data-cta-type="button">
+      <a id="set-as-default-button" href="{{ url('firefox.set-as-default.thanks') }}" class="mzp-c-button mzp-t-product" data-cta-text="Make Firefox your default browser" >
         {{ ftl('welcome-page6-make-firefox-your-default') }}
       </a>
     </div>
diff --git a/bedrock/firefox/templates/firefox/welcome/page8.html b/bedrock/firefox/templates/firefox/welcome/page8.html
index 4757f0a0f9c..d0928089135 100644
--- a/bedrock/firefox/templates/firefox/welcome/page8.html
+++ b/bedrock/firefox/templates/firefox/welcome/page8.html
@@ -30,7 +30,7 @@
       heading_level=1
     ) %}
     <p class="primary-cta protection-report">
-      <a href="https://support.mozilla.org/kb/enhanced-tracking-protection-firefox-desktop/?utm_source={{ _utm_source }}&utm_medium=referral&utm_campaign={{ _utm_campaign }}&utm_content={{_utm_content}}" class="mzp-c-button mzp-t-product" id="button" rel="external" data-cta-position="primary" data-cta-text="View your report" data-cta-type="button">
+      <a href="https://support.mozilla.org/kb/enhanced-tracking-protection-firefox-desktop/?utm_source={{ _utm_source }}&utm_medium=referral&utm_campaign={{ _utm_campaign }}&utm_content={{_utm_content}}" class="mzp-c-button mzp-t-product" id="button" rel="external" data-cta-position="primary" data-cta-text="View your report">
         {{ ftl('welcome-page8-view-your-protection-report') }}
       </a>
     </p>
@@ -47,7 +47,7 @@
       <h3 class="c-picto-block-title">{{ ftl('welcome-page8-enhanced-tracking-protection') }}</h3>
       <div class="c-picto-block-body">
         <p>{{ ftl('welcome-page8-automatically-block-sites') }}</p>
-        <a class="protection-report" href="https://support.mozilla.org/kb/enhanced-tracking-protection-firefox-desktop/?utm_source={{ _utm_source }}&utm_medium=referral&utm_campaign={{ _utm_campaign }}&utm_content={{_utm_content}}" data-cta-position="secondary" data-cta-text="See what’s blocked" data-cta-type="button">
+        <a class="protection-report" href="https://support.mozilla.org/kb/enhanced-tracking-protection-firefox-desktop/?utm_source={{ _utm_source }}&utm_medium=referral&utm_campaign={{ _utm_campaign }}&utm_content={{_utm_content}}" data-cta-position="secondary" data-cta-text="See what’s blocked" >
           <strong>{{ ftl('welcome-page8-see-whats-blocked') }}</strong>
         </a>
       </div>
@@ -63,12 +63,12 @@ <h3 class="c-picto-block-title">
       <div class="c-picto-block-body">
       {% if LANG == "en-US" %}
         <p>See if your personal info has been exposed in a data breach. We’ll automatically remove it from sites selling it and continuously monitor your identity for future leaks.</p>
-        <a id="monitor-link" href="https://monitor.mozilla.org/?utm_source={{ _utm_source }}&utm_medium=referral&utm_campaign={{ _utm_campaign }}&utm_content={{_utm_content}}" data-cta-text="go to monitor" data-cta-type="button">
+        <a id="monitor-link" href="https://monitor.mozilla.org/?utm_source={{ _utm_source }}&utm_medium=referral&utm_campaign={{ _utm_campaign }}&utm_content={{_utm_content}}" data-cta-text="go to monitor" >
           <strong>Check for breaches now</strong>
         </a>
       {% else %}
         <p>{{ ftl('welcome-page8-see-what-youve-been') }}</p>
-        <a id="monitor-link" href="https://monitor.mozilla.org/?utm_source={{ _utm_source }}&utm_medium=referral&utm_campaign={{ _utm_campaign }}&utm_content={{_utm_content}}" data-cta-text="go to monitor" data-cta-type="button">
+        <a id="monitor-link" href="https://monitor.mozilla.org/?utm_source={{ _utm_source }}&utm_medium=referral&utm_campaign={{ _utm_campaign }}&utm_content={{_utm_content}}" data-cta-text="go to monitor" >
           <strong>{{ ftl('welcome-page8-go-to-monitor') }}</strong>
         </a>
       {% endif %}
@@ -83,7 +83,7 @@ <h3 class="c-picto-block-title">
         <h3 class="c-picto-block-title">{{ ftl('welcome-page8-facebook-container') }}</h3>
         <div class="c-picto-block-body">
           <p>{{ ftl('welcome-page8-stay-connected') }}</p>
-          <a id="fb-container-link" href="https://addons.mozilla.org/firefox/addon/facebook-container/?src=mozilla.org-welcome-8-hvt&utm_source={{ _utm_source }}&utm_medium=referral&utm_campaign={{ _utm_campaign }}&utm_content={{_utm_content}}"data-cta-text="go to fb container" data-cta-type="button" >
+          <a id="fb-container-link" href="https://addons.mozilla.org/firefox/addon/facebook-container/?src=mozilla.org-welcome-8-hvt&utm_source={{ _utm_source }}&utm_medium=referral&utm_campaign={{ _utm_campaign }}&utm_content={{_utm_content}}"data-cta-text="go to fb container"  >
             <strong>{{ ftl('welcome-page8-add-facebook-container') }}</strong>
           </a>
         </div>
diff --git a/bedrock/firefox/templates/firefox/welcome/page9.de.html b/bedrock/firefox/templates/firefox/welcome/page9.de.html
index 029abf0e8ba..1a5af416f6c 100644
--- a/bedrock/firefox/templates/firefox/welcome/page9.de.html
+++ b/bedrock/firefox/templates/firefox/welcome/page9.de.html
@@ -40,7 +40,7 @@
   <p class="mzp-c-callout-desc">Schnell, zuverlässig und extra sicher mit 30 Tage Geld-zurück-Garantie.</p>
 
   <p class="primary-cta">
-    <a href="{{ url('products.vpn.landing') }}{{ _source }}" class="mzp-c-button mzp-t-product mzp-t-xl" data-cta-text="Get Mozilla VPN" data-cta-type="button">Hol dir Mozilla VPN</a>
+    <a href="{{ url('products.vpn.landing') }}{{ _source }}" class="mzp-c-button mzp-t-product mzp-t-xl" data-cta-text="Get Mozilla VPN" >Hol dir Mozilla VPN</a>
   </p>
   {% endcall %}
 {% endblock %}
diff --git a/bedrock/firefox/templates/firefox/welcome/page9.fr.html b/bedrock/firefox/templates/firefox/welcome/page9.fr.html
index 5fbcd0d3611..91a282c8d53 100644
--- a/bedrock/firefox/templates/firefox/welcome/page9.fr.html
+++ b/bedrock/firefox/templates/firefox/welcome/page9.fr.html
@@ -40,7 +40,7 @@
   <p class="mzp-c-callout-desc">Rapide, fiable et ultra sécurisé avec une garantie de remboursement de 30 jours.</p>
 
   <p class="primary-cta">
-    <a href="{{ url('products.vpn.landing') }}{{ _source }}" class="mzp-c-button mzp-t-product mzp-t-xl" data-cta-text="Get Mozilla VPN" data-cta-type="button">Installer Mozilla VPN</a>
+    <a href="{{ url('products.vpn.landing') }}{{ _source }}" class="mzp-c-button mzp-t-product mzp-t-xl" data-cta-text="Get Mozilla VPN" >Installer Mozilla VPN</a>
   </p>
   {% endcall %}
 {% endblock %}
diff --git a/bedrock/firefox/templates/firefox/whatsnew/includes/mofo-donate-cta.html b/bedrock/firefox/templates/firefox/whatsnew/includes/mofo-donate-cta.html
index db4c7027cc3..ed4ebd2c88e 100644
--- a/bedrock/firefox/templates/firefox/whatsnew/includes/mofo-donate-cta.html
+++ b/bedrock/firefox/templates/firefox/whatsnew/includes/mofo-donate-cta.html
@@ -19,7 +19,7 @@
 {% endif %}
 
 <div class="wnp-donate-wrapper mzp-u-centered">
-  <a class="mzp-c-button mzp-t-secondary mzp-t-md wnp-footer-donate" href="{{ donate_url(location='whats-new-product') }}" data-link-type="button" data-link-text="Donate">
+  <a class="mzp-c-button mzp-t-secondary mzp-t-md wnp-footer-donate" href="{{ donate_url(location='whats-new-product') }}" data-link-text="Donate">
     <span class="mzp-c-button-icon-start">
       <svg width="16" height="16" viewBox="0 0 16 16">
         <path fill="#ff0000" d="M1.2,2.2c-1.5,1.5-1.5,4.2,0,5.7L8,15c2.3-2.4,4.5-4.7,6.9-7c1.5-1.5,1.5-4.2,0-5.7c-1.5-1.5-4-1.5-5.6,0L8,3.5 L6.7,2.3C5.1,0.6,2.7,0.6,1.2,2.2"/>
diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx125-eu.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx125-eu.html
index 41c7c724fa6..dd4cfc900b0 100644
--- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx125-eu.html
+++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx125-eu.html
@@ -71,7 +71,7 @@ <h1 class="wnp-main-title">{{ main_title }}</h1>
     <p class="wnp-main-tagline">{{ main_tagline }}</p>
 
     <p>
-      <a class="mzp-c-button mzp-t-product" href="https://browserbench.org/Speedometer3.0/" data-cta-type="button" data-cta-text="How fast is fast?" target="_blank" rel="noopener">
+      <a class="mzp-c-button mzp-t-product" href="https://browserbench.org/Speedometer3.0/" data-cta-text="How fast is fast?" target="_blank" rel="noopener">
         {{ cta_fast }}
       </a>
     </p>
diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx125-na.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx125-na.html
index eab3a10a8ea..0e3e6b5c39c 100644
--- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx125-na.html
+++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx125-na.html
@@ -41,13 +41,13 @@ <h1 class="wnp-main-title">Fast. And getting faster.</h1>
     <div class="wnp-loading"></div>
 
     <p class="wnp-default">
-      <a class="mzp-c-button mzp-t-product" href="{{ url('firefox.set-as-default.thanks') }}" data-cta-type="button" data-cta-text="Set Firefox to default" target="_blank" rel="noopener">
+      <a class="mzp-c-button mzp-t-product" href="{{ url('firefox.set-as-default.thanks') }}" data-cta-text="Set Firefox to default" target="_blank" rel="noopener">
         Make Firefox your default
       </a>
     </p>
 
     <p class="wnp-fast">
-      <a class="mzp-c-button mzp-t-product" href="{{ url('firefox.features.fast') }}" data-cta-type="button" data-cta-text="How fast is fast?" target="_blank" rel="noopener">
+      <a class="mzp-c-button mzp-t-product" href="{{ url('firefox.features.fast') }}" data-cta-text="How fast is fast?" target="_blank" rel="noopener">
         How fast is fast?
       </a>
     </p>
diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126-eu.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126-eu.html
index 7685987b595..1e662c02aea 100644
--- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126-eu.html
+++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126-eu.html
@@ -92,7 +92,7 @@ <h1 class="wnp-main-title">
     </p>
 
     <p class="wnp-main-cta">
-      <a class="mzp-c-button mzp-t-product" href="{{ pdf_link }}" data-cta-type="button" data-cta-text="Try it now" target="_blank" rel="noopener">
+      <a class="mzp-c-button mzp-t-product" href="{{ pdf_link }}" data-cta-text="Try it now" target="_blank" rel="noopener">
         {{ main_cta }}
       </a>
     </p>
diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126-na.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126-na.html
index fd2e0352504..a608c1687de 100644
--- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126-na.html
+++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126-na.html
@@ -41,7 +41,7 @@ <h1 class="wnp-main-title">A browser that's truly yours</h1>
     </p>
 
     <p class="wnp-main-cta">
-      <a class="mzp-c-button mzp-t-product" href="https://addons.mozilla.org/en-US/firefox/?{{ utm_params }}" data-cta-type="button" data-cta-text="Personalize your Firefox" target="_blank" rel="noopener">
+      <a class="mzp-c-button mzp-t-product" href="https://addons.mozilla.org/en-US/firefox/?{{ utm_params }}" data-cta-text="Personalize your Firefox" target="_blank" rel="noopener">
         Personalize your Firefox
       </a>
     </p>
diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-de.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-de.html
index e6cde95ad70..95fd82a1b6c 100644
--- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-de.html
+++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-de.html
@@ -39,7 +39,7 @@ <h2>Sag <span lang="es-ES">Hola</span> zu Firefox&nbsp;translations</h2>
 
       <p>Klicke auf das <em class="translate-icon">Diese Seite übersetzen</em> Icon in der Adressleiste von Firefox und genieße noch mehr Inhalte aus dem Web.</p>
 
-      <p><a class="mzp-c-button mzp-t-product" href="https://www.mozilla.org/es-ES/" data-cta-type="button" data-cta-text="Try it now">Jetzt ausprobieren</a></p>
+      <p><a class="mzp-c-button mzp-t-product" href="https://www.mozilla.org/es-ES/" data-cta-text="Try it now">Jetzt ausprobieren</a></p>
     </div>
   </section>
 
diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-en-CA.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-en-CA.html
index 931b44a3b29..ae298f457b3 100644
--- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-en-CA.html
+++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-en-CA.html
@@ -39,7 +39,7 @@ <h2>Say ‘<span lang="fr">Bonjour</span>’ to Firefox&nbsp;translations</h2>
 
       <p>Click the <em class="translate-icon">Translate this page</em> icon in Firefox’s address bar and enjoy content across the web.</p>
 
-      <p><a class="mzp-c-button mzp-t-product" href="https://www.mozilla.org/fr/" data-cta-type="button" data-cta-text="Try it now">Try it now</a></p>
+      <p><a class="mzp-c-button mzp-t-product" href="https://www.mozilla.org/fr/" data-cta-text="Try it now">Try it now</a></p>
     </div>
   </section>
 
diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-en-GB.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-en-GB.html
index c1d0acccea1..586ec55a4a5 100644
--- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-en-GB.html
+++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-en-GB.html
@@ -39,7 +39,7 @@ <h2>Say ‘<span lang="fr">Bonjour</span>’ to Firefox&nbsp;translations</h2>
 
       <p>Click the <em class="translate-icon">Translate this page</em> in Firefox’s address bar and enjoy content from around the world.</p>
 
-      <p><a class="mzp-c-button mzp-t-product" href="https://www.mozilla.org/fr/" data-cta-type="button" data-cta-text="Try it now">Try it now</a></p>
+      <p><a class="mzp-c-button mzp-t-product" href="https://www.mozilla.org/fr/" data-cta-text="Try it now">Try it now</a></p>
     </div>
   </section>
 
diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-en-US.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-en-US.html
index 3da347697c9..b1472c3c5b0 100644
--- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-en-US.html
+++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-en-US.html
@@ -39,7 +39,7 @@ <h2>Say ‘<span lang="es-MX">Hola</span>’ to Firefox&nbsp;translations</h2>
 
       <p>Click the <em class="translate-icon">Translate this page</em> icon in Firefox’s address bar and enjoy content across the web.</p>
 
-      <p><a class="mzp-c-button mzp-t-product" href="https://www.mozilla.org/es-MX/" data-cta-type="button" data-cta-text="Try it now">Try it now</a></p>
+      <p><a class="mzp-c-button mzp-t-product" href="https://www.mozilla.org/es-MX/" data-cta-text="Try it now">Try it now</a></p>
     </div>
   </section>
 
diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-fr.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-fr.html
index aab4530a45d..15bac95fdf3 100644
--- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-fr.html
+++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx126beta-fr.html
@@ -39,7 +39,7 @@ <h2>Dites ‘<span lang="en-GB">Hello</span>’ à Firefox&nbsp;translations</h2
 
       <p>Cliquez sur l'icône <em class="translate-icon">Traduire cette page</em> dans la barre d'adresse de Firefox et profitez de plus de contenu sur le Web.</p>
 
-      <p><a class="mzp-c-button mzp-t-product" href="https://www.mozilla.org/en-GB/" data-cta-type="button" data-cta-text="Try it now">Essayer maintenant</a></p>
+      <p><a class="mzp-c-button mzp-t-product" href="https://www.mozilla.org/en-GB/" data-cta-text="Try it now">Essayer maintenant</a></p>
     </div>
   </section>
 
diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx127-eu.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx127-eu.html
index b4a6a617405..e74481675db 100644
--- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx127-eu.html
+++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx127-eu.html
@@ -95,7 +95,7 @@ <h2 class="wnp-main-title">{{ main_title }}</h2>
     <p class="wnp-main-tagline">{{ tagline_one }}</p>
     <p class="wnp-main-tagline has-pip-icon">{{ tagline_two }}</p>
 
-    <p class="wnp-main-cta"><a class="mzp-c-button mzp-t-product" href="{{ url('firefox.set-as-default.thanks') }}" data-cta-type="button" data-cta-text="Set Firefox as your default browser">{{ cta }}</a></p>
+    <p class="wnp-main-cta"><a class="mzp-c-button mzp-t-product" href="{{ url('firefox.set-as-default.thanks') }}" data-cta-text="Set Firefox as your default browser">{{ cta }}</a></p>
   </div>
 </section>
 
diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx127-na.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx127-na.html
index 89635ad48de..a3409519aa3 100644
--- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx127-na.html
+++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx127-na.html
@@ -40,7 +40,7 @@
     <h1 class="wnp-main-title">Join our community</h1>
 
     <p class="wnp-main-cta">
-      <a class="mzp-c-button mzp-t-product" href="https://connect.mozilla.org/?{{ utm_params }}" data-cta-type="button" data-cta-text="Connect with Mozilla" target="_blank" rel="noopener">
+      <a class="mzp-c-button mzp-t-product" href="https://connect.mozilla.org/?{{ utm_params }}" data-cta-text="Connect with Mozilla" target="_blank" rel="noopener">
         Connect with Mozilla
       </a>
     </p>
diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-eu-addons.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-eu-addons.html
index 2f3f96fd61f..b9de693b8e2 100644
--- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-eu-addons.html
+++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-eu-addons.html
@@ -92,7 +92,7 @@ <h1 class="wnp-main-title">{{ main_title }}</h1>
       </p>
 
       <p class="wnp-main-cta">
-        <a class="mzp-c-button mzp-t-product" href="{{ cta_link }}?{{ utm_params }}" data-cta-type="button" data-cta-text="Personalise your Firefox" target="_blank" rel="noopener">
+        <a class="mzp-c-button mzp-t-product" href="{{ cta_link }}?{{ utm_params }}" data-cta-text="Personalise your Firefox" target="_blank" rel="noopener">
           {{ page_cta }}
         </a>
       </p>
diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-eu-donate.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-eu-donate.html
index 9065373801c..4a6885327af 100644
--- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-eu-donate.html
+++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-eu-donate.html
@@ -99,7 +99,7 @@ <h1 class="wnp-main-title">{{ main_title }}</h1>
     </div>
 
     <p class="wnp-main-cta">
-      <a class="mzp-c-button mzp-t-product mzp-t-xl" href="{{ donate_link }}" data-cta-type="button" data-cta-text="Personalize your Firefox" target="_blank" rel="noopener">
+      <a class="mzp-c-button mzp-t-product mzp-t-xl" href="{{ donate_link }}" data-cta-text="Personalize your Firefox" target="_blank" rel="noopener">
         {{ page_cta }}
         <span class="mzp-c-button-icon-end">❤️</span>
       </a>
diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-na.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-na.html
index 2d3e6d1b73f..f032eb586fe 100644
--- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-na.html
+++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx128-na.html
@@ -30,7 +30,7 @@ <h1 class="wnp-main-title">World-class multitasking</h1>
     <p class="wnp-main-tagline has-pip-icon">Picture-In-Picture lets you watch every cartwheel and handspring without putting your life on pause. Just click <strong>the Picture-in-Picture button</strong> to pop out any video.</p>
 
     <p class="wnp-main-cta">
-      <a class="mzp-c-button mzp-t-product" href="{{ url('firefox.features.picture-in-picture') }}" data-cta-type="button" data-cta-text="Learn more">
+      <a class="mzp-c-button mzp-t-product" href="{{ url('firefox.features.picture-in-picture') }}" data-cta-text="Learn more">
         Learn more
       </a>
     </p>
diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx129-na.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx129-na.html
index d01dc1aab75..26cbb26fc10 100644
--- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx129-na.html
+++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx129-na.html
@@ -31,13 +31,13 @@ <h1 class="wnp-main-title">Webpages, simplified.</h1>
         <p class="cta-holder"><span></span></p>
 
         <p class="wnp-main-cta fx-not-default">
-          <a class="mzp-c-button mzp-t-product" href="{{ url('firefox.set-as-default.thanks') }}" data-cta-type="button" data-cta-text="Always use Firefox">
+          <a class="mzp-c-button mzp-t-product" href="{{ url('firefox.set-as-default.thanks') }}" data-cta-text="Always use Firefox">
             Always use Firefox
           </a>
         </p>
 
         <p class="wnp-main-cta fx-is-default">
-          <a class="mzp-c-button mzp-t-product" href="https://support.mozilla.org/kb/firefox-reader-view-clutter-free-web-pages" data-cta-text="Learn more" data-cta-type="button">
+          <a class="mzp-c-button mzp-t-product" href="https://support.mozilla.org/kb/firefox-reader-view-clutter-free-web-pages" data-cta-text="Learn more" >
             Learn more
           </a>
         </p>
diff --git a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx131-eu.html b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx131-eu.html
index f5f3b933037..28c74281d27 100644
--- a/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx131-eu.html
+++ b/bedrock/firefox/templates/firefox/whatsnew/whatsnew-fx131-eu.html
@@ -82,11 +82,11 @@ <h2 class="wnp-main-title">{{ main_title }}</h2>
     <p class="wnp-main-tagline">{{ main_tagline }}</p>
 
     {% if nimbus_variant == 'v4' %}
-      <a id="protections-dashboard" class="c-banner-button mzp-c-button mzp-t-product mzp-t-xl" href="https://support.mozilla.org/kb/enhanced-tracking-protection-firefox-desktop?{{ utm_params }}" data-cta-type="button" data-cta-text="See my protections dashboard">
+      <a id="protections-dashboard" class="c-banner-button mzp-c-button mzp-t-product mzp-t-xl" href="https://support.mozilla.org/kb/enhanced-tracking-protection-firefox-desktop?{{ utm_params }}" data-cta-text="See my protections dashboard">
         {{ main_cta }}
       </a>
     {% else %}
-      <a class="c-banner-button mzp-c-button mzp-t-product mzp-t-xl" href="https://support.mozilla.org/kb/introducing-total-cookie-protection-standard-mode?{{ utm_params }}" data-cta-type="button" data-cta-text="Learn more">
+      <a class="c-banner-button mzp-c-button mzp-t-product mzp-t-xl" href="https://support.mozilla.org/kb/introducing-total-cookie-protection-standard-mode?{{ utm_params }}" data-cta-text="Learn more">
         {{ main_cta }}
       </a>
     {% endif %}
diff --git a/bedrock/foundation/templates/foundation/annualreport/2021/includes/modal-blog.html b/bedrock/foundation/templates/foundation/annualreport/2021/includes/modal-blog.html
index 3645eb44e5b..96264476b6b 100644
--- a/bedrock/foundation/templates/foundation/annualreport/2021/includes/modal-blog.html
+++ b/bedrock/foundation/templates/foundation/annualreport/2021/includes/modal-blog.html
@@ -28,7 +28,7 @@ <h2>The fight continues in Washington</h2>
     platforms.
   </p>
 
-  <a class="mzp-c-button mzp-t-secondary" href="https://foundation.mozilla.org/blog/mozilla-community-places-full-page-washington-post-ad-supporting-aicoa/?{{ utm_params }}" {{ new_tab }} data-cta-type="link" data-cta-text="The fight continues in Washington">
+  <a class="mzp-c-button mzp-t-secondary" href="https://foundation.mozilla.org/blog/mozilla-community-places-full-page-washington-post-ad-supporting-aicoa/?{{ utm_params }}" {{ new_tab }} data-cta-text="The fight continues in Washington">
     Learn more
   </a>
 </article>
@@ -47,7 +47,7 @@ <h2>Leading by Example</h2>
     the targeting behind every paid ad we place.
   </p>
 
-  <a class="mzp-c-button mzp-t-secondary" href="https://blog.mozilla.org/mozilla/news/privacy-preserving-attribution-for-advertising/?{{ utm_params }}" {{ new_tab }} data-cta-type="link" data-cta-text="Leading by Example">
+  <a class="mzp-c-button mzp-t-secondary" href="https://blog.mozilla.org/mozilla/news/privacy-preserving-attribution-for-advertising/?{{ utm_params }}" {{ new_tab }} data-cta-text="Leading by Example">
     Learn more
   </a>
 </article>
@@ -67,7 +67,7 @@ <h2>Crowdsourcing research into YouTube’s AI</h2>
     accountable.
   </p>
 
-  <a class="mzp-c-button mzp-t-secondary" href="https://foundation.mozilla.org/youtube/findings/?{{ utm_params }}" {{ new_tab }} data-cta-type="link" data-cta-text="Crowdsourcing research into YouTube’s AI">
+  <a class="mzp-c-button mzp-t-secondary" href="https://foundation.mozilla.org/youtube/findings/?{{ utm_params }}" {{ new_tab }} data-cta-text="Crowdsourcing research into YouTube’s AI">
     Learn more
   </a>
 </article>
@@ -87,7 +87,7 @@ <h2>Sounding the alarm on period trackers</h2>
     news media.
   </p>
 
-  <a class="mzp-c-button mzp-t-secondary" href="https://foundation.mozilla.org/blog/in-post-roe-v-wade-era-mozilla-labels-18-of-25-popular-period-and-pregnancy-tracking-tech-with-privacy-not-included-warning/?{{ utm_params }}" {{ new_tab }} data-cta-type="link" data-cta-text="Sounding the alarm on period trackers">
+  <a class="mzp-c-button mzp-t-secondary" href="https://foundation.mozilla.org/blog/in-post-roe-v-wade-era-mozilla-labels-18-of-25-popular-period-and-pregnancy-tracking-tech-with-privacy-not-included-warning/?{{ utm_params }}" {{ new_tab }} data-cta-text="Sounding the alarm on period trackers">
     Learn more
   </a>
 </article>
@@ -107,7 +107,7 @@ <h2>Total Cookie Protection</h2>
     Firefox is our next step towards creating a better internet where privacy is the default.
   </p>
 
-  <a class="mzp-c-button mzp-t-secondary" href="https://blog.mozilla.org/products/firefox/firefox-rolls-out-total-cookie-protection-by-default-to-all-users-worldwide/?{{ utm_params }}" {{ new_tab }} data-cta-type="link" data-cta-text="Total Cookie Protection">
+  <a class="mzp-c-button mzp-t-secondary" href="https://blog.mozilla.org/products/firefox/firefox-rolls-out-total-cookie-protection-by-default-to-all-users-worldwide/?{{ utm_params }}" {{ new_tab }} data-cta-text="Total Cookie Protection">
     Learn more
   </a>
 </article>
@@ -127,7 +127,7 @@ <h2>Battling misinformation in Kenya</h2>
     to confront it.
   </p>
 
-  <a class="mzp-c-button mzp-t-secondary" href="https://assets.mofoprod.net/network/documents/Report_Inside_the_shadowy_world_of_disinformation_for_hire_in_Kenya_5._hcc.pdf" {{ new_tab }} data-cta-type="link" data-cta-text="Battling misinformation in Kenya">
+  <a class="mzp-c-button mzp-t-secondary" href="https://assets.mofoprod.net/network/documents/Report_Inside_the_shadowy_world_of_disinformation_for_hire_in_Kenya_5._hcc.pdf" {{ new_tab }} data-cta-text="Battling misinformation in Kenya">
     Learn more
   </a>
 </article>
@@ -148,7 +148,7 @@ <h2>Making voice technology for everyone</h2>
     voice clips and newly added languages from Central Kurdish to Norwegian Nyorsk.
   </p>
 
-  <a class="mzp-c-button mzp-t-secondary" href="https://foundation.mozilla.org/blog/mozilla-common-voice-dataset-grows-by-30-and-reaches-87-languages/?{{ utm_params }}" {{ new_tab }} data-cta-type="link" data-cta-text="Making voice technology for everyone">
+  <a class="mzp-c-button mzp-t-secondary" href="https://foundation.mozilla.org/blog/mozilla-common-voice-dataset-grows-by-30-and-reaches-87-languages/?{{ utm_params }}" {{ new_tab }} data-cta-text="Making voice technology for everyone">
     Learn more
   </a>
 </article>
@@ -168,7 +168,7 @@ <h2>Keeping your online lives private</h2>
     your browsing activity and your multiple online lives between tabs.
   </p>
 
-  <a class="mzp-c-button mzp-t-secondary" href="https://blog.mozilla.org/products/mozilla-vpn/multi-account-containers-add-on-on-mozilla-vpn/?{{ utm_params }}" {{ new_tab }} data-cta-type="link" data-cta-text="Keeping your online lives private">
+  <a class="mzp-c-button mzp-t-secondary" href="https://blog.mozilla.org/products/mozilla-vpn/multi-account-containers-add-on-on-mozilla-vpn/?{{ utm_params }}" {{ new_tab }} data-cta-text="Keeping your online lives private">
     Learn more
   </a>
 </article>
@@ -188,7 +188,7 @@ <h2>Listening to the future of AI</h2>
     make online life healthier for everyone.
   </p>
 
-  <a class="mzp-c-button mzp-t-secondary" href="https://irlpodcast.org/season6/?{{ utm_params }}" {{ new_tab }} data-cta-type="link" data-cta-text="Listening to the future of AI">
+  <a class="mzp-c-button mzp-t-secondary" href="https://irlpodcast.org/season6/?{{ utm_params }}" {{ new_tab }} data-cta-text="Listening to the future of AI">
     Learn more
   </a>
 </article>
diff --git a/bedrock/foundation/templates/foundation/annualreport/2021/index.html b/bedrock/foundation/templates/foundation/annualreport/2021/index.html
index 6cafef4e65d..1d58b93c7ab 100644
--- a/bedrock/foundation/templates/foundation/annualreport/2021/index.html
+++ b/bedrock/foundation/templates/foundation/annualreport/2021/index.html
@@ -114,13 +114,13 @@ <h2 class="c-section-heading">Mozilla’s next chapter: <br><strong>A word from
     <ul class="c-report-pdfs">
       <li>
         <h3 class="mzp-u-title-xs">2021 Audited Financial Statement</h3>
-        <a class="mzp-c-button" href="https://assets.mozilla.net/annualreport/2021/mozilla-fdn-2021-fs-final-1010.pdf" data-cta-type="link" data-cta-text="Download 2021 Financial Statement PDF" {{ new_tab }}>
+        <a class="mzp-c-button" href="https://assets.mozilla.net/annualreport/2021/mozilla-fdn-2021-fs-final-1010.pdf" data-cta-text="Download 2021 Financial Statement PDF" {{ new_tab }}>
           Download PDF
         </a>
       </li>
       <li>
         <h3 class="mzp-u-title-xs">2021 Form 990</h3>
-        <a class="mzp-c-button" href="https://assets.mozilla.net/annualreport/2021/mozilla-fdn-990-ty21-public-disclosure.pdf" data-cta-type="link" data-cta-text="Download 2021 Form 990 PDF" {{ new_tab }}>
+        <a class="mzp-c-button" href="https://assets.mozilla.net/annualreport/2021/mozilla-fdn-990-ty21-public-disclosure.pdf" data-cta-text="Download 2021 Form 990 PDF" {{ new_tab }}>
           Download PDF
         </a>
       </li>
@@ -146,7 +146,7 @@ <h2 class="c-section-heading">Building a different kind of tech industry, <stron
     </p>
   </div>
 
-  <a class="c-section-split-link" href="{{ url('foundation.annualreport.2021.article.products') }}" {{ new_tab }} data-cta-type="link" data-cta-text="Building the Products and Business Model for Your Internet">
+  <a class="c-section-split-link" href="{{ url('foundation.annualreport.2021.article.products') }}" {{ new_tab }} data-cta-text="Building the Products and Business Model for Your Internet">
     {% call split(
       block_class='mzp-l-split-body-narrow mzp-t-split-nospace',
       image=resp_img(
@@ -231,7 +231,7 @@ <h2 class="c-section-heading">
     <p>We’ve added nearly 200 of these people in the last two years. And we’re looking for more.</p>
   </div>
 
-  <a class="c-section-split-link" href="{{ url('foundation.annualreport.2021.article.team') }}" {{ new_tab }} data-cta-type="link" data-cta-text="Building A Team To Better The Internet">
+  <a class="c-section-split-link" href="{{ url('foundation.annualreport.2021.article.team') }}" {{ new_tab }} data-cta-text="Building A Team To Better The Internet">
     {% call split(
       block_class='mzp-l-split-body-narrow mzp-t-split-nospace',
       image=resp_img(
@@ -386,7 +386,7 @@ <h2 class="c-section-heading">
   </div>
 
   <div class="split-container">
-    <a class="c-section-split-link has-modal" href="#open-letter-congress-desc" id="open-letter-congress" data-modal-id="open-letter-congress" data-cta-type="link" data-cta-text="The fight continues in Washington">
+    <a class="c-section-split-link has-modal" href="#open-letter-congress-desc" id="open-letter-congress" data-modal-id="open-letter-congress" data-cta-text="The fight continues in Washington">
       {% call split(
         block_class='mzp-l-split-body-narrow mzp-t-split-nospace',
         image=resp_img(
@@ -410,7 +410,7 @@ <h2>The fight continues in Washington</h2>
       {% endcall %}
     </a>
 
-    <a class="c-section-split-link has-modal" href="#transparency-report-desc" id="transparency-report" data-modal-id="transparency-report" data-cta-type="link" data-cta-text="Leading by example">
+    <a class="c-section-split-link has-modal" href="#transparency-report-desc" id="transparency-report" data-modal-id="transparency-report" data-cta-text="Leading by example">
       {% call split(
         block_class='mzp-l-split-reversed mzp-l-split-body-narrow mzp-t-split-nospace',
         image=resp_img(
@@ -434,7 +434,7 @@ <h2>Leading by example</h2>
       {% endcall %}
     </a>
 
-    <a class="c-section-split-link has-modal" href="#regrets-reporter-desc" id="regrets-reporter" data-modal-id="regrets-reporter" data-cta-type="link" data-cta-text="Crowdsourcing research into YouTube’s AI">
+    <a class="c-section-split-link has-modal" href="#regrets-reporter-desc" id="regrets-reporter" data-modal-id="regrets-reporter" data-cta-text="Crowdsourcing research into YouTube’s AI">
       {% call split(
         block_class='mzp-l-split-body-narrow mzp-t-split-nospace',
         image=resp_img(
@@ -458,7 +458,7 @@ <h2>Crowdsourcing research into YouTube’s AI</h2>
       {% endcall %}
     </a>
 
-    <a class="c-section-split-link has-modal" href="#privacy-not-included-desc" id="privacy-not-included" data-modal-id="privacy-not-included" data-cta-type="link" data-cta-text="Sounding the alarm on period trackers">
+    <a class="c-section-split-link has-modal" href="#privacy-not-included-desc" id="privacy-not-included" data-modal-id="privacy-not-included" data-cta-text="Sounding the alarm on period trackers">
       {% call split(
         block_class='mzp-l-split-reversed mzp-l-split-body-narrow mzp-t-split-nospace',
         image=resp_img(
@@ -482,7 +482,7 @@ <h2>Sounding the alarm on period trackers</h2>
       {% endcall %}
     </a>
 
-    <a class="c-section-split-link has-modal" href="#total-cookie-protection-desc" id="total-cookie-protection" data-modal-id="total-cookie-protection" data-cta-type="link" data-cta-text="Rolling out cookie protection for all">
+    <a class="c-section-split-link has-modal" href="#total-cookie-protection-desc" id="total-cookie-protection" data-modal-id="total-cookie-protection" data-cta-text="Rolling out cookie protection for all">
       {% call split(
         block_class='mzp-l-split-body-narrow mzp-t-split-nospace',
         image=resp_img(
@@ -506,7 +506,7 @@ <h2>Rolling out cookie protection for all</h2>
       {% endcall %}
     </a>
 
-    <a class="c-section-split-link has-modal" href="#misinformation-desc" id="misinformation" data-modal-id="misinformation" data-cta-type="link" data-cta-text="Battling misinformation in Kenya">
+    <a class="c-section-split-link has-modal" href="#misinformation-desc" id="misinformation" data-modal-id="misinformation" data-cta-text="Battling misinformation in Kenya">
       {% call split(
         block_class='mzp-l-split-reversed mzp-l-split-body-narrow mzp-t-split-nospace',
         image=resp_img(
@@ -530,7 +530,7 @@ <h2>Battling misinformation in Kenya</h2>
       {% endcall %}
     </a>
 
-    <a class="c-section-split-link has-modal" href="#common-voice-desc" id="common-voice" data-modal-id="common-voice" data-cta-type="link" data-cta-text="Making voice technology for everyone">
+    <a class="c-section-split-link has-modal" href="#common-voice-desc" id="common-voice" data-modal-id="common-voice" data-cta-text="Making voice technology for everyone">
       {% call split(
         block_class='mzp-l-split-body-narrow mzp-t-split-nospace',
         image=resp_img(
@@ -554,7 +554,7 @@ <h2>Making voice technology for everyone</h2>
       {% endcall %}
     </a>
 
-    <a class="c-section-split-link has-modal" href="#containers-desc" id="containers" data-modal-id="containers" data-cta-type="link" data-cta-text="Keeping your online lives private">
+    <a class="c-section-split-link has-modal" href="#containers-desc" id="containers" data-modal-id="containers" data-cta-text="Keeping your online lives private">
       {% call split(
         block_class='mzp-l-split-reversed mzp-l-split-body-narrow mzp-t-split-nospace',
         image=resp_img(
@@ -578,7 +578,7 @@ <h2>Keeping your online lives private</h2>
       {% endcall %}
     </a>
 
-    <a class="c-section-split-link has-modal" href="#trustworthy-ai-desc" id="trustworthy-ai" data-modal-id="trustworthy-ai" data-cta-type="link" data-cta-text="Listening to the future of AI">
+    <a class="c-section-split-link has-modal" href="#trustworthy-ai-desc" id="trustworthy-ai" data-modal-id="trustworthy-ai" data-cta-text="Listening to the future of AI">
       {% call split(
         block_class='mzp-l-split-body-narrow mzp-t-split-nospace',
         image=resp_img(
diff --git a/bedrock/mozorg/templates/mozorg/about/index.html b/bedrock/mozorg/templates/mozorg/about/index.html
index 98563fa05c4..62f623e22a3 100644
--- a/bedrock/mozorg/templates/mozorg/about/index.html
+++ b/bedrock/mozorg/templates/mozorg/about/index.html
@@ -30,8 +30,8 @@
   <div class="mzp-l-content">
     <h1 class="mzp-c-callout-title">{{ ftl('about-mozilla-makes-browsers-apps') }}</h1>
     <p class="mzp-c-callout-desc">{{ ftl('about-our-mission-keep-the-internet') }}</p>
-    <p class="c-callout-cta">
-        <a id="read-mission-button" class="mzp-c-button" href="{{ url('mozorg.mission') }}" data-link-name="Read Our Mission" data-link-type="button" data-cta-position="primary cta">
+     <p class="c-callout-cta">
+        <a id="read-mission-button" class="mzp-c-button" href="{{ url('mozorg.mission') }}" data-cta-text="Read Our Mission" data-cta-position="primary cta">
           {{ ftl('about-read-our-mission') }}
         </a>
       </p>
diff --git a/bedrock/mozorg/templates/mozorg/about/manifesto.html b/bedrock/mozorg/templates/mozorg/about/manifesto.html
index 1b1f7a0531d..d0cc8768b33 100644
--- a/bedrock/mozorg/templates/mozorg/about/manifesto.html
+++ b/bedrock/mozorg/templates/mozorg/about/manifesto.html
@@ -77,7 +77,7 @@ <h2 class="addendum-subtitle">{{ ftl('manifesto-pledge-for-a-healthy-internet')
       include_cta=True,
     ) %}
       <p>
-        <a class="mzp-c-button button-manifesto js-manifesto-share" target="_blank" rel="noopener noreferrer" href="{{ twitter_link('custom', ftl('manifesto-i-support-the-vision-of')) }}" data-link-type="social share" data-link-text="X (formerly Twitter)" aria-label="{{ ftl('manifesto-share-on-x-aria-label') }}">
+        <a class="mzp-c-button button-manifesto js-manifesto-share" target="_blank" rel="noopener noreferrer" href="{{ twitter_link('custom', ftl('manifesto-i-support-the-vision-of')) }}" data-link-text="X (formerly Twitter)" aria-label="{{ ftl('manifesto-share-on-x-aria-label') }}">
           {{ ftl('manifesto-share-on-x') }}
         </a>
       </p>
@@ -131,7 +131,7 @@ <h3 class="principle-number">{{ principle_number_10 }}</h3>
           </li>
         </ol>
         <footer class="content principles-foot">
-          <p><a class="mzp-c-button button-manifesto js-manifesto-share" target="_blank" rel="noopener noreferrer" href="{{ twitter_link('custom', ftl('manifesto-i-support-the-vision-of')) }}" data-link-type="social share" data-link-text="Twitter" aria-label="{{ ftl('manifesto-share-on-x-aria-label') }}">{{ ftl('manifesto-share-on-x') }}</a></p>
+          <p><a class="mzp-c-button button-manifesto js-manifesto-share" target="_blank" rel="noopener noreferrer" href="{{ twitter_link('custom', ftl('manifesto-i-support-the-vision-of')) }}" data-link-text="Twitter" aria-label="{{ ftl('manifesto-share-on-x-aria-label') }}">{{ ftl('manifesto-share-on-x') }}</a></p>
           <p><a class="mzp-c-cta-link" href="{{ url('mozorg.about.manifesto-details') }}">{{ ftl('manifesto-read-the-entire-manifesto') }}</a></p>
         </footer>
       </section>
diff --git a/bedrock/mozorg/templates/mozorg/antiharassment-tool.html b/bedrock/mozorg/templates/mozorg/antiharassment-tool.html
index 1b351f77ff4..04ae1b3a312 100644
--- a/bedrock/mozorg/templates/mozorg/antiharassment-tool.html
+++ b/bedrock/mozorg/templates/mozorg/antiharassment-tool.html
@@ -125,7 +125,7 @@ <h2 class="mzp-c-newsletter-title section-heading">Be the first to know when we
         </p>
       </div>
       <p class="mzp-c-form-submit">
-        <button class="mzp-c-button c-button-aht-primary mzp-t-xl" id="newsletter-submit" type="submit">Get Product Updates</button>
+        <button class="mzp-c-button c-button-aht-primary mzp-t-xl" id="newsletter-submit" data-cta-text="Get Product Updates" type="submit">Get Product Updates</button>
         <span class="mzp-c-fieldnote">We will only send you Mozilla-related information.</span>
       </p>
     </fieldset>
diff --git a/bedrock/mozorg/templates/mozorg/home/home-new.html b/bedrock/mozorg/templates/mozorg/home/home-new.html
index 1d68e30eaff..1cf533941b5 100644
--- a/bedrock/mozorg/templates/mozorg/home/home-new.html
+++ b/bedrock/mozorg/templates/mozorg/home/home-new.html
@@ -133,7 +133,7 @@ <h2>{{ ftl('home-mozilla-makes-privacy') }}</h2>
           ),
           body=True,
           ) %}
-        <a href="{{ url('firefox.new')}}" class="mzp-c-button mzp-t-secondary" id="homepage-get-firefox" data-cta-text="Get Firefox" data-cta-type="link">{{ ftl('home-cta-get-firefox') }}</a>
+        <a href="{{ url('firefox.new')}}" class="mzp-c-button mzp-t-secondary" id="homepage-get-firefox" data-cta-text="Get Firefox" >{{ ftl('home-cta-get-firefox') }}</a>
       {% endcall %}
 
       <!-- Pocket -->
@@ -151,7 +151,7 @@ <h2>{{ ftl('home-mozilla-makes-privacy') }}</h2>
           ),
           body=True,
           ) %}
-        <a href="https://getpocket.com/{{ utm_params }}" rel="external noopener" class="mzp-c-button mzp-t-secondary" id="homepage-get-pocket" data-cta-text="Get Pocket" data-cta-type="link">{{ ftl('home-cta-get-pocket') }}</a>
+        <a href="https://getpocket.com/{{ utm_params }}" rel="external noopener" class="mzp-c-button mzp-t-secondary" id="homepage-get-pocket" data-cta-text="Get Pocket" data-cta-type="pocket">{{ ftl('home-cta-get-pocket') }}</a>
       {% endcall %}
 
       <!-- Fakespot -->
@@ -169,7 +169,7 @@ <h2>{{ ftl('home-mozilla-makes-privacy') }}</h2>
           ),
           body=True,
           ) %}
-        <a href="https://fakespot.com/{{ utm_params }}" class="mzp-c-button mzp-t-secondary" id="homepage-get-fakespot" data-cta-text="Get Fakespot" data-cta-type="link">{{ ftl('home-cta-get-fakespot') }}</a>
+        <a href="https://fakespot.com/{{ utm_params }}" class="mzp-c-button mzp-t-secondary" id="homepage-get-fakespot" data-cta-text="Get Fakespot" data-cta-type="fakespot">{{ ftl('home-cta-get-fakespot') }}</a>
       {% endcall %}
 
       <!-- Relay -->
@@ -187,7 +187,7 @@ <h2>{{ ftl('home-mozilla-makes-privacy') }}</h2>
           ),
           body=True,
           ) %}
-        <a href="https://relay.firefox.com/{{ utm_params }}" rel="external noopener" class="mzp-c-button mzp-t-secondary" id="homepage-get-relay" data-cta-text="Get Relay" data-cta-type="link">{{ ftl('home-cta-get-relay') }}</a>
+        <a href="https://relay.firefox.com/{{ utm_params }}" rel="external noopener" class="mzp-c-button mzp-t-secondary" id="homepage-get-relay" data-cta-text="Get Relay" data-cta-type="relay">{{ ftl('home-cta-get-relay') }}</a>
       {% endcall %}
 
       <!-- VPN -->
@@ -205,7 +205,7 @@ <h2>{{ ftl('home-mozilla-makes-privacy') }}</h2>
           ),
           body=True,
           ) %}
-        <a href="{{ url('products.vpn.landing') }}" class="mzp-c-button mzp-t-secondary" id="homepage-get-mozilla-vpn" data-cta-text="Get Mozilla VPN" data-cta-type="link">{{ ftl('home-cta-get-vpn') }}</a>
+        <a href="{{ url('products.vpn.landing') }}" class="mzp-c-button mzp-t-secondary" id="homepage-get-mozilla-vpn" data-cta-text="Get Mozilla VPN" data-cta-type="vpn">{{ ftl('home-cta-get-vpn') }}</a>
       {% endcall %}
 
       <!-- Monitor -->
@@ -223,7 +223,7 @@ <h2>{{ ftl('home-mozilla-makes-privacy') }}</h2>
           ),
           body=True,
           ) %}
-         <a href="https://monitor.mozilla.org/{{ utm_params }}" rel="external noopener" class="mzp-c-button mzp-t-secondary" id="homepage-get-monitor" data-cta-text="Get Mozilla Monitor" data-cta-type="link">{{ ftl('home-cta-get-monitor')}}</a>
+         <a href="https://monitor.mozilla.org/{{ utm_params }}" rel="external noopener" class="mzp-c-button mzp-t-secondary" id="homepage-get-monitor" data-cta-text="Get Mozilla Monitor" data-cta-type="monitor">{{ ftl('home-cta-get-monitor')}}</a>
       {% endcall %}
 
     </ul>
@@ -264,8 +264,8 @@ <h2>{{ ftl('home-join-us-in-shaping') }}</h2>
       {% endcall %}
     {% endif %}
 
-    {% set moz_ventures = 'href="%s" data-cta-type="link" data-cta-text="Mozilla Ventures"'|safe|format(('https://mozilla.vc/'+utm_params)) %}
-    {% set moz_ai = 'href="%s" data-cta-type="link" data-cta-text="Mozilla AI"'|safe|format(('https://mozilla.ai/'+utm_params)) %}
+    {% set moz_ventures = 'href="%s" data-cta-text="Mozilla Ventures"'|safe|format(('https://mozilla.vc/'+utm_params)) %}
+    {% set moz_ai = 'href="%s" data-cta-text="Mozilla AI"'|safe|format(('https://mozilla.ai/'+utm_params)) %}
 
     <!-- Foundation -->
     {% call split(
diff --git a/bedrock/mozorg/templates/mozorg/home/includes/ctd-promo-de.html b/bedrock/mozorg/templates/mozorg/home/includes/ctd-promo-de.html
index 4f73dc161f4..a37f157e3a3 100644
--- a/bedrock/mozorg/templates/mozorg/home/includes/ctd-promo-de.html
+++ b/bedrock/mozorg/templates/mozorg/home/includes/ctd-promo-de.html
@@ -35,7 +35,7 @@ <h2>Dein Browser ist soooooo Standard</h2>
     </p>
     <p><small>(Wir haben auch ein paar wirklich gute Argumente.)</small></p>
 
-    <a href="{{ url('firefox') }}" class="mzp-c-button mzp-t-product" data-cta-text="Ich schau mir Firefox mal an" data-cta-type="button" data-cta-position="banner">Ich schau mir Firefox mal an</a>
+    <a href="{{ url('firefox') }}" class="mzp-c-button mzp-t-product" data-cta-text="Ich schau mir Firefox mal an" data-cta-position="banner">Ich schau mir Firefox mal an</a>
     {% endcall %}
     </div>
 
@@ -69,7 +69,7 @@ <h2>Und was machen wir jetzt?</h2>
       Wir könnten dich nach deinem Lieblingsdino fragen, ein kleines Gedicht für dich schreiben, oder dir unseren Mobile Browser zeigen.
     </p>
 
-    <a href="{{ url('firefox.browsers.mobile.index') }}" class="mzp-c-button mzp-t-product" data-cta-text="Zeigt mir den Mobile Browser" data-cta-type="button" data-cta-position="banner">Zeigt mir den Mobile Browser</a>
+    <a href="{{ url('firefox.browsers.mobile.index') }}" class="mzp-c-button mzp-t-product" data-cta-text="Zeigt mir den Mobile Browser" data-cta-position="banner">Zeigt mir den Mobile Browser</a>
     </div>
 
   {% endcall %}
diff --git a/bedrock/mozorg/templates/mozorg/home/includes/featured-vpn.html b/bedrock/mozorg/templates/mozorg/home/includes/featured-vpn.html
index d9e2d2e0494..ebd9651a84d 100644
--- a/bedrock/mozorg/templates/mozorg/home/includes/featured-vpn.html
+++ b/bedrock/mozorg/templates/mozorg/home/includes/featured-vpn.html
@@ -11,6 +11,6 @@
       <small>{{ ftl('home-featured-product') }}</small>
       <h2>{{ ftl('home-feature-blur-your-location') }}</h2>
     </div>
-      <a href="{{ url('products.vpn.landing') }}" class="mzp-c-button" data-cta-text="Get Mozilla VPN" data-cta-type="link" data-cta-position="mid-page banner">{{ ftl('home-cta-get-vpn') }}</a>
+      <a href="{{ url('products.vpn.landing') }}" class="mzp-c-button" data-cta-text="Get Mozilla VPN" data-cta-position="mid-page banner">{{ ftl('home-cta-get-vpn') }}</a>
   </div>
 </aside>
diff --git a/bedrock/mozorg/templates/mozorg/home/includes/mofo-donate-promo.html b/bedrock/mozorg/templates/mozorg/home/includes/mofo-donate-promo.html
index 1c723f3a746..840812602e1 100644
--- a/bedrock/mozorg/templates/mozorg/home/includes/mofo-donate-promo.html
+++ b/bedrock/mozorg/templates/mozorg/home/includes/mofo-donate-promo.html
@@ -11,6 +11,6 @@
       <small>{{ ftl('home-mofo-build-our-movement') }}</small>
       <h2>{{ ftl('home-mofo-donate-to-mofo-today') }}</h2>
     </div>
-    <a href="{{ donate_url(location='featured-section') }}" class="mzp-c-button" data-cta-text="Donate" data-cta-type="link" data-cta-position="mid-page banner">{{ ftl('home-mofo-donate') }}</a>
+    <a href="{{ donate_url(location='featured-section') }}" class="mzp-c-button" data-cta-text="Donate" data-cta-position="mid-page banner">{{ ftl('home-mofo-donate') }}</a>
   </div>
 </section>
diff --git a/bedrock/mozorg/templates/mozorg/includes/mozilla-account-promo.html b/bedrock/mozorg/templates/mozorg/includes/mozilla-account-promo.html
index 764bd2de417..d33d93d1f4a 100644
--- a/bedrock/mozorg/templates/mozorg/includes/mozilla-account-promo.html
+++ b/bedrock/mozorg/templates/mozorg/includes/mozilla-account-promo.html
@@ -47,7 +47,7 @@ <h2>{{ ftl('moz-account-promo-title', class=gradient_class) }}</h2>
       }}
       <p class="accounts-signin">
         {% set fxa_link = fxa_link_fragment(entrypoint=_entrypoint, action='signin') %}
-        {% set sign_in_url = fxa_link ~ ' class="js-fxa-cta-link js-fxa-product-button" data-cta-type="link" data-cta-text="Accounts Learn More"'|safe %}
+        {% set sign_in_url = fxa_link ~ ' class="js-fxa-cta-link js-fxa-product-button" data-cta-text="Accounts Learn More"'|safe %}
         {% set learn_more_url = 'href="'|safe ~ url('mozorg.account') ~ '"'|safe %}
         {{ ftl('moz-account-already-have-v2', fallback='moz-account-already-have', sign_in_url=sign_in_url, learn_more_url=learn_more_url) }}
       </p>
diff --git a/bedrock/mozorg/tests/test_helper_misc.py b/bedrock/mozorg/tests/test_helper_misc.py
index e0029f674af..f7f438057ed 100644
--- a/bedrock/mozorg/tests/test_helper_misc.py
+++ b/bedrock/mozorg/tests/test_helper_misc.py
@@ -1012,13 +1012,13 @@ def test_pocket_fxa_button(self):
             is_button_class=True,
             include_metrics=True,
             optional_parameters={"s": "ffpocket", "foo": "bar"},
-            optional_attributes={"data-cta-text": "Try Pocket Now", "data-cta-type": "activate pocket", "data-cta-position": "primary"},
+            optional_attributes={"data-cta-text": "Try Pocket Now", "data-cta-type": "pocket", "data-cta-position": "primary"},
         )
         expected = (
             '<a href="https://getpocket.com/ff_signup?entrypoint=mozilla.org-firefox-pocket&form_type=button'
             '&utm_source=mozilla.org-firefox-pocket&utm_medium=referral&s=ffpocket&foo=bar" data-action="https://accounts.firefox.com/" '
             'class="js-fxa-cta-link js-fxa-product-button mzp-c-button mzp-t-product pocket-main-cta-button" '
-            'data-cta-text="Try Pocket Now" data-cta-type="activate pocket" data-cta-position="primary">Try Pocket Now</a>'
+            'data-cta-text="Try Pocket Now" data-cta-type="pocket" data-cta-position="primary">Try Pocket Now</a>'
         )
         self.assertEqual(markup, expected)
 
diff --git a/bedrock/newsletter/templates/newsletter/includes/form.html b/bedrock/newsletter/templates/newsletter/includes/form.html
index beb61d1f378..2d62d709cc1 100644
--- a/bedrock/newsletter/templates/newsletter/includes/form.html
+++ b/bedrock/newsletter/templates/newsletter/includes/form.html
@@ -99,7 +99,7 @@ <h4 class="mzp-c-newsletter-subtitle">{{ subtitle }}</h4>
       </div>
 
       <p class="mzp-c-form-submit">
-        <button type="submit" id="newsletter-submit" class="mzp-c-button {{ button_class }}" data-cta-type="Newsletter-{{ id }}" data-cta-text="Newsletter Sign Up" data-testid="newsletter-submit-button">
+        <button type="submit" id="newsletter-submit" class="mzp-c-button {{ button_class }}" data-cta-text="Newsletter Sign Up" data-testid="newsletter-submit-button">
           {% if submit_text %}
             {{ submit_text }}
           {% else %}
diff --git a/bedrock/newsletter/templates/newsletter/opt-out-confirmation.html b/bedrock/newsletter/templates/newsletter/opt-out-confirmation.html
index 841924d8b80..e2a3c7750aa 100644
--- a/bedrock/newsletter/templates/newsletter/opt-out-confirmation.html
+++ b/bedrock/newsletter/templates/newsletter/opt-out-confirmation.html
@@ -63,10 +63,10 @@ <h2>{{ ftl('opt-out-confirmation-prefer-to-get') }}</h2>
       </ul>
 
       <ul class="social-links">
-        <li><a class="instagram" href="{{ mozilla_instagram_url() }}" data-link-type="footer" data-link-text="Instagram (@mozilla)">{{ ftl('opt-out-confirmation-instagram') }}<span> (@mozilla)</span></a></li>
-        <li><a class="youtube" href="https://www.youtube.com/firefoxchannel" data-link-type="footer" data-link-text="YouTube (firefoxchannel)">{{ ftl('opt-out-confirmation-youtube') }}<span> (firefoxchannel)</span></a></li>
-        <li><a class="facebook" href="https://www.facebook.com/Firefox" data-link-type="footer" data-link-text="Facebook (Firefox)">{{ ftl('opt-out-confirmation-facebook') }}<span> (Firefox)</span></a></li>
-        <li><a class="twitter" href="{{ firefox_twitter_url() }}" data-link-type="footer" data-link-text="Twitter (@firefox)">{{ ftl('opt-out-confirmation-x-formerly-twitter') }}<span> (@firefox)</span></a></li>
+        <li><a class="instagram" href="{{ mozilla_instagram_url() }}" data-link-position="footer" data-link-text="Instagram (@mozilla)">{{ ftl('opt-out-confirmation-instagram') }}<span> (@mozilla)</span></a></li>
+        <li><a class="youtube" href="https://www.youtube.com/firefoxchannel" data-link-position="footer" data-link-text="YouTube (firefoxchannel)">{{ ftl('opt-out-confirmation-youtube') }}<span> (firefoxchannel)</span></a></li>
+        <li><a class="facebook" href="https://www.facebook.com/Firefox" data-link-position="footer" data-link-text="Facebook (Firefox)">{{ ftl('opt-out-confirmation-facebook') }}<span> (Firefox)</span></a></li>
+        <li><a class="twitter" href="{{ firefox_twitter_url() }}" data-link-position="footer" data-link-text="Twitter (@firefox)">{{ ftl('opt-out-confirmation-x-formerly-twitter') }}<span> (@firefox)</span></a></li>
       </ul>
     </aside>
   </div>{#-- /.content --#}
diff --git a/bedrock/newsletter/tests/test_views.py b/bedrock/newsletter/tests/test_views.py
index 0a0e8dbbcc2..52c5a551672 100644
--- a/bedrock/newsletter/tests/test_views.py
+++ b/bedrock/newsletter/tests/test_views.py
@@ -182,7 +182,7 @@ def test_shows_form_multi(self):
         doc = pq(resp.content)
         self.assertTrue(doc("#newsletter-form"))
         self.assertTrue(doc('input[value="mozilla-foundation"]'))
-        self.assertEqual(doc("#newsletter-submit")[0].attrib["data-cta-type"], "Newsletter-mozilla-firefox-multi")
+        self.assertEqual(doc("#newsletter-submit")[0].attrib["data-cta-text"], "Newsletter Sign Up")
 
     def test_shows_form_single(self):
         """The MPL page only subscribes to 'mozilla-foundation', so not a multi-newsletter form."""
@@ -190,7 +190,7 @@ def test_shows_form_single(self):
         doc = pq(resp.content)
         self.assertTrue(doc("#newsletter-form"))
         self.assertTrue(doc('input[value="mozilla-foundation"]'))
-        self.assertEqual(doc("#newsletter-submit")[0].attrib["data-cta-type"], "Newsletter-mozilla-foundation")
+        self.assertEqual(doc("#newsletter-submit")[0].attrib["data-cta-text"], "Newsletter Sign Up")
 
     @patch("bedrock.newsletter.views.basket")
     def test_returns_success(self, basket_mock):
diff --git a/bedrock/pocket/templates/pocket/firefox/new-tab-learn-more.html b/bedrock/pocket/templates/pocket/firefox/new-tab-learn-more.html
index 9d2d9de4860..c8bac3c98af 100644
--- a/bedrock/pocket/templates/pocket/firefox/new-tab-learn-more.html
+++ b/bedrock/pocket/templates/pocket/firefox/new-tab-learn-more.html
@@ -36,7 +36,7 @@
       <span class="tagline">{{ ftl('pocket-new-tab-pocket-for-firefox') }}</span>
       <h2 class="new-tab-section-header top">{{ ftl('pocket-new-tab-build-your-personal') }}</h2>
       <p class="new-tab-section-body top">{{ ftl('pocket-new-tab-included-inside') }}</p>
-      {{ pocket_fxa_button(entrypoint='pocket', class_name='new-tab-pocket-cta', button_text='<span class="mzp-c-logo mzp-t-logo-sm mzp-t-product-family"></span>'|safe + ftl('pocket-new-tab-activate-pocket'), optional_parameters={'s': 'fflearnmore', 'utm_campaign': 'landing-page', 'utm_content': 'page-button'}, optional_attributes={'data-cta-text': 'Activate Pocket', 'data-cta-type': 'activate pocket', 'data-cta-position': 'primary'}) }}
+      {{ pocket_fxa_button(entrypoint='pocket', class_name='new-tab-pocket-cta', button_text='<span class="mzp-c-logo mzp-t-logo-sm mzp-t-product-family"></span>'|safe + ftl('pocket-new-tab-activate-pocket'), optional_parameters={'s': 'fflearnmore', 'utm_campaign': 'landing-page', 'utm_content': 'page-button'}, optional_attributes={'data-cta-text': 'Activate Pocket', 'data-cta-type': 'pocket', 'data-cta-position': 'primary'}) }}
       <a href="https://getpocket.com/signup" class="sub-cta">{{ ftl('pocket-new-tab-more-ways-to') }}</a>
     {% endcall %}
   </section>
diff --git a/bedrock/pocket/templates/pocket/home.html b/bedrock/pocket/templates/pocket/home.html
index 843ef749a91..6779b253306 100644
--- a/bedrock/pocket/templates/pocket/home.html
+++ b/bedrock/pocket/templates/pocket/home.html
@@ -47,7 +47,7 @@
       </div>
       <div class="c-banner-section-right">
           <p>Entdecke Content, der die Autor*innen von „People of Deutschland“ inspiriert.</p>
-          <a data-cta-type="button" data-cta-text="Discover Pocket Collections" href="https://getpocket.com/de/collections/eine-partnerschaft-fuer-mehr-sichtbarkeit-bipoc-im-spotlight?utm_source=homepage&utm_medium=banner&utm_campaign=pod-23" class="mzp-c-button mzp-t-md mzp-t-product">Entdecke Pocket Collections</a>
+          <a data-cta-text="Discover Pocket Collections" href="https://getpocket.com/de/collections/eine-partnerschaft-fuer-mehr-sichtbarkeit-bipoc-im-spotlight?utm_source=homepage&utm_medium=banner&utm_campaign=pod-23" class="mzp-c-button mzp-t-md mzp-t-product">Entdecke Pocket Collections</a>
       </div>
     </section>
   {% endif %}
diff --git a/bedrock/pocket/templates/pocket/pocket-and-firefox.html b/bedrock/pocket/templates/pocket/pocket-and-firefox.html
index c55d9253ff9..0eefcfa8289 100644
--- a/bedrock/pocket/templates/pocket/pocket-and-firefox.html
+++ b/bedrock/pocket/templates/pocket/pocket-and-firefox.html
@@ -31,7 +31,7 @@
       <h1 class="section-heading">{{ ftl('pocket-features-build-your-personal') }}</h1>
       <p class="section-lede">{{ ftl('pocket-features-included-inside') }}</p>
       <div class="section-ctas">
-        {{ pocket_fxa_button(entrypoint='pocket', class_name='new-tab-pocket-cta', button_text='<span class="mzp-c-logo mzp-t-logo-sm mzp-t-product-family"></span>'|safe + ftl('pocket-features-activate-pocket'), optional_parameters={'s': 'fflearnmore', 'utm_campaign': 'landing-page', 'utm_content': 'page-button'}, optional_attributes={'data-cta-text': 'Activate Pocket', 'data-cta-type': 'activate pocket', 'data-cta-position': 'primary'}) }}
+        {{ pocket_fxa_button(entrypoint='pocket', class_name='new-tab-pocket-cta', button_text='<span class="mzp-c-logo mzp-t-logo-sm mzp-t-product-family"></span>'|safe + ftl('pocket-features-activate-pocket'), optional_parameters={'s': 'fflearnmore', 'utm_campaign': 'landing-page', 'utm_content': 'page-button'}, optional_attributes={'data-cta-text': 'Activate Pocket', 'data-cta-type': 'pocket', 'data-cta-position': 'primary'}) }}
         <a href="https://getpocket.com/signup" class="secondary-cta">{{ ftl('pocket-features-more-ways-to') }}</a>
       </div>
     {% endcall %}
@@ -100,7 +100,7 @@ <h2 class="section-heading">
     </h2>
     <div class="library-ctas">
       <div>
-        {{ pocket_fxa_button(entrypoint='pocket', class_name='new-tab-pocket-cta', button_text='<span class="mzp-c-logo mzp-t-logo-sm mzp-t-product-family"></span>'|safe + ftl('pocket-features-activate-pocket'), optional_parameters={'s': 'fflearnmore', 'utm_campaign': 'landing-page', 'utm_content': 'page-button'}, optional_attributes={'data-cta-text': 'Activate Pocket', 'data-cta-type': 'activate pocket', 'data-cta-position': 'primary'}) }}
+        {{ pocket_fxa_button(entrypoint='pocket', class_name='new-tab-pocket-cta', button_text='<span class="mzp-c-logo mzp-t-logo-sm mzp-t-product-family"></span>'|safe + ftl('pocket-features-activate-pocket'), optional_parameters={'s': 'fflearnmore', 'utm_campaign': 'landing-page', 'utm_content': 'page-button'}, optional_attributes={'data-cta-text': 'Activate Pocket', 'data-cta-type': 'pocket', 'data-cta-position': 'primary'}) }}
         <span>
           <a href="https://getpocket.com/signup">{{ ftl('pocket-features-more-ways-to') }}</a>
         </span>
diff --git a/bedrock/products/templates/products/landing.html b/bedrock/products/templates/products/landing.html
index 7ce4efdb454..f160bb228c8 100644
--- a/bedrock/products/templates/products/landing.html
+++ b/bedrock/products/templates/products/landing.html
@@ -38,7 +38,7 @@
 {% set _entrypoint = 'mozilla.org-products' %}
 
 {% set icon_external = '<span class="mzp-c-button-icon-end"><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><g fill="none" fill-rule="evenodd" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"><path d="M13 4h7v7M12 12l8-8M8 4H7a3 3 0 0 0-3 3v10a3 3 0 0 0 3 3h10a3 3 0 0 0 3-3v-1"/></g></svg></span>' %}
-{% set icon_download ='<span class="mzp-c-button-icon-end"><svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 16 16" width="16" height="16" fill="currentColor"><path d="M8 13c.2 0 .4-.1.5-.2l4.4-4.4-1.1-1.1-3.1 3.1V1H7.2v9.4L4.1 7.3l-1 1.1 4.4 4.4c.1.1.3.2.5.2z" /><path d="M13.5 12v2c0 .3-.2.5-.5.5H3c-.3 0-.5-.2-.5-.5v-2H1v2c0 1.1.9 2 2 2h10c1.1 0 2-.9 2-2v-2h-1.5z" /></svg></span>' %}
+{% set icon_download ='<span class="mzp-c-button-icon-end"><svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 16 16" width="16" height="16" fill="currentColor"><path d="M8 13c.2 0 .4-.1.5-.2l4.4-4.4-1.1-1.1-3.1 3.1V1H7.2v9.4L4.1 7.3l-1 1.1 4.4 4.4c.1.1.3.2.5.2z" /><path d="M13.5 12v2c0 .3-.2.5-.5.5h2c-.3 0-.5-.2-.5-.5v-2H1v2c0 1.1.9 2 2 2h10c1.1 0 2-.9 2-2v-2h-1.5z" /></svg></span>' %}
 
 {% block content %}
 <main>
@@ -63,7 +63,7 @@ <h1>{{ ftl('firefox-products-products') }}</h1>
         }
       ),
     ) %}
-      <h2 class="mzp-c-picto-heading"><a href="{{ url('firefox') }}" data-cta-type="link" data-cta-text="Firefox" data-cta-position="heading">{{ ftl('firefox-products-firefox') }}</a></h2>
+      <h2 class="mzp-c-picto-heading"><a href="{{ url('firefox') }}" data-cta-text="Firefox" data-cta-position="heading">{{ ftl('firefox-products-firefox') }}</a></h2>
       <p>{{ ftl('firefox-products-get-the-browser-that-blocks') }}</p>
       {% set alt_copy = ftl('download-button-download-firefox') + " " + icon_download|safe %}
       <div class="show-else">{{ download_firefox_thanks(alt_copy=alt_copy, button_class='mzp-t-secondary mzp-t-lg') }}</div>
@@ -84,7 +84,7 @@ <h2 class="mzp-c-picto-heading"><a href="{{ url('firefox') }}" data-cta-type="li
         }
       ),
     ) %}
-      <h2 class="mzp-c-picto-heading"><a href="{{ url('firefox.browsers.mobile.focus') }}" data-cta-type="link" data-cta-text="Focus" data-cta-position="heading">{{ ftl('firefox-products-firefox-focus') }}</a></h2>
+      <h2 class="mzp-c-picto-heading"><a href="{{ url('firefox.browsers.mobile.focus') }}" data-cta-text="Focus" data-cta-position="heading">{{ ftl('firefox-products-firefox-focus') }}</a></h2>
       <p>{{ ftl('firefox-products-your-dedicated-privacy') }}</p>
       <p>
         <span class="hide-ios">{{ google_play_button(href=fc_android_url, id='playStoreLink-focus') }}</span>
@@ -105,9 +105,9 @@ <h2 class="mzp-c-picto-heading"><a href="{{ url('firefox.browsers.mobile.focus')
         }
       ),
     ) %}
-      <h2 class="mzp-c-picto-heading"><a href="https://relay.firefox.com/{{ referrals }}" data-cta-type="link" data-cta-text="Relay" data-cta-position="heading">{{ ftl('firefox-products-relay') }}</a></h2>
+      <h2 class="mzp-c-picto-heading"><a href="https://relay.firefox.com/{{ referrals }}" data-cta-text="Relay" data-cta-position="heading" data-cta-type="relay">{{ ftl('firefox-products-relay') }}</a></h2>
       <p>{{ ftl('firefox-products-protect-your-real') }}</p>
-      <p><a class="mzp-c-button mzp-t-product mzp-t-secondary" href="https://relay.firefox.com/{{ referrals }}#pricing" rel="external noopener" data-cta-type="link" data-cta-text="Get Relay">{{ ftl('firefox-products-get-relay') }} {{ icon_external|safe }}</a>
+      <p><a class="mzp-c-button mzp-t-product mzp-t-secondary" href="https://relay.firefox.com/{{ referrals }}#pricing" rel="external noopener" data-cta-text="Get Relay" data-cta-type="relay">{{ ftl('firefox-products-get-relay') }} {{ icon_external|safe }}</a>
     {% endcall %}
 
     <!-- Monitor -->
@@ -123,9 +123,9 @@ <h2 class="mzp-c-picto-heading"><a href="https://relay.firefox.com/{{ referrals
         }
       ),
     ) %}
-      <h2 class="mzp-c-picto-heading"><a href="https://monitor.mozilla.org/{{ referrals }}" data-cta-type="link" data-cta-text="Monitor" data-cta-position="heading">{{ ftl('firefox-products-mozilla-monitor') }}</a></h2>
+      <h2 class="mzp-c-picto-heading"><a href="https://monitor.mozilla.org/{{ referrals }}" data-cta-text="Monitor" data-cta-position="heading">{{ ftl('firefox-products-mozilla-monitor') }}</a></h2>
       <p>{% if country_code == 'US' %}See if you’ve been part of a data breach. If so, let us automatically get your private info back for you and continually monitor your identity for new leaks.{% else %}{{ ftl('firefox-products-see-if-your-personal-information') }}{% endif %}</p>
-      <p><a class="mzp-c-button mzp-t-product mzp-t-secondary" href="https://monitor.mozilla.org/{{ referrals }}" data-cta-type="link" data-cta-text="Check for breaches">{% if LANG == 'en-US' %}Check for breaches now{% else %}{{ ftl('firefox-products-check-for-breaches') }}{% endif %} {{ icon_external|safe }}</a></p>
+      <p><a class="mzp-c-button mzp-t-product mzp-t-secondary" href="https://monitor.mozilla.org/{{ referrals }}" data-cta-text="Check for breaches">{% if LANG == 'en-US' %}Check for breaches now{% else %}{{ ftl('firefox-products-check-for-breaches') }}{% endif %} {{ icon_external|safe }}</a></p>
     {% endcall %}
 
     <!-- VPN -->
@@ -141,9 +141,9 @@ <h2 class="mzp-c-picto-heading"><a href="https://monitor.mozilla.org/{{ referral
         }
       ),
     ) %}
-      <h2 class="mzp-c-picto-heading"><a href="{{ url('products.vpn.landing') }}" data-cta-type="link" data-cta-text="VPN" data-cta-position="heading">{{ ftl('firefox-products-mozilla-vpn') }}</a></h2>
+      <h2 class="mzp-c-picto-heading"><a href="{{ url('products.vpn.landing') }}" data-cta-text="VPN" data-cta-position="heading">{{ ftl('firefox-products-mozilla-vpn') }}</a></h2>
       <p>{{ ftl('firefox-products-surf-stream-and-get-work-done') }}</p>
-      <p><a class="mzp-c-button mzp-t-product mzp-t-secondary" href="{{ url('products.vpn.landing') + '#pricing' }}" rel="external noopener" data-cta-type="link" data-cta-text="Get VPN">{{ ftl('firefox-products-get-mozilla-vpn') }}</a></p>
+      <p><a class="mzp-c-button mzp-t-product mzp-t-secondary" href="{{ url('products.vpn.landing') + '#pricing' }}" rel="external noopener" data-cta-text="Get VPN">{{ ftl('firefox-products-get-mozilla-vpn') }}</a></p>
     {% endcall %}
 
     <!-- MDN Plus -->
@@ -159,10 +159,10 @@ <h2 class="mzp-c-picto-heading"><a href="{{ url('products.vpn.landing') }}" data
         }
       ),
     ) %}
-    <h2 class="mzp-c-picto-heading"><a href="https://developer.mozilla.org/{{ referrals }}" data-cta-type="link" data-cta-text="MDN Plus" data-cta-position="heading">{{ ftl('firefox-products-mdn-plus') }}</a></h2>
+    <h2 class="mzp-c-picto-heading"><a href="https://developer.mozilla.org/{{ referrals }}" data-cta-text="MDN Plus" data-cta-position="heading">{{ ftl('firefox-products-mdn-plus') }}</a></h2>
       <p>{{ ftl('firefox-products-resources-for-developers') }}</p>
       <p>
-        <a href="https://developer.mozilla.org/plus/{{ referrals }}" rel="external noopener" class="mzp-c-button mzp-t-product mzp-t-secondary" data-cta-type="link" data-cta-text="Support MDN">{{ ftl('firefox-products-support-mdn') }} {{ icon_external|safe }}</a>
+        <a href="https://developer.mozilla.org/plus/{{ referrals }}" rel="external noopener" class="mzp-c-button mzp-t-product mzp-t-secondary" data-cta-text="Support MDN">{{ ftl('firefox-products-support-mdn') }} {{ icon_external|safe }}</a>
       </p>
     {% endcall %}
 
@@ -179,9 +179,9 @@ <h2 class="mzp-c-picto-heading"><a href="https://developer.mozilla.org/{{ referr
         }
       ),
     ) %}
-      <h2 class="mzp-c-picto-heading"><a href="https://www.thunderbird.net/{{ referrals }}" data-cta-type="link" data-cta-text="Thunderbird" data-cta-position="heading">{{ ftl('firefox-products-thunderbird') }}</a></h2>
+      <h2 class="mzp-c-picto-heading"><a href="https://www.thunderbird.net/{{ referrals }}" data-cta-text="Thunderbird" data-cta-position="heading">{{ ftl('firefox-products-thunderbird') }}</a></h2>
       <p>{{ ftl('firefox-products-access-all') }}</p>
-      <p><a class="mzp-c-button mzp-t-product mzp-t-secondary" href="https://www.thunderbird.net/download/{{ referrals }}" rel="external noopener" data-cta-type="link" data-cta-text="Thunderbird Download">{{ ftl('firefox-products-download-thunderbird') }} {{ icon_download|safe }}</a></p>
+      <p><a class="mzp-c-button mzp-t-product mzp-t-secondary" href="https://www.thunderbird.net/download/{{ referrals }}" rel="external noopener" data-cta-text="Thunderbird Download">{{ ftl('firefox-products-download-thunderbird') }} {{ icon_download|safe }}</a></p>
     {% endcall %}
 
     <!-- Fakespot -->
@@ -197,9 +197,9 @@ <h2 class="mzp-c-picto-heading"><a href="https://www.thunderbird.net/{{ referral
         }
       ),
     ) %}
-      <h2 class="mzp-c-picto-heading"><a href="https://www.fakespot.com/{{ referrals }}" data-cta-type="link" data-cta-text="Fakespot" data-cta-position="heading">{{ ftl('firefox-products-fakespot') }}</a></h2>
+      <h2 class="mzp-c-picto-heading"><a href="https://www.fakespot.com/{{ referrals }}" data-cta-text="Fakespot" data-cta-position="heading">{{ ftl('firefox-products-fakespot') }}</a></h2>
       <p>{{ ftl('firefox-products-fakespot-has-your') }}</p>
-      <p><a class="mzp-c-button mzp-t-product mzp-t-secondary" href="https://www.fakespot.com/analyzer{{ referrals }}" rel="external noopener" data-cta-type="link" data-cta-text="Analyze a url with Fakespot">{{ ftl('firefox-products-analyze') }} {{ icon_external|safe }}</a></p>
+      <p><a class="mzp-c-button mzp-t-product mzp-t-secondary" href="https://www.fakespot.com/analyzer{{ referrals }}" rel="external noopener" data-cta-text="Analyze a url with Fakespot">{{ ftl('firefox-products-analyze') }} {{ icon_external|safe }}</a></p>
     {% endcall %}
 
     <!-- Pocket -->
@@ -215,9 +215,9 @@ <h2 class="mzp-c-picto-heading"><a href="https://www.fakespot.com/{{ referrals }
         }
       ),
     ) %}
-    <h2 class="mzp-c-picto-heading"><a href="https://getpocket.com/firefox_learnmore/{{ referrals }}" data-cta-type="link" data-cta-text="Pocket" data-cta-position="heading">{{ ftl('firefox-products-pocket') }}</a></h2>
+    <h2 class="mzp-c-picto-heading"><a href="https://getpocket.com/firefox_learnmore/{{ referrals }}" data-cta-text="Pocket" data-cta-position="heading">{{ ftl('firefox-products-pocket') }}</a></h2>
       <p>{{ ftl('firefox-products-discover-the-best-content-v2') }}</p>
-      <p class="show-else"><a href="https://getpocket.com/signup{{ referrals }}" rel="external noopener" class="mzp-c-button mzp-t-product mzp-t-secondary" data-cta-type="link" data-cta-text="Pocket sign up">{{ ftl('firefox-products-get-pocket') }} {{ icon_external|safe }}</a></p>
+      <p class="show-else"><a href="https://getpocket.com/signup{{ referrals }}" rel="external noopener" class="mzp-c-button mzp-t-product mzp-t-secondary" data-cta-text="Pocket sign up">{{ ftl('firefox-products-get-pocket') }} {{ icon_external|safe }}</a></p>
       <p class="show-android">{{ google_play_button(href=pocket_android_url, id='playStoreLink-pocket') }}</p>
       <p class="show-ios">{{ apple_app_store_button(href=pocket_ios_url, id='appStoreLink-pocket') }}</p>
     {% endcall %}
diff --git a/bedrock/products/templates/products/mozsocial/invite.html b/bedrock/products/templates/products/mozsocial/invite.html
new file mode 100644
index 00000000000..c42ccd159c9
--- /dev/null
+++ b/bedrock/products/templates/products/mozsocial/invite.html
@@ -0,0 +1,106 @@
+{#
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at https://mozilla.org/MPL/2.0/.
+#}
+
+{% extends "base-protocol.html" %}
+
+{% block page_css %}
+  {{ css_bundle('protocol-newsletter') }}
+  {{ css_bundle('mozsocial-invite') }}
+{% endblock %}
+
+{% block page_title %}{{ ftl('mozsocial-invite-join-the-waitlist') }}{% endblock %}
+
+{% block content %}
+<main class="mzp-l-content mzp-t-content-xl">
+ <section class="mzp-c-newsletter c-mozsocial-invite">
+  <div class="mzp-c-newsletter-image">
+    {{ resp_img(
+      url='img/products/mozsocial/waitlist-tree.png',
+      srcset={
+        'img/products/mozsocial/waitlist-tree-high-res.png': '2x'
+      },
+      optional_attributes={
+        "height": "424",
+        "width": "424"
+      }
+    )}}
+  </div>
+
+  <form id="newsletter-form" class="mzp-c-newsletter-form c-waitlist-form" name="newsletter-form" action="{{ action }}" method="post">
+    <div hidden>
+      {{ newsletter_form.newsletters|safe }}
+    </div>
+    <input type="hidden" name="source_url" value="{{ request.build_absolute_uri() }}">
+
+    <h1 class="mzp-c-form-header">{{ ftl('mozsocial-invite-welcome-to-mozillasocial') }}</h1>
+    <p class="mzp-c-form-subtitle">{{ ftl('mozsocial-invite-please-join-our-waitlist') }}</p>
+
+    <fieldset class="mzp-c-newsletter-content">
+      <div class="mzp-c-form-errors hide-from-legacy-ie hidden" id="newsletter-errors">
+        <ul class="mzp-u-list-styled">
+          <li class="error-email-invalid hidden">{{ ftl('newsletter-form-please-enter-a-valid') }}</li>
+          <li class="error-select-country hidden">{{ ftl('newsletter-form-please-select-country') }}</li>
+          <li class="error-try-again-later hidden">{{ ftl('newsletter-form-we-are-sorry-but-there') }}</li>
+        </ul>
+      </div>
+
+      <div class="mzp-c-field">
+        <label class="mzp-c-field-label" for="id_first_name">{{ ftl('mozsocial-invite-first-name-label') }} <em class="mzp-c-fieldnote">{{ ftl('mozsocial-invite-required-label') }}</em></label>
+        <input class="mzp-c-field-control" id="id_first_name" name="first_name" type="text" required="" aria-required="true">
+      </div>
+
+      <div class="mzp-c-field">
+        <label class="mzp-c-field-label" for="id_last_name">{{ ftl('mozsocial-invite-last-name-label') }} <em class="mzp-c-fieldnote">{{ ftl('mozsocial-invite-required-label') }}</em></label>
+        <input class="mzp-c-field-control" id="id_last_name" name="last_name" type="text" required="" aria-required="true">
+      </div>
+
+      <div class="mzp-c-field">
+        <label class="mzp-c-field-label" for="id_email">{{ ftl('mozsocial-invite-your-email-address-label') }} <em class="mzp-c-fieldnote">{{ ftl('mozsocial-invite-required-label') }}</em></label>
+        <input type="email" class="mzp-js-email-field mzp-c-field-control" id="id_email" name="email" placeholder="{{ ftl('newsletter-form-yournameexamplecom') }}" required="" aria-required="true">
+      </div>
+
+      <div class="mzp-c-field">
+        <label for="id_country">{{ ftl('mozsocial-invite-country-label') }}  <em class="mzp-c-fieldnote">{{ ftl('mozsocial-invite-required-label') }}</em></label>
+        {{ newsletter_form.country|safe }}
+      </div>
+
+      <div class="mzp-c-field">
+        <label class="mzp-c-field-label" for="id_twitter">{{ ftl('mozsocial-invite-twitter-handle-label') }}</label>
+        <input class="mzp-c-field-control" id="id_twitter" name="mozilla_social_twitter_handle" type="text">
+      </div>
+
+      <div class="mzp-c-field">
+        <label class="mzp-c-field-label" for="id_mastodon">{{ ftl('mozsocial-invite-mastodon-handle-label') }}</label>
+        <input class="mzp-c-field-control" id="id_mastodon" name="mozilla_social_mastodon_handle" type="text">
+      </div>
+
+      <div class="mzp-c-choices">
+        <div class="mzp-c-choice">
+          <input class="mzp-c-choice-control" type="checkbox" id="privacy" required="" aria-required="true">
+          <label class="mzp-c-choice-label" for="privacy">{{ ftl('newsletter-form-im-okay-with-mozilla', url=url('privacy.notices.subscription-services')) }}</label>
+        </div>
+      </div>
+
+      <p class="mzp-c-form-submit">
+        <button type="submit" id="newsletter-submit" class="mzp-c-button button-dark" data-cta-text="Sign me up">
+          {{ ftl('newsletter-form-sign-me-up') }}
+        </button>
+      </p>
+    </fieldset>
+  </form>
+
+  <div id="newsletter-thanks" class="mozsocial-invite-success hidden">
+    <h3>{{ ftl('mozsocial-invite-thanks-youre-on-the-list') }}</h3>
+    <p>{{ ftl('newsletter-form-if-you-havent-previously') }}</p>
+    <p>{{ ftl('mozsocial-invite-mozillasocial-is-currently') }}</p>
+  </div>
+ </section>
+</main>
+{% endblock %}
+
+{% block js %}
+  {{ js_bundle('mozsocial-waitlist') }}
+{% endblock %}
diff --git a/bedrock/products/templates/products/vpn/download.html b/bedrock/products/templates/products/vpn/download.html
index 629f2268fa9..2ab74efb8e5 100644
--- a/bedrock/products/templates/products/vpn/download.html
+++ b/bedrock/products/templates/products/vpn/download.html
@@ -79,7 +79,7 @@ <h1>{{ self.page_title_full() }}</h1>
             <h2>{{ ftl('vpn-download-for-windows-long') }}</h2>
             <p class="current-platform-lede">{{ ftl('vpn-download-based-on-your') }}</p>
             <p>{{ ftl('vpn-download-for-windows-requirements') }}</p>
-            <a class="mzp-c-button" href="{{ url('products.vpn.windows-download') }}" data-cta-type="button" data-cta-text="VPN Download (Windows)" data-testid="vpn-download-link-primary-windows">
+            <a class="mzp-c-button" href="{{ url('products.vpn.windows-download') }}" data-cta-text="VPN Download (Windows)" data-testid="vpn-download-link-primary-windows">
             {{ ftl('vpn-download-get-mozilla-vpn', fallback='vpn-shared-subscribe-link') }}
             </a>
           </div>
@@ -93,7 +93,7 @@ <h2>{{ ftl('vpn-download-for-windows-long') }}</h2>
             <h2>{{ ftl('vpn-download-for-mac-long', fallback='vpn-download-for-mac') }}</h2>
             <p class="current-platform-lede">{{ ftl('vpn-download-based-on-your') }}</p>
             <p>{{ ftl('vpn-download-version-requirements', version='11.0') }}</p>
-            <a class="mzp-c-button" href="{{ url('products.vpn.mac-download') }}" data-cta-type="button" data-cta-text="VPN Download (macOS)" class="platform-download-link" data-testid="vpn-download-link-primary-mac">
+            <a class="mzp-c-button" href="{{ url('products.vpn.mac-download') }}" data-cta-text="VPN Download (macOS)" class="platform-download-link" data-testid="vpn-download-link-primary-mac">
             {{ ftl('vpn-download-get-mozilla-vpn', fallback='vpn-shared-subscribe-link') }}
             </a>
           </div>
@@ -107,7 +107,7 @@ <h2>{{ ftl('vpn-download-for-mac-long', fallback='vpn-download-for-mac') }}</h2>
             <h2>{{ ftl('vpn-download-for-linux-long', fallback='vpn-download-for-linux') }}</h2>
             <p class="current-platform-lede">{{ ftl('vpn-download-based-on-your') }}</p>
             <p>{{ ftl('vpn-download-for-linux-requirements', version='20.04') }}</p>
-            <a class="mzp-c-button" href="{{ linux_download_url }}" data-cta-type="button" data-cta-text="VPN Download (Linux)" class="platform-download-link">
+            <a class="mzp-c-button" href="{{ linux_download_url }}" data-cta-text="VPN Download (Linux)" class="platform-download-link">
             {{ ftl('vpn-download-get-mozilla-vpn', fallback='vpn-shared-subscribe-link') }}
             </a>
           </div>
@@ -121,7 +121,7 @@ <h2>{{ ftl('vpn-download-for-linux-long', fallback='vpn-download-for-linux') }}<
             <h2>{{ ftl('vpn-download-for-ios-long-v2', fallback='vpn-download-for-ios') }}</h2>
             <p class="current-platform-lede">{{ ftl('vpn-download-based-on-your') }}</p>
             <p>{{ ftl('vpn-download-version-requirements', version='14.0') }}</p>
-            <a href="{{ ios_download_url }}" data-cta-type="button" data-cta-text="VPN Download (iOS)" class="platform-download-link">
+            <a href="{{ ios_download_url }}" data-cta-text="VPN Download (iOS)" class="platform-download-link">
               <img src="{{ static('img/products/vpn/download/apple-app-store-badge.svg') }}" alt=" {{ ftl('vpn-download-get-mozilla-vpn', fallback='vpn-shared-subscribe-link') }}">
             </a>
           </div>
@@ -135,7 +135,7 @@ <h2>{{ ftl('vpn-download-for-ios-long-v2', fallback='vpn-download-for-ios') }}</
             <h2>{{ ftl('vpn-download-for-android-long', fallback='vpn-download-for-android') }}</h2>
             <p class="current-platform-lede">{{ ftl('vpn-download-based-on-your') }}</p>
             <p>{{ ftl('vpn-download-version-requirements', version='8.0') }}</p>
-            <a class="platform-download-link" href="{{ android_download_url }}" data-cta-type="button" data-cta-text="VPN Download (Android)" target="_blank" rel="noopener noreferrer">
+            <a class="platform-download-link" href="{{ android_download_url }}" data-cta-text="VPN Download (Android)" target="_blank" rel="noopener noreferrer">
               <img src="{{ static('img/products/vpn/download/google-play-badge.png') }}" alt=" {{ ftl('vpn-download-get-mozilla-vpn', fallback='vpn-shared-subscribe-link') }}">
             </a>
           </div>
@@ -154,7 +154,7 @@ <h3>{{ ftl('vpn-download-also-available') }}</h3>
             <h2>{{ ftl('vpn-download-for-windows-v2') }}</h2>
             <p>{{ ftl('vpn-download-for-windows-requirements') }}</p>
           </div>
-          <a href="{{ url('products.vpn.windows-download') }}" data-cta-type="button" data-cta-text="VPN Download (Windows)" class="platform-download-link" data-testid="vpn-download-link-secondary-windows">
+          <a href="{{ url('products.vpn.windows-download') }}" data-cta-text="VPN Download (Windows)" class="platform-download-link" data-testid="vpn-download-link-secondary-windows">
             <span class="">{{ ftl('vpn-download-for-windows-long') }}</span>
           </a>
         </li>
@@ -167,7 +167,7 @@ <h2>{{ ftl('vpn-download-for-windows-v2') }}</h2>
             <h2>{{ ftl('vpn-download-for-mac') }}</h2>
             <p>{{ ftl('vpn-download-version-requirements', version='11.0') }}</p>
           </div>
-          <a href="{{ url('products.vpn.mac-download') }}" data-cta-type="button" data-cta-text="VPN Download (macOS)" class="platform-download-link" data-testid="vpn-download-link-secondary-mac">
+          <a href="{{ url('products.vpn.mac-download') }}" data-cta-text="VPN Download (macOS)" class="platform-download-link" data-testid="vpn-download-link-secondary-mac">
             <span class="visually-hidden">{{ ftl('vpn-download-for-mac-long') }}</span>
           </a>
         </li>
@@ -180,7 +180,7 @@ <h2>{{ ftl('vpn-download-for-mac') }}</h2>
             <h2>{{ ftl('vpn-download-for-linux') }}</h2>
             <p>{{ ftl('vpn-download-for-linux-requirements', version='20.04') }}</p>
           </div>
-          <a href="{{ linux_download_url }}" data-cta-type="button" data-cta-text="VPN Download (Linux)" class="platform-download-link">
+          <a href="{{ linux_download_url }}" data-cta-text="VPN Download (Linux)" class="platform-download-link">
             <span class="visually-hidden">{{ ftl('vpn-download-for-linux-long') }}</span>
           </a>
         </li>
@@ -193,7 +193,7 @@ <h2>{{ ftl('vpn-download-for-linux') }}</h2>
             <h2>{{ ftl('vpn-download-for-ios') }}</h2>
             <p>{{ ftl('vpn-download-version-requirements', version='14.0') }}</p>
           </div>
-          <a href="{{ ios_download_url }}" data-cta-type="button" data-cta-text="VPN Download (iOS)" class="platform-download-link">
+          <a href="{{ ios_download_url }}" data-cta-text="VPN Download (iOS)" class="platform-download-link">
             <span class="visually-hidden">{{ ftl('vpn-download-for-ios-long-v2') }}</span>
           </a>
         </li>
@@ -206,7 +206,7 @@ <h2>{{ ftl('vpn-download-for-ios') }}</h2>
             <h2>{{ ftl('vpn-download-for-android') }}</h2>
             <p>{{ ftl('vpn-download-version-requirements', version='8.0') }}</p>
           </div>
-          <a href="{{ android_download_url }}" data-cta-type="button" data-cta-text="VPN Download (Android)" class="platform-download-link">
+          <a href="{{ android_download_url }}" data-cta-text="VPN Download (Android)" class="platform-download-link">
             <span class="visually-hidden">{{ ftl('vpn-download-for-android-long') }}</span>
           </a>
         </li>
@@ -216,7 +216,7 @@ <h2>{{ ftl('vpn-download-for-android') }}</h2>
     {% if ftl_has_messages('vpn-download-previous-versions') %}
       <div class="vpn-download-previous-versions mzp-l-content ">
         <p>
-          <a href="https://archive.mozilla.org/pub/vpn/releases/" data-cta-type="button" data-cta-text="VPN Download Previous Versions">{{ ftl('vpn-download-previous-versions') }}</a>
+          <a href="https://archive.mozilla.org/pub/vpn/releases/" data-cta-text="VPN Download Previous Versions">{{ ftl('vpn-download-previous-versions') }}</a>
         </p>
       </div>
     {% endif %}
diff --git a/bedrock/products/templates/products/vpn/features.html b/bedrock/products/templates/products/vpn/features.html
index bf839f04df0..994e44a47b2 100644
--- a/bedrock/products/templates/products/vpn/features.html
+++ b/bedrock/products/templates/products/vpn/features.html
@@ -79,7 +79,7 @@ <h3 class="c-feature-title">
         </div>
       </li>
       <li class="c-feature-block">
-        {% set wireguard_url = 'href="%s" data-cta-type="link" rel="external noopener" target="_blank"'|safe|format(('https://mullvad.net/help/why-wireguard/')) %}
+        {% set wireguard_url = 'href="%s"  rel="external noopener" target="_blank"'|safe|format(('https://mullvad.net/help/why-wireguard/')) %}
 
         <img src="{{ static('img/products/vpn/features/icons/speed.svg') }}" width="120" alt="">
         <div class="c-feature-block-detail">
@@ -172,7 +172,7 @@ <h2 class="c-section-title">{{ ftl('vpn-features-secure') }}</h2>
         base_el='li'
       ) %}
         <p>
-          {% set feature_url = 'href="%s" data-cta-type="link" rel="external noopener" target="_blank"'|safe|format(('https://support.mozilla.org/kb/multi-hop-encrypt-your-data-twice-enhanced-security' + _params)) %}
+          {% set feature_url = 'href="%s"  rel="external noopener" target="_blank"'|safe|format(('https://support.mozilla.org/kb/multi-hop-encrypt-your-data-twice-enhanced-security' + _params)) %}
           {{ ftl('vpn-features-multi-hop-feature', feature=feature_url) }}
         </p>
       {% endcall %}
@@ -192,7 +192,7 @@ <h2 class="c-section-title">{{ ftl('vpn-features-secure') }}</h2>
         base_el='li'
       ) %}
         <p>
-          {% set dns_url = 'href="%s" data-cta-type="link" rel="external noopener" target="_blank"'|safe|format(('https://support.mozilla.org/kb/how-do-i-change-my-dns-settings' + _params)) %}
+          {% set dns_url = 'href="%s"  rel="external noopener" target="_blank"'|safe|format(('https://support.mozilla.org/kb/how-do-i-change-my-dns-settings' + _params)) %}
 
           {{ ftl('vpn-features-keep-traffic-protected', dns=dns_url) }}
         </p>
@@ -288,7 +288,7 @@ <h2>{{ ftl('vpn-features-personalize-which-apps') }}</h2>
     media_after=True
   ) %}
 
-    {% set containers_url = 'href="%s" data-cta-type="link" rel="external noopener" target="_blank"'|safe|format(('https://support.mozilla.org/kb/use-multi-account-containers-mozilla-vpn' + _params)) %}
+    {% set containers_url = 'href="%s"  rel="external noopener" target="_blank"'|safe|format(('https://support.mozilla.org/kb/use-multi-account-containers-mozilla-vpn' + _params)) %}
 
     <h2>{{ ftl('vpn-features-set-different-locations') }}</h2>
 
@@ -337,7 +337,7 @@ <h2 class="c-section-title">{{ ftl('vpn-features-trustworthy') }}</h2>
         base_el='li'
       ) %}
         <p>
-          {% set privacy_notice = 'href="%s" data-cta-type="link"'|safe|format(url('privacy.notices.subscription-services')) %}
+          {% set privacy_notice = 'href="%s" '|safe|format(url('privacy.notices.subscription-services')) %}
 
           {{ ftl('vpn-features-simply-put-we-dont', privacy=privacy_notice) }}
         </p>
@@ -358,7 +358,7 @@ <h2 class="c-section-title">{{ ftl('vpn-features-trustworthy') }}</h2>
         base_el='li'
       ) %}
         <p>
-           {% set github_url = 'href="%s" data-cta-type="link" rel="external noopener" target="_blank"'|safe|format(('https://github.com/mozilla-mobile/mozilla-vpn-client')) %}
+           {% set github_url = 'href="%s"  rel="external noopener" target="_blank"'|safe|format(('https://github.com/mozilla-mobile/mozilla-vpn-client')) %}
 
           {{ ftl('vpn-features-made-with-open-source-code', github=github_url) }}
         </p>
@@ -379,7 +379,7 @@ <h2 class="c-section-title">{{ ftl('vpn-features-trustworthy') }}</h2>
         base_el='li'
       ) %}
         <p>
-          {% set report_url = 'href="%s" data-cta-type="link" rel="external noopener" target="_blank"'|safe|format(('https://blog.mozilla.org/mozilla/news/mozilla-vpn-completes-independent-security-audit-by-cure53' + _params)) %}
+          {% set report_url = 'href="%s"  rel="external noopener" target="_blank"'|safe|format(('https://blog.mozilla.org/mozilla/news/mozilla-vpn-completes-independent-security-audit-by-cure53' + _params)) %}
 
           {{ ftl('vpn-features-weve-been-audited', report=report_url) }}
         </p>
@@ -400,7 +400,7 @@ <h2 class="c-section-title">{{ ftl('vpn-features-trustworthy') }}</h2>
         base_el='li'
       ) %}
         <p>
-          {% set mofo_url = 'href="%s" data-cta-type="link" rel="external noopener" target="_blank"'|safe|format(('https://foundation.mozilla.org/' + _params)) %}
+          {% set mofo_url = 'href="%s"  rel="external noopener" target="_blank"'|safe|format(('https://foundation.mozilla.org/' + _params)) %}
 
           {{ ftl('vpn-features-were-backed-by-mofo', mofo=mofo_url) }}
         </p>
diff --git a/bedrock/products/templates/products/vpn/includes/macros.html b/bedrock/products/templates/products/vpn/includes/macros.html
index 3a5bc3799ab..2ad600563da 100644
--- a/bedrock/products/templates/products/vpn/includes/macros.html
+++ b/bedrock/products/templates/products/vpn/includes/macros.html
@@ -75,14 +75,14 @@ <h2 class="vpn-hero-sub-heading">{{ subheading }}</h2>
 
 {% macro vpn_conditional_cta(position) -%}
   {% if vpn_available %}
-    <a class="mzp-c-button mzp-t-xl" href="#pricing" data-cta-type="button" data-cta-text="Scroll to pricing" data-cta-position="{{ position }}" data-testid="get-mozilla-vpn-{{ position }}-button">
+    <a class="mzp-c-button mzp-t-xl" href="#pricing" data-cta-text="Scroll to pricing" data-cta-position="{{ position }}" data-testid="get-mozilla-vpn-{{ position }}-button">
     {{ ftl('vpn-shared-subscribe-link') }}
     </a>
     <p class="guarantee-copy">
       <a href="#faq-refunds">{{ ftl('vpn-shared-money-back-guarantee') }}</a>
     </p>
   {% else %}
-    <a class="mzp-c-button mzp-t-xl" href="{{ url('products.vpn.invite') }}" data-cta-type="button" data-cta-text="Join the VPN Waitlist" data-cta-position="{{ position }}" data-testid="join-waitlist-{{ position }}-button">
+    <a class="mzp-c-button mzp-t-xl" href="{{ url('products.vpn.invite') }}" data-cta-text="Join the VPN Waitlist" data-cta-position="{{ position }}" data-testid="join-waitlist-{{ position }}-button">
       {{ ftl('vpn-shared-waitlist-link') }}
     </a>
 
@@ -97,14 +97,14 @@ <h2 class="vpn-hero-sub-heading">{{ subheading }}</h2>
     {% if vpn_available %}
       <p>
         {% set pricing_url = '#pricing' if request.path.endswith('/products/vpn/') else url('products.vpn.landing') + '#pricing' %}
-        <a class="mzp-c-button mzp-t-product mzp-t-xl" href="{{ pricing_url }}" data-cta-type="button" data-cta-text="Get Mozilla VPN" data-cta-position="{{ position }}" data-testid="get-mozilla-vpn-{{ position }}-button">
+        <a class="mzp-c-button mzp-t-product mzp-t-xl" href="{{ pricing_url }}" data-cta-text="Get Mozilla VPN" data-cta-position="{{ position }}" data-testid="get-mozilla-vpn-{{ position }}-button">
           {{ ftl('vpn-shared-subscribe-link') }}
         </a>
       </p>
       <p class="c-guarantee">{{ ftl('vpn-shared-features-guarantee') }}</p>
     {% else %}
       <p>
-        <a class="mzp-c-button mzp-t-product mzp-t-xl" href="{{ url('products.vpn.invite') }}" data-cta-type="button" data-cta-text="Join the VPN Waitlist" data-testid="join-waitlist-{{ position }}-button">
+        <a class="mzp-c-button mzp-t-product mzp-t-xl" href="{{ url('products.vpn.invite') }}" data-cta-text="Join the VPN Waitlist" data-testid="join-waitlist-{{ position }}-button">
           {{ ftl('vpn-shared-waitlist-link') }}
         </a>
       </p>
@@ -115,11 +115,11 @@ <h2 class="vpn-hero-sub-heading">{{ subheading }}</h2>
 {% macro vpn_nav_cta(link_text, alt_link_text, download_link_text, utm_source, utm_campaign) -%}
   <div class="vpn-nav-cta">
     {% if vpn_available %}
-      <a class="mzp-c-button mzp-t-secondary mzp-t-md" href="#pricing" data-cta-type="button" data-cta-text="Get Mozilla VPN" data-cta-position="navigation" data-testid="get-mozilla-vpn-nav-button">
+      <a class="mzp-c-button mzp-t-secondary mzp-t-md" href="#pricing" data-cta-text="Get Mozilla VPN" data-cta-position="navigation" data-testid="get-mozilla-vpn-nav-button">
         {{ ftl('vpn-shared-subscribe-link') }}
       </a>
     {% else %}
-      <a class="mzp-c-button mzp-t-secondary mzp-t-md" href="{{ url('products.vpn.invite') }}" data-cta-type="button" data-cta-text="Join the VPN Waitlist" data-cta-position="navigation" data-testid="join-waitlist-nav-button">
+      <a class="mzp-c-button mzp-t-secondary mzp-t-md" href="{{ url('products.vpn.invite') }}" data-cta-text="Join the VPN Waitlist" data-cta-position="navigation" data-testid="join-waitlist-nav-button">
         {{ ftl('vpn-shared-waitlist-link') }}
       </a>
     {% endif %}
@@ -130,11 +130,11 @@ <h2 class="vpn-hero-sub-heading">{{ subheading }}</h2>
   <div class="vpn-nav-cta">
     {% if vpn_available %}
       {% set pricing_url = '#pricing' if request.path.endswith('/products/vpn/') else url('products.vpn.landing') + '#pricing' %}
-      <a class="mzp-c-button mzp-t-secondary mzp-t-md" href="{{ pricing_url }}" data-cta-type="button" data-cta-text="Get Mozilla VPN" data-cta-position="navigation" data-testid="get-mozilla-vpn-nav-button">
+      <a class="mzp-c-button mzp-t-secondary mzp-t-md" href="{{ pricing_url }}" data-cta-text="Get Mozilla VPN" data-cta-position="navigation" data-testid="get-mozilla-vpn-nav-button">
         {{ ftl('vpn-shared-subscribe-link') }}
       </a>
     {% else %}
-      <a class="mzp-c-button mzp-t-secondary mzp-t-md" href="{{ url('products.vpn.invite') }}" data-cta-type="button" data-cta-text="Join the VPN Waitlist" data-cta-position="navigation" data-testid="join-waitlist-nav-button">
+      <a class="mzp-c-button mzp-t-secondary mzp-t-md" href="{{ url('products.vpn.invite') }}" data-cta-text="Join the VPN Waitlist" data-cta-position="navigation" data-testid="join-waitlist-nav-button">
         {{ ftl('vpn-shared-waitlist-link') }}
       </a>
     {% endif %}
@@ -190,11 +190,11 @@ <h2 class="vpn-content-media-heading">{{ heading }}</h2>
         class_name=class_name,
         optional_attributes= {
           'data-cta-text' : 'Get Mozilla VPN',
-          'data-cta-type' : 'button',
+          'data-cta-type' : 'vpn',
         }
       ) }}
     {% else %}
-      <a class="{{ class_name }}" href="{{ url('products.vpn.invite') }}" data-cta-type="button" data-cta-text="Join the VPN Waitlist" data-cta-position="navigation">
+      <a class="{{ class_name }}" href="{{ url('products.vpn.invite') }}" data-cta-text="Join the VPN Waitlist" data-cta-position="navigation">
         {{ alt_link_text }}
       </a>
     {% endif %}
diff --git a/bedrock/products/templates/products/vpn/invite.html b/bedrock/products/templates/products/vpn/invite.html
index f5a2e36f2b7..93337335bdc 100644
--- a/bedrock/products/templates/products/vpn/invite.html
+++ b/bedrock/products/templates/products/vpn/invite.html
@@ -69,7 +69,7 @@ <h1 class="mzp-c-form-header">{{ ftl('vpn-landing-invite-page-heading') }}</h1>
       </div>
 
       <p class="mzp-c-form-submit">
-        <button class="mzp-c-button mzp-t-xl" id="newsletter-submit" type="submit" data-testid="vpn-invite-submit-button">{{ ftl('vpn-shared-waitlist-link') }}</button>
+        <button class="mzp-c-button mzp-t-xl" id="newsletter-submit" type="submit" data-cta-text="Join the Waitlist" data-testid="vpn-invite-submit-button">{{ ftl('vpn-shared-waitlist-link') }}</button>
       </p>
 
       <div class="vpn-invite-privacy">
diff --git a/bedrock/products/templates/products/vpn/landing-refresh.html b/bedrock/products/templates/products/vpn/landing-refresh.html
index 30fd13666b9..d49a0043712 100644
--- a/bedrock/products/templates/products/vpn/landing-refresh.html
+++ b/bedrock/products/templates/products/vpn/landing-refresh.html
@@ -74,7 +74,7 @@ <h1>{{ ftl('vpn-landing-powerful-privacy-for-peace') }}</h1>
 
     {% if vpn_available %}
       <p class="c-main-cta">
-        <a class="mzp-c-button mzp-t-product mzp-t-xl" href="#pricing" data-cta-type="button" data-cta-text="Save on Mozilla VPN" data-cta-position="primary" data-testid="get-mozilla-vpn-hero-button">
+        <a class="mzp-c-button mzp-t-product mzp-t-xl" href="#pricing" data-cta-text="Save on Mozilla VPN" data-cta-position="primary" data-testid="get-mozilla-vpn-hero-button">
           {{ vpn_saving(country_code=country_code, lang=LANG, bundle_relay=False, ftl_string='vpn-shared-save-percent-on') }}
         </a>
         <small>
@@ -83,7 +83,7 @@ <h1>{{ ftl('vpn-landing-powerful-privacy-for-peace') }}</h1>
       </p>
 
     {% else %}
-      <a class="mzp-c-button mzp-t-product mzp-t-xl" href="{{ url('products.vpn.invite') }}" data-cta-type="button" data-cta-text="Join the VPN Waitlist" data-cta-position="primary" data-testid="join-waitlist-hero-button">
+      <a class="mzp-c-button mzp-t-product mzp-t-xl" href="{{ url('products.vpn.invite') }}" data-cta-text="Join the VPN Waitlist" data-cta-position="primary" data-testid="join-waitlist-hero-button">
         {{ ftl('vpn-shared-waitlist-link') }}
       </a>
     {% endif %}
@@ -140,7 +140,7 @@ <h3 class="c-section-title">{{ ftl('vpn-landing-one-subscription-for-all-your')
       <header class="c-pricing-main-header">
         <h2 class="c-section-title">{{ ftl('vpn-shared-mozilla-vpn-is-not-yet-available') }}</h2>
 
-        <a class="mzp-c-button mzp-t-product mzp-t-xl" href="{{ url('products.vpn.invite') }}" data-cta-type="button" data-cta-text="Join the VPN Waitlist" data-testid="join-waitlist-not-available-button">
+        <a class="mzp-c-button mzp-t-product mzp-t-xl" href="{{ url('products.vpn.invite') }}" data-cta-text="Join the VPN Waitlist" data-testid="join-waitlist-not-available-button">
           {{ ftl('vpn-shared-waitlist-link') }}
         </a>
       </header>
diff --git a/bedrock/products/templates/products/vpn/landing.html b/bedrock/products/templates/products/vpn/landing.html
new file mode 100644
index 00000000000..eb2f6a53aa5
--- /dev/null
+++ b/bedrock/products/templates/products/vpn/landing.html
@@ -0,0 +1,360 @@
+{#
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at https://mozilla.org/MPL/2.0/.
+#}
+
+{% from "products/vpn/includes/macros.html" import vpn_hero, vpn_conditional_cta, vpn_nav_cta, vpn_content_block, vpn_content_media with context %}
+
+{% extends "products/vpn/base.html" %}
+
+{# Issue 13019: Avoid duplicate content for English pages. #}
+{%- block page_title_full -%}
+  {%- if LANG == 'en-US' -%}
+    Get Mozilla VPN  — Mozilla (US)
+  {%- elif LANG == 'en-GB' -%}
+    Get Mozilla VPN — Mozilla (UK)
+  {%- else -%}
+    {{ ftl('vpn-landing-page-title') }}
+  {%- endif -%}
+{%- endblock -%}
+
+{% block page_title_suffix %}{% endblock %}
+
+{% block page_desc %}{{ ftl('vpn-landing-page-desc', countries=available_countries) }}{% endblock %}
+
+{% set show_relay_promo_block = relay_bundle_available_in_country and ftl_has_messages('vpn-shared-increase-your-privacy', 'vpn-add-relay-to-protect', 'vpn-shared-why-bundle') %}
+
+{% block html_attrs %}{{ super() }} data-cj-affiliate-endpoint="{{ settings.CJMS_AFFILIATE_ENDPOINT }}"{% endblock %}
+
+{% block body_id %}mozilla-vpn-landing{% endblock %}
+
+{% set _utm_source = 'www.mozilla.org-vpn-product-page' %}
+{% set _utm_campaign = 'vpn-product-page' %}
+{% set _params = '?utm_source=' ~ _utm_source ~ '&utm_medium=referral&utm_campaign=' ~ _utm_campaign %}
+
+{% block page_css %}
+  {{ css_bundle('mozilla-vpn-landing') }}
+{% endblock %}
+
+{% block site_header %}
+  {% with
+    custom_nav_cta=vpn_nav_cta(
+      link_text=ftl('vpn-shared-subscribe-link'),
+      alt_link_text=ftl('vpn-shared-waitlist-link'),
+      download_link_text=ftl('vpn-shared-sign-in-link'),
+      utm_source=_utm_source,
+      utm_campaign=_utm_campaign,
+    )
+  %}
+    {% include 'includes/protocol/navigation/navigation.html' %}
+  {% endwith %}
+{% endblock %}
+
+{% block content %}
+<main {% if show_relay_promo_block %}class="has-relay-promo"{% endif %}>
+  {% block hero %}
+    {% call vpn_hero(
+      heading=ftl('vpn-shared-product-name'),
+      subheading=ftl('vpn-landing-hero-sub-heading-v2'),
+      desc=ftl('vpn-landing-hero-desc')
+    ) %}
+      {{ vpn_conditional_cta(position='primary') }}
+    {% endcall %}
+  {% endblock %}
+
+  <div class="mzp-l-content mzp-t-content-xl">
+    {% call vpn_content_media(
+      heading=ftl('vpn-landing-privacy-heading'),
+      image=resp_img(
+        url='img/products/vpn/landing/vpn-cntwell-01.png',
+        srcset={
+          'img/products/vpn/landing/vpn-cntwell-01-high-res.png': '2x'
+        },
+        optional_attributes={
+          'width': '480',
+          'height': '480'
+        }
+      ),
+      class_name='vpn-content-media-right-half',
+      has_outline=True
+    ) %}
+      <p>{{ ftl('vpn-landing-privacy-desc') }}</p>
+    {% endcall %}
+
+    {# note: `id=#pricing` is used as an anchor link from android in-product subscription flows, so do not remove (issue 10039) #}
+    <div id="pricing" class="mzp-is-anchor-link">
+      {% if vpn_available %}
+        {% include 'products/vpn/includes/pricing-plus-relay.html' %}
+      {% else %}
+        <div class="vpn-waitlist-feature-block">
+          {% call vpn_content_block(
+            class_name='vpn-content-block-price t-highlight'
+          ) %}
+          <div class="l-columns-two">
+            <div class="l-column-first">
+              <a class="mzp-c-button mzp-t-xl" href="{{ url('products.vpn.invite') }}" data-cta-text="Join the VPN Waitlist" data-cta-position="secondary">
+                {{ ftl('vpn-shared-waitlist-link') }}
+              </a>
+
+              <p class="availability-copy">
+                {{ ftl('vpn-shared-available-countries-v6') }}
+              </p>
+            </div>
+            <div class="l-column-last">
+              <ul class="mzp-u-list-styled vpn-feature-list">
+                <li class="vpn-feature-list-item">{{ ftl('vpn-shared-features-devices', devices=connect_devices) }}</li>
+                <li class="vpn-feature-list-item">{{ ftl('vpn-shared-features-servers', servers=connect_servers, countries=connect_countries) }}</li>
+                <li class="vpn-feature-list-item">{{ ftl('vpn-shared-features-encrypt') }}</li>
+                <li class="vpn-feature-list-item">{{ ftl('vpn-shared-features-bandwidth') }}</li>
+                <li class="vpn-feature-list-item">{{ ftl('vpn-shared-features-activity') }}</li>
+              </ul>
+            </div>
+          </div>
+          {% endcall %}
+        </div>
+      {% endif %}
+    </div>
+
+    {% call vpn_content_media(
+      heading=ftl('vpn-landing-fast-secure-heading'),
+      image=resp_img(
+        url='img/products/vpn/landing/vpn-cntwell-02.png',
+        srcset={
+          'img/products/vpn/landing/vpn-cntwell-02-high-res.png': '2x'
+        },
+        optional_attributes={
+          'width': '480',
+          'height': '480',
+          'loading': 'lazy'
+        }
+      ),
+      class_name='vpn-content-media-left-half'
+    ) %}
+      <p>
+          {{ ftl('vpn-landing-fast-secure-desc-v2', wireguard='https://mullvad.net/help/why-wireguard/', attrs='target="_blank" rel="external noopener noreferrer"') }}
+      </p>
+    {% endcall %}
+
+    {% call vpn_content_media(
+      heading=ftl('vpn-landing-brand-trust-heading'),
+      image=resp_img(
+        url='img/products/vpn/landing/vpn-cntwell-03.png',
+        srcset={
+          'img/products/vpn/landing/vpn-cntwell-03-high-res.png': '2x'
+        },
+        optional_attributes={
+          'width': '480',
+          'height': '480',
+          'loading': 'lazy'
+        }
+      ),
+      class_name='vpn-content-media-right-half',
+      has_outline=True
+    ) %}
+      <p>{{ ftl('vpn-landing-brand-trust-desc', url=url('mozorg.about.manifesto')) }}</p>
+    {% endcall %}
+
+    {% if vpn_available %}
+      {% call vpn_content_media(
+        heading=ftl('vpn-shared-features-server-countries', servers=connect_servers, countries=connect_countries),
+        image=resp_img(
+          url='img/products/vpn/landing/vpn-cntwell-05-v2.png',
+          srcset={
+            'img/products/vpn/landing/vpn-cntwell-05-v2-high-res.png': '2x'
+          },
+          optional_attributes={
+            'width': '480',
+            'height': '480',
+            'loading': 'lazy'
+          }
+        ),
+        class_name='vpn-content-media-left-half vpn-connect-to-countries-and-servers'
+      ) %}
+        <p>{{ ftl('vpn-shared-features-full-list-servers', url='https://mullvad.net/servers/', attrs='target="_blank" rel="external noopener noreferrer"') }}</p>
+
+        <a class="mzp-c-button mzp-t-xl" href="#pricing" data-cta-text="Scroll to pricing" data-cta-position="secondary">
+          {{ ftl('vpn-shared-subscribe-link') }}
+        </a>
+
+        <p class="guarantee-copy">
+          <a href="#faq-refunds">{{ ftl('vpn-shared-money-back-guarantee') }}</a>
+        </p>
+      {% endcall %}
+    {% else %}
+      {% call vpn_content_media(
+        heading=ftl('vpn-shared-countries-coming-soon', countries=available_countries),
+        image=resp_img(
+          url='img/products/vpn/landing/vpn-cntwell-05-v2.png',
+          srcset={
+            'img/products/vpn/landing/vpn-cntwell-05-v2-high-res.png': '2x'
+          },
+          optional_attributes={
+            'width': '480',
+            'height': '480',
+            'loading': 'lazy'
+          }
+        ),
+        class_name='vpn-content-media-left-half vpn-more-countries-coming-soon'
+      ) %}
+
+        <a class="mzp-c-button mzp-t-xl" href="{{ url('products.vpn.invite') }}" data-cta-text="Join the VPN Waitlist" data-cta-position="secondary">
+          {{ ftl('vpn-shared-waitlist-link') }}
+        </a>
+
+        <p class="availability-copy">
+          {{ ftl('vpn-shared-available-countries-v6') }}
+        </p>
+      {% endcall %}
+    {% endif %}
+
+    {% if show_relay_promo_block %}
+      <div id="bundle">
+        {% call vpn_content_media(
+          heading=ftl('vpn-shared-increase-your-privacy'),
+          image=resp_img(
+            url='img/products/vpn/landing/vpn-cntwell-06.png',
+            srcset={
+              'img/products/vpn/landing/vpn-cntwell-06-high-res.png': '2x'
+            },
+            optional_attributes={
+              'width': '480',
+              'height': '480',
+              'loading': 'lazy'
+            }
+          ),
+          class_name='vpn-content-media-right-half vpn-content-block-relay-bundle-promo'
+        ) %}
+          <p>
+            {{ ftl('vpn-add-relay-to-protect', url='https://relay.firefox.com/premium/' + _params)}}
+          </p>
+
+          <a class="mzp-c-button mzp-t-xl" href="#pricing" data-cta-text="Scroll to pricing" data-cta-position="secondary">
+            {{ ftl('vpn-shared-get-vpn-plus-relay') }}
+          </a>
+        {% endcall %}
+      </div>
+    {% endif %}
+  </div>
+
+  <section id="faq" class="vpn-faq mzp-l-content mzp-t-content-lg">
+    <h2 class="vpn-faq-section-heading">{{ ftl('vpn-landing-faq-heading') }}</h2>
+
+    <details id="faq-usecases" class="vpn-faq-item mzp-is-anchor-link">
+      <summary class="vpn-faq-item-heading">
+        <h3>{{ ftl('vpn-langing-faq-uses-question-heading') }}</h3>
+      </summary>
+      <p class="vpn-faq-item-detail">{{ ftl('vpn-landing-faq-uses-question-desc', url=url('products.vpn.resource-center.article', 'what-is-a-vpn')) }}</p>
+
+      <ol class="vpn-faq-item-detail mzp-u-list-styled">
+        <li>{{ ftl('vpn-landing-faq-uses-conceal-v2', url=url('products.vpn.resource-center.article', 'what-is-an-ip-address')) }}</li>
+        <li>{{ ftl('vpn-landing-faq-uses-encrypt') }}</li>
+      </ol>
+
+      <p class="vpn-faq-item-detail">
+        {{ ftl('vpn-landing-faq-uses-examples', url=url('products.vpn.resource-center.article', '5-reasons-you-should-use-a-vpn')) }}
+      </p>
+    </details>
+
+    <details id="faq-information" class="vpn-faq-item mzp-is-anchor-link">
+      <summary  class="vpn-faq-item-heading">
+        <h3>{{ ftl('vpn-landing-faq-info-question-heading') }}</h3>
+      </summary>
+      <p class="vpn-faq-item-detail">{{ ftl('vpn-landing-faq-info-question-desc-v2', principles=url('privacy.principles'), notice=url('privacy.notices.subscription-services')) }}</p>
+    </details>
+
+    <details id="faq-privacy" class="vpn-faq-item mzp-is-anchor-link">
+      <summary class="vpn-faq-item-heading">
+        <h3>{{ ftl('vpn-landing-faq-protected-question-heading') }}</h3>
+      </summary>
+      <p class="vpn-faq-item-detail">{{ ftl('vpn-landing-faq-protected-question-desc', url='https://mullvad.net/help/why-wireguard/', attrs='target="_blank" rel="external noopener noreferrer"') }}</p>
+    </details>
+
+    <details id="faq-competitors" class="vpn-faq-item mzp-is-anchor-link">
+      <summary class="vpn-faq-item-heading">
+        <h3>{{ ftl('vpn-landing-faq-competition-question-heading') }}</h3>
+      </summary>
+      <p class="vpn-faq-item-detail">{{ ftl('vpn-landing-faq-competition-question-desc-v2', url=url('mozorg.about.history')) }}</p>
+    </details>
+
+    <details id="faq-compatibility" class="vpn-faq-item mzp-is-anchor-link">
+      <summary class="vpn-faq-item-heading">
+        <h3>{{ ftl('vpn-landing-faq-compatibility-question-heading') }}</h3>
+      </summary>
+      <p class="vpn-faq-item-detail">
+          {{ ftl('vpn-landing-faq-compatibility-question-desc-v2', mobile=url('products.vpn.platforms.mobile'), desktop=url('products.vpn.platforms.desktop')) }}
+      </p>
+
+      <ul class="vpn-faq-item-detail mzp-u-list-styled">
+        <li>
+          {{ ftl('vpn-landing-faq-compatibility-question-desc-windows-v3', url=url('products.vpn.platforms.windows')) }}
+        </li>
+        <li>
+            {% set mac_url='href="%s"'|safe|format(url('products.vpn.platforms.mac')) %}
+            {{ ftl('vpn-landing-faq-compatibility-question-desc-mac-v4', url=mac_url, minversion='11.0') }}
+        </li>
+        <li>
+            {{ ftl('vpn-landing-faq-compatibility-question-desc-android-v3', url=url('products.vpn.platforms.android')) }}
+        </li>
+        <li>
+            {{ ftl('vpn-landing-faq-compatibility-question-desc-ios-v4', url=url('products.vpn.platforms.ios'), version='14.0') }}
+        </li>
+        <li>
+          {{ ftl('vpn-landing-faq-compatibility-question-desc-linux-v4', url=url('products.vpn.platforms.linux')) }}
+        </li>
+      </ul>
+    </details>
+
+    <details id="faq-refunds" class="vpn-faq-item mzp-is-anchor-link">
+      <summary class="vpn-faq-item-heading">
+        <h3>{{ ftl('vpn-landing-faq-refund-question-heading') }}</h3>
+      </summary>
+        <p class="vpn-faq-item-detail">{{ ftl('vpn-landing-faq-refund-question-desc-v2') }}</p>
+        <p class="vpn-faq-item-detail">{{ ftl('vpn-landing-faq-refund-question-additional-desc') }}</p>
+    </details>
+
+    <details id="faq-subscriptions" class="vpn-faq-item mzp-is-anchor-link">
+      <summary class="vpn-faq-item-heading">
+        <h3>{{ ftl('vpn-landing-faq-manage-subscription-question-heading') }}</h3>
+      </summary>
+      <p class="vpn-faq-item-detail">{{ ftl('vpn-landing-faq-manage-subscription-question-desc', url='https://vpn.mozilla.org/r/vpn/subscription' + _params) }}</p>
+    </details>
+
+    {% if ftl_has_messages('vpn-landing-faq-download-heading', 'vpn-landing-faq-download-desc') %}
+    <details id="faq-download" class="vpn-faq-item mzp-is-anchor-link">
+      <summary class="vpn-faq-item-heading">
+        <h3>{{ ftl('vpn-landing-faq-download-heading') }}</h3>
+      </summary>
+      <p class="vpn-faq-item-detail">
+        {% set attrs = 'href="' ~ url('products.vpn.download') ~ '" data-cta-text="Download Page"' %}
+        {{ ftl('vpn-landing-faq-download-desc', attrs=attrs) }}
+      </p>
+    </details>
+    {% endif %}
+
+    <footer class="vpn-faq-footer">
+      <a class="vpn-faq-footer-link mzp-c-cta-link" href="https://support.mozilla.org/products/firefox-private-network-vpn{{ _params }}&utm_content=vpn-faq-see-more-link" data-cta-text="FAQ See More">
+        {{ ftl('vpn-landing-faq-link') }}
+      </a>
+    </footer>
+  </section>
+
+  <footer class="vpn-footer mzp-l-content mzp-t-content-xl">
+    {% include 'products/vpn/includes/footer-subscribe.html' %}
+    {% include 'products/vpn/includes/footer-legal.html' %}
+  </footer>
+
+</main>
+
+{% endblock %}
+
+{% block js %}
+  {% if vpn_affiliate_attribution_enabled %}
+    {{ js_bundle('mozilla-vpn-affiliate') }}
+  {% else %}
+    {{ js_bundle('fxa_product_button') }}
+  {% endif %}
+
+  {{ js_bundle('mozilla-vpn-landing') }}
+  {{ js_bundle('data_begincheckout') }}
+{% endblock %}
diff --git a/bedrock/products/templates/products/vpn/pricing-refresh.html b/bedrock/products/templates/products/vpn/pricing-refresh.html
index 76d010e5358..15217cfe9d6 100644
--- a/bedrock/products/templates/products/vpn/pricing-refresh.html
+++ b/bedrock/products/templates/products/vpn/pricing-refresh.html
@@ -52,7 +52,7 @@ <h2 class="c-section-title">{{ ftl('vpn-pricing-one-subscription') }}</h2>
       <header class="c-pricing-main-header">
         <h1 class="c-section-title">{{ ftl('vpn-pricing-vpn-not-available') }}</h1>
 
-        <a class="mzp-c-button mzp-t-product mzp-t-xl" href="{{ url('products.vpn.invite') }}" data-cta-type="button" data-cta-text="Join the VPN Waitlist" data-testid="join-waitlist-button">
+        <a class="mzp-c-button mzp-t-product mzp-t-xl" href="{{ url('products.vpn.invite') }}" data-cta-text="Join the VPN Waitlist" data-testid="join-waitlist-button">
           {{ ftl('vpn-shared-waitlist-link') }}
         </a>
       </header>
@@ -73,8 +73,8 @@ <h3>{{ ftl('vpn-pricing-refund-policy') }}</h3>
     </details>
 
     <details id="faq-information" class="c-faq-item mzp-is-anchor-link">
-      {% set privacy_principles = 'href="%s" data-cta-text="Privacy principles" data-cta-type="link"'|safe|format(url('privacy.principles')) %}
-      {% set privacy_notice = 'href="%s" data-cta-text="Privacy notice" data-cta-type="link"'|safe|format(url('privacy.notices.subscription-services')) %}
+      {% set privacy_principles = 'href="%s" data-cta-text="Privacy principles" '|safe|format(url('privacy.principles')) %}
+      {% set privacy_notice = 'href="%s" data-cta-text="Privacy notice" '|safe|format(url('privacy.notices.subscription-services')) %}
 
       <summary class="c-faq-item-heading">
         <h3>{{ ftl('vpn-pricing-what-information') }}</h3>
@@ -84,7 +84,7 @@ <h3>{{ ftl('vpn-pricing-what-information') }}</h3>
 
     <details id="faq-subscriptions" class="c-faq-item mzp-is-anchor-link">
 
-      {% set manage_url = 'href="%s" data-cta-text="Manage VPN" data-cta-type="link"'|safe|format(('https://vpn.mozilla.org/r/vpn/subscription' + _params)) %}
+      {% set manage_url = 'href="%s" data-cta-text="Manage VPN" '|safe|format(('https://vpn.mozilla.org/r/vpn/subscription' + _params)) %}
 
       <summary class="c-faq-item-heading">
         <h3>{{ ftl('vpn-pricing-how-do-i-manage') }}</h3>
diff --git a/bedrock/products/templates/products/vpn/pricing.html b/bedrock/products/templates/products/vpn/pricing.html
new file mode 100644
index 00000000000..5db4d4e483e
--- /dev/null
+++ b/bedrock/products/templates/products/vpn/pricing.html
@@ -0,0 +1,90 @@
+{#
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at https://mozilla.org/MPL/2.0/.
+#}
+
+{% from "products/vpn/includes/macros.html" import vpn_content_media with context %}
+
+{% extends "products/vpn/base.html" %}
+
+{% block page_title_full %}{{ ftl('vpn-landing-page-title') }}{% endblock %}
+{% block page_title_suffix %}{% endblock %}
+
+{% block page_desc %}{{ ftl('vpn-landing-page-desc', countries=available_countries) }}{% endblock %}
+
+{% block html_attrs %}{{ super() }} data-cj-affiliate-endpoint="{{ settings.CJMS_AFFILIATE_ENDPOINT }}"{% endblock %}
+
+{% block body_id %}mozilla-vpn-pricing{% endblock %}
+
+{% block canonical_urls %}<meta name="robots" content="noindex,follow">{% endblock %}
+
+{% set _utm_source = 'www.mozilla.org-vpn-product-page' %}
+{% set _utm_campaign = 'vpn-pricing-page' %}
+{% set _params = '?utm_source=' ~ _utm_source ~ '&utm_medium=referral&utm_campaign=' ~ _utm_campaign %}
+
+{% block page_css %}
+  {{ css_bundle('mozilla-vpn-pricing') }}
+{% endblock %}
+
+{% block site_header %}
+  {% with
+    hide_nav_download_button=True,
+    hide_nav_get_vpn_button=True
+  %}
+    {% include 'includes/protocol/navigation/navigation.html' %}
+  {% endwith %}
+{% endblock %}
+
+{% block content %}
+<main>
+  <div class="mzp-l-content mzp-t-content-xl">
+    <h1 class="mzp-c-wordmark mzp-t-wordmark-lg mzp-t-product-vpn">{{ ftl('vpn-shared-product-name') }}</h1>
+
+    {% if vpn_available %}
+      {% include 'products/vpn/includes/pricing-basic.html' %}
+    {% else %}
+      {% call vpn_content_media(
+        heading=ftl('vpn-shared-countries-coming-soon', countries=available_countries),
+        image=resp_img(
+          url='img/products/vpn/landing/vpn-cntwell-05-v2.png',
+          srcset={
+            'img/products/vpn/landing/vpn-cntwell-05-v2-high-res.png': '2x'
+          },
+          optional_attributes={
+            'width': '480',
+            'height': '480',
+            'loading': 'lazy'
+          }
+        ),
+        class_name='vpn-content-media-left-half vpn-more-countries-coming-soon'
+      ) %}
+
+        <a class="mzp-c-button mzp-t-xl" href="{{ url('products.vpn.invite') }}" data-cta-text="Join the VPN Waitlist">
+          {{ ftl('vpn-shared-waitlist-link') }}
+        </a>
+
+        <p class="availability-copy">
+          {{ ftl('vpn-shared-available-countries-v6') }}
+        </p>
+      {% endcall %}
+    {% endif %}
+  </div>
+
+  <footer class="vpn-footer mzp-l-content mzp-t-content-xl">
+    {% include 'products/vpn/includes/footer-legal.html' %}
+  </footer>
+
+</main>
+
+{% endblock %}
+
+{% block js %}
+  {% if vpn_affiliate_attribution_enabled %}
+    {{ js_bundle('mozilla-vpn-affiliate') }}
+  {% else %}
+    {{ js_bundle('fxa_product_button') }}
+  {% endif %}
+
+  {{ js_bundle('data_begincheckout') }}
+{% endblock %}
diff --git a/bedrock/products/templates/products/vpn/resource-center/base-article.html b/bedrock/products/templates/products/vpn/resource-center/base-article.html
index 79c9112965f..96bf2882c5a 100644
--- a/bedrock/products/templates/products/vpn/resource-center/base-article.html
+++ b/bedrock/products/templates/products/vpn/resource-center/base-article.html
@@ -55,13 +55,13 @@ <h2>{{ self.article_title() }}</h2>
     <div class="vpn-c-vote no-js">
       <h3>{{ ftl('vpn-resource-center-was-this-article') }}</h3>
       <div class="vpn-c-vote-btn-container">
-        <button type="button" data-cta-type="button" data-cta-text="{% block article_slug %}{% endblock %}" class="vpn-c-vote-btn up">
+        <button type="button" data-cta-text="{% block article_slug %}{% endblock %}" class="vpn-c-vote-btn up">
           <span>{{ ftl('vpn-resource-center-article-helpful') }}</span>
           <svg width="42" height="38" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
             <path d="M36.54 13.104h2.184A3.277 3.277 0 0 1 42 16.38v17.473a3.277 3.277 0 0 1-3.276 3.276H36.54a3.277 3.277 0 0 1-3.276-3.276V16.38a3.277 3.277 0 0 1 3.276-3.276ZM5.38 10.752c-3.669 0-6.261 3.595-5.1 7.076l4.48 13.44a5.375 5.375 0 0 0 5.1 3.677h19.036V15.238L24.19 8.063l-2.264-6.796A1.857 1.857 0 0 0 20.166 0h-.007a4.032 4.032 0 0 0-4.032 4.032v5.914l-.806.806H5.38Z" fill="currentColor"/>
           </svg>
         </button>
-        <button type="button" data-cta-type="button" data-cta-text="{{ self.article_slug() }}" class="vpn-c-vote-btn down">
+        <button type="button" data-cta-text="{{ self.article_slug() }}" class="vpn-c-vote-btn down">
           <span>{{ ftl('vpn-resource-center-article-not-helpful') }}</span>
           <svg width="42" height="38" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
             <path d="M5.46 24.024H3.276A3.277 3.277 0 0 1 0 20.748V3.276A3.277 3.277 0 0 1 3.276 0H5.46a3.277 3.277 0 0 1 3.276 3.276v17.472a3.277 3.277 0 0 1-3.276 3.276ZM36.62 26.377c3.67 0 6.262-3.595 5.1-7.077L37.24 5.86a5.375 5.375 0 0 0-5.1-3.676H13.106v19.707l4.704 7.174 2.265 6.797c.253.756.96 1.267 1.76 1.267h.007a4.032 4.032 0 0 0 4.031-4.032v-5.914l.806-.806h9.942Z" fill="currentColor"/>
diff --git a/bedrock/products/tests/test_helper_misc.py b/bedrock/products/tests/test_helper_misc.py
index ff957779811..7a8415168e8 100644
--- a/bedrock/products/tests/test_helper_misc.py
+++ b/bedrock/products/tests/test_helper_misc.py
@@ -1661,12 +1661,12 @@ def test_vpn_product_referral_link(self):
             page_anchor="#pricing",
             link_text="Get Mozilla VPN",
             class_name="mzp-t-product mzp-t-secondary mzp-t-md",
-            optional_attributes={"data-cta-text": "Get Mozilla VPN", "data-cta-type": "button"},
+            optional_attributes={"data-cta-text": "Get Mozilla VPN", "data-cta-type": "vpn"},
         )
         expected = (
             '<a href="/en-US/products/vpn/#pricing" class="mzp-c-button js-fxa-product-referral-link '
             'mzp-t-product mzp-t-secondary mzp-t-md" data-referral-id="navigation" '
-            'data-cta-text="Get Mozilla VPN" data-cta-type="button">Get Mozilla VPN</a>'
+            'data-cta-text="Get Mozilla VPN" data-cta-type="vpn">Get Mozilla VPN</a>'
         )
         self.assertEqual(markup, expected)
 
@@ -1677,12 +1677,12 @@ def test_vpn_product_referral_link_pricing_page(self):
             link_to_pricing_page=True,
             link_text="Get Mozilla VPN",
             class_name="mzp-t-product mzp-t-secondary mzp-t-md",
-            optional_attributes={"data-cta-text": "Get Mozilla VPN", "data-cta-type": "button"},
+            optional_attributes={"data-cta-text": "Get Mozilla VPN", "data-cta-type": "vpn"},
         )
         expected = (
             '<a href="/en-US/products/vpn/pricing/" class="mzp-c-button js-fxa-product-referral-link '
             'mzp-t-product mzp-t-secondary mzp-t-md" data-referral-id="navigation" '
-            'data-cta-text="Get Mozilla VPN" data-cta-type="button">Get Mozilla VPN</a>'
+            'data-cta-text="Get Mozilla VPN" data-cta-type="vpn">Get Mozilla VPN</a>'
         )
         self.assertEqual(markup, expected)
 
@@ -1693,12 +1693,12 @@ def test_vpn_product_referral_link_optional_params(self):
             link_to_pricing_page=True,
             link_text="Get Mozilla VPN",
             class_name="mzp-t-product mzp-t-secondary mzp-t-md",
-            optional_attributes={"data-cta-text": "Get Mozilla VPN", "data-cta-type": "button"},
+            optional_attributes={"data-cta-text": "Get Mozilla VPN", "data-cta-type": "vpn"},
             optional_parameters={"coupon": "cyber20"},
         )
         expected = (
             '<a href="/en-US/products/vpn/pricing/?coupon=cyber20" class="mzp-c-button js-fxa-product-referral-link '
             'mzp-t-product mzp-t-secondary mzp-t-md" data-referral-id="navigation" '
-            'data-cta-text="Get Mozilla VPN" data-cta-type="button">Get Mozilla VPN</a>'
+            'data-cta-text="Get Mozilla VPN" data-cta-type="vpn">Get Mozilla VPN</a>'
         )
         self.assertEqual(markup, expected)
diff --git a/docs/abtest.rst b/docs/abtest.rst
index 26a86479435..350575da0f6 100644
--- a/docs/abtest.rst
+++ b/docs/abtest.rst
@@ -93,18 +93,15 @@ Recording the data
 
     If you are measuring installs as part of your experiment be sure to configure `custom stub attribution <https://bedrock.readthedocs.io/en/latest/firefox-stub-attribution.html#measuring-campaigns-and-experiments>`_ as well.
 
-Including the ``data-ex-variant`` and ``data-ex-name`` in the analytics
-reporting will add the test to an auto generated report in :abbr:`GA (Google Analytics)`.
-The variable values may be provided by the analytics team.
+Send the experiment view events to GA4 with the event name ``experiment_view``. The ``id`` of all variants should be the same
+and all ``variant`` values should be unique.
+
+Make sure any buttons and interaction which are being compared as part of the
+test will report into :abbr:`GA (Google Analytics)`.
 
 .. code-block:: javascript
 
     if (href.indexOf('v=a') !== -1) {
-        // UA
-        window.dataLayer.push({
-            'data-ex-variant': 'de-page',
-            'data-ex-name': 'Berlin-Campaign-Landing-Page'
-        });
         // GA4
         window.dataLayer.push({
             event: 'experiment_view',
@@ -112,11 +109,6 @@ The variable values may be provided by the analytics team.
             variant: 'de-page',
         });
     } else if (href.indexOf('v=b') !== -1) {
-        // UA
-        window.dataLayer.push({
-            'data-ex-variant': 'campaign-page',
-            'data-ex-name': 'Berlin-Campaign-Landing-Page'
-        });
         // GA4
         window.dataLayer.push({
             event: 'experiment_view',
@@ -125,21 +117,11 @@ The variable values may be provided by the analytics team.
         });
     }
 
-Make sure any buttons and interaction which are being compared as part of the
-test will report into :abbr:`GA (Google Analytics)`.
 
 Viewing the data
 ~~~~~~~~~~~~~~~~~~
 
-The ``data-ex-name`` and ``data-ex-variant`` are encoded in Google Analytics as custom dimensions 69 and 70.
-
-Create a custom report.
-
-Set the "Metrics Group" to include Sessions. Configure additional metrics depending on what the experiment was measuring (downloads, events, etc.)
-
-Set the "Dimension Drilldowns to have cd69 in the top position and cd70 in the drilldown position.
-
-View the custom report and drilldown into the experiment with the matching name.
+We have not figured this out for GA4 yet.
 
 Tests
 ~~~~~
@@ -153,16 +135,6 @@ Some things to consider checking:
 - Requests for a variant page call the correct template.
 - Locales excluded from the test call the correct (default) template.
 
-A/B Test PRs that might have useful code to reuse
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-- https://github.com/mozilla/bedrock/pull/5736/files
-- https://github.com/mozilla/bedrock/pull/4645/files
-- https://github.com/mozilla/bedrock/pull/5925/files
-- https://github.com/mozilla/bedrock/pull/5443/files
-- https://github.com/mozilla/bedrock/pull/5492/files
-- https://github.com/mozilla/bedrock/pull/5499/files
-
 Avoiding experiment collisions
 ------------------------------
 
diff --git a/docs/attribution/0001-analytics.rst b/docs/attribution/0001-analytics.rst
index 3103b43f706..8d04b16c621 100644
--- a/docs/attribution/0001-analytics.rst
+++ b/docs/attribution/0001-analytics.rst
@@ -8,273 +8,228 @@
 Mozorg analytics
 =================
 
-Google Tag Manager (GTM)
-************************
+Google Analytics
+****************
 
-In mozorg mode, bedrock uses `Google Tag Manager (GTM)`_ to manage and organize
-its `Google Analytics`_ solution.
+We use Google Analytics (GA) to track how our website is used.
 
-:abbr:`GTM (Google Tag Manager)` is a tag management system that allows for
-easy implementation of Google Analytics (GA) tags and other 3rd party marketing
-tags in a nice :abbr:`GUI (Graphical User Interface)` experience. Tags can be
-added, updated, or removed directly from the GUI. GTM allows for a "one
-source of truth" approach to managing an analytics solution in that all
-analytics tracking can be inside GTM.
+*Implementation*
 
-Bedrock's GTM solution is :abbr:`CSP (Content Security Policy)` compliant and
-does not allow for the injection of custom HTML or JavaScript but all tags use
-built in templates to minimize any chance of introducing a bug into Bedrock.
+Google calls a 3rd party JavaScript library that is imported by adding a script tag to a website,
+Google names these "tags".
 
-The GTM DataLayer
------------------
+We include the tag for Google Tag Manager (GTM) on our website. GTM is a service meant to simplify and centralize
+the tags included on a website in cases where multiple tags are needed. Their web-based user interface can then be
+used to watch for user actions on the website and then trigger events to be sent to tags.
 
-How an application communicates with GTM is via the ``dataLayer`` object, which
-is  a simple JavaScript array GTM instantiates on the page. Bedrock will send
-messages to the ``dataLayer`` object by means of pushing an object literal onto
-the ``dataLayer``. GTM creates an abstract data model from these pushed objects
-that consists of the most recent value for all keys that have been pushed to
-the ``dataLayer``.
+We do no not use any of GTM's most powerful features. Our use of GTM is a historical artifact of our
+Universal Analytics (UA) (aka GA3) implementation. GTM is a tool to let non-technical users add code to a website, however,
+there is no one outside of the websites team who is trained to do that.
 
-The only reserved key in an object pushed to the ``dataLayer`` is ``event`` which
-will cause GTM to evaluate the firing conditions for all tag triggers.
+The only tag we include with GTM is the Google Tag (GTag), and that in turn connects to our Google Analytics (GA) account.
 
-DataLayer push example
-----------------------
+There are three ways we send events from our site to GA:
 
-If we wanted to track clicks on a carousel and capture what the image was that
-was clicked, we might write a dataLayer push like this:
+1. Google's Enhanced Event Measurement logs certain events automatically.
+2. GTM watches elements with specific data-attributes for user interaction
+3. Bedrock watches for specific events, formats them, and sends them to GTM using the dataLayer
 
-.. code-block:: javascript
+*Implementation Principles*
 
-    dataLayer.push({
-        'event': 'carousel-click',
-        'image': 'house'
-    });
+The current implementation tries very hard to keep any kind of logic and formatting of our events in bedrock where it can be
+tested, code reviewed, and version controlled.
 
-In the dataLayer push there is an event value to have GTM evaluate the firing
-conditions for tag triggers, making it possible to fire a tag off the dataLayer
-push. The event value is descriptive to the user action so it's clear to someone
-coming in later what the dataLayer push signifies. There is also an image property
-to capture the image that is clicked, in this example it's the house picture.
+Many user interactions will trigger multiple events. For example: clicking the "get subscription" button on the VPN page will
+trigger ``link``, ``cta_click``, and ``begin_checkout`` events. This is totally fine.
 
-In GTM, a tag could be setup to fire when the event ``carousel-click`` is pushed
-to the dataLayer and could consume the image value to pass on what image was clicked.
+If you're creating a new event use the two word noun_verb scheme that Google came up with and use snake_case,
+even if one of your noun or verb is more than one word.
 
-The Core DataLayer object
--------------------------
+*Debugging*
 
-For the passing of contextual data on the user and page to GTM, we've created what we
-call the Core DataLayer Object. This object passes as soon as all required API calls
-for contextual data have completed. Unless there is a significant delay to when data
-will be available, please pass all contextual or meta data on the user or page here
-that you want to make available to GTM.
+- GTM is managed with Tag Manager https://tagmanager.google.com/
+- Our gTag is also managed with Tag Manager https://tagmanager.google.com/#/home#tags
+- GA, GTM, and gTag can be debugged using Tag Assistant https://tagassistant.google.com/
+- GA also has a debug view https://support.google.com/analytics/answer/7201382?hl=en
 
 
-Conditional banners
-~~~~~~~~~~~~~~~~~~~
+How can visitors opt out of GA?
+-------------------------------
 
-When a banner is shown:
+Visitors to the website can opt-out of loading Google Analytics on our
+website by enabling `Do Not Track (DNT)`_ in their web browser. We
+facilitate this by using a `DNT helper`_ that our team maintains. We
+also respect `Global Privacy Control (GPC)`_ as an additional opt-out
+signal.
 
-.. code-block:: javascript
+Alternatively, visitors can also opt-out of GA by visiting the
+`cookie settings page`_, which is linked to in the main site
+footer on every page.
 
-    // UA
-    window.dataLayer.push({
-        'eLabel': 'Banner Impression',
-        'data-banner-name': '<banner name>', //ex. Fb-Video-Compat
-        'data-banner-impression': '1',
-        'event': 'non-interaction'
-    });
-    // GA4
-    window.dataLayer.push({
-        event: 'widget_action',
-        type: 'banner',
-        action: 'display',
-        name: '<banner name>', //ex. Fb-Video-Compat
-        non_interaction: true
-    });
+Event Tracking
+--------------
 
-When an element in the banner is clicked:
+Enhanced Event Measurement
+~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. code-block:: javascript
+Pageviews, scrolls, video events, and outbound link clicks are being collected using GA4's `enhanced event measurement`_.
 
-    // UA
-    window.dataLayer.push({
-        'eLabel': 'Banner Click (OK)',
-        'data-banner-name': '<banner name>', //ex. Fb-Video-Compat
-        'data-banner-click': '1',
-        'event': 'in-page-interaction'
-    });
-    // GA4
-    window.dataLayer.push({
-        event: 'widget_action',
-        type: 'banner',
-        action: 'clickthrough',
-        name: '<banner name>', //ex. Fb-Video-Compat
-    });
+Some form submissions are also being collected but newsletter signups are not `(see bug #13348)`_ . They are instead
+being tracked with the ``newsletter_subscribe`` event.
 
-When a banner is dismissed:
+See the full list of events GA collects by default. https://support.google.com/analytics/answer/9216061
 
-.. code-block:: javascript
+Data Attributes
+~~~~~~~~~~~~~~~
 
-    // UA
-    dataLayer.push({
-        'eLabel': 'Banner Dismissal',
-        'data-banner-name': '<banner name>', //ex. Fb-Video-Compat
-        'data-banner-dismissal': '1',
-        'event': 'in-page-interaction'
-    });
-    // GA4
-    window.dataLayer.push({
-        event: 'widget_action',
-        type: 'banner',
-        action: 'dismiss',
-        name: '<banner name>' //ex. Fb-Video-Compat
-    });
+One place where we do still rely on GTM to watch for an trigger events is when we use data-attributes to pass
+information. There are only two events we do this with and they are primarily used on buttons and links.
 
 
-A/B tests
-~~~~~~~~~
+CTA Click
+"""""""""
 
-.. code-block:: javascript
+CTA ("Call to Action") click is intented to track the one or two main actions the page is designed to get the user
+to do. This data-attribute can be used on either ``<button>`` or ``<a>``. Links can go to or away from the site,
+a button might trigger a JS function instead of going away from the page, that's still a cta.
 
-    if (href.indexOf('v=a') !== -1) {
-        // UA
-        window.dataLayer.push({
-            'data-ex-variant': 'de-page',
-            'data-ex-name': 'Berlin-Campaign-Landing-Page'
-        });
-        // GA4
-        window.dataLayer.push({
-            event: 'experiment_view',
-            id: 'Berlin-Campaign-Landing-Page',
-            variant: 'de-page',
-        });
-    } else if (href.indexOf('v=b') !== -1) {
-        // UA
-        window.dataLayer.push({
-            'data-ex-variant': 'campaign-page',
-            'data-ex-name': 'Berlin-Campaign-Landing-Page'
-        });
-        // GA4
-        window.dataLayer.push({
-            event: 'experiment_view',
-            id: 'Berlin-Campaign-Landing-Page',
-            variant: 'campaign-page',
-        });
-    }
+The attribute ``data-cta-text`` must be present to trigger the event. All links to accounts.mozilla.com must also use ``data-cta-type``.
 
-GTM listeners & data attributes
--------------------------------
++-----------------------+----------------------------------------------------------------------------------+
+| Data Attribute        | Expected Value                                                                   |
++=======================+==================================================================================+
+| ``data-cta-text`` *   | Text or name of the link (e.g. ``Sign Up``, ``Start Here``, ``Get Relay``,       |
+|                       | ``See your report``, ``Read the Manifesto``).                                    |
+|                       |                                                                                  |
+|                       | - This does not need to exactly match the text displayed to the user             |
+|                       | - Defining this is useful to group the link clicks across locales                |
+|                       | - * this attribute is required                                                   |
++-----------------------+----------------------------------------------------------------------------------+
+| ``data-cta-position`` | Location of CTA on the page (e.g. ``primary``, ``secondary``, ``banner``,        |
+|                       | ``pricing``)                                                                     |
++-----------------------+----------------------------------------------------------------------------------+
+| ``data-cta-type``     | fxa-servicename (e.g. ``fxa-sync``, ``fxa-monitor``, ``fxa-vpn``, ``monitor``,   |
+|                       | ``relay``, ``pocket``)                                                           |
+|                       |                                                                                  |
+|                       | - This is to group CTAs by their destination                                     |
+|                       | - Do not use this to identify the element (ie. link, button)                     |
++-----------------------+----------------------------------------------------------------------------------+
 
-GTM also uses click and form submit listeners to gather context on what is happening
-on the page. Listeners push to the dataLayer data on the specific element that
-triggered the event, along with the element object itself.
 
-Since GTM listeners pass the interacted element object to the dataLayer, the use of
-data attributes works very well when trying to identify key elements that you want to
-be tracked and for storing data on that element to be passed into Google Analytics. We
-use data attributes to track clicks on all downloads, buttons elements, and nav, footer,
-and :abbr:`CTA (Call To Action)`/button link elements.
 
-.. Important::
+.. code-block:: html
+
+    <a href="https://monitor.firefox.com/" data-cta-text="Check for breaches" data-cta-type="fxa-monitor">Check for breaches</a>
+
+    <a href="{{ url('firefox.browsers.mobile.get-app') }}" data-cta-text="Send Link for Firefox Mobile" data-cta-position="banner">Send me a link</a>
 
-    When adding any new elements to a Bedrock page, please follow the below guidelines
-    to ensure accurate analytics tracking.
+    <a href="{{ url('firefox.browsers.mobile.ios') }}" data-cta-text="Firefox for iOS">Firefox for iOS</a>
 
-Generic CTAs
-~~~~~~~~~~~~
 
-For all generic CTA links and ``<button>`` elements, add these data attributes
-(* indicates a required attribute):
+Link Click
+""""""""""
 
-+-----------------------+---------------------------------------------------------------------------+
-| Data Attribute        | Expected Value (lowercase)                                                |
-+=======================+===========================================================================+
-| ``data-cta-type`` *   | Link type (e.g. ``navigation``, ``footer``, or ``button``)                |
-+-----------------------+---------------------------------------------------------------------------+
-| ``data-cta-text``     | name or text of the link                                                  |
-+-----------------------+---------------------------------------------------------------------------+
-| ``data-cta-position`` | Location of CTA on the page (e.g. ``primary``, ``secondary``, ``header``) |
-+-----------------------+---------------------------------------------------------------------------+
+Link click is intended to track links that are of interest but not the focus of the page. Examples include links in paragraphs,
+lists, FAQs, supplemental content, or in a navigation menu. Links can go to or away from the site.
 
-For all links to accounts.firefox.com use these data attributes (* indicates a required attribute):
+The attribute ``data-link-text`` must be present to trigger the event.
 
-+-----------------------+----------------------------------------------------------------------------------+
-| Data Attribute        | Expected Value                                                                   |
-+=======================+==================================================================================+
-| ``data-cta-type`` *   | fxa-servicename (e.g. ``fxa-sync``, ``fxa-monitor``)                             |
-+-----------------------+----------------------------------------------------------------------------------+
-| ``data-cta-text``     | Name or text of the link (e.g. ``Sign Up``, ``Join Now``, ``Start Here``).       |
-|                       |                                                                                  |
-|                       | We use this when the link text is not useful, as is the case with many           |
-|                       | account forms that say, ``Continue``. We replace ``Continue`` with ``Register``. |
-+-----------------------+----------------------------------------------------------------------------------+
-| ``data-cta-position`` | Location of CTA on the page (e.g. ``primary``, ``secondary``, ``header``)        |
-+-----------------------+----------------------------------------------------------------------------------+
++-----------------------+------------------------------------------------------------------------------------------------+
+| Data Attribute        | Expected Value                                                                                 |
++=======================+================================================================================================+
+| ``data-link-text`` *  | Text or name of the link (e.g. ``Monitor``, ``Features``, ``Instagram (mozilla)``,             |
+|                       | ``Mozilla VPN``).                                                                              |
+|                       | - * this attribute is required                                                                 |
++-----------------------+------------------------------------------------------------------------------------------------+
+| ``data-link-position``| Location of CTA on the page (e.g. ``topnav``, ``subnav``, ``body``, ``features``)              |
++-----------------------+------------------------------------------------------------------------------------------------+
 
-Links identified with ``data-cta-type`` become UA events with the following format:
+.. code-block:: html
 
-| **Category:** ``cta click``
-| **Action:** ``cta: {{data-cta-type}}``
-| **Label:** ``{{data-cta-text}}``
-| **CD Index 9 - CTA Position:** ``{{data-cta-position}}``
+    <p>This is text with a <a href="#" data-link-text="simple">simple</a>example.</p>
 
+    <li><a href="{{ url('firefox.features.pdf-editor') }}" data-link-text="Edit PDFs">Edit PDFs</a> on the go within your Firefox browser window.</li>
 
-Download Links
-~~~~~~~~~~~~~~
 
-For Firefox download buttons, add these data attributes (* indicates a required attribute).
-Note that ``data-download-name`` and ``data-download-version`` should be included for download
-buttons that serve multiple platforms. For mobile specific store badges, they are not strictly
-required.
+Link click is also commonly used for navigation menus. If you wish to indicate that a link is nested you can include the categories
+seperated by a dash (``topnav - firefox``, ``footer - company``)
 
-+----------------------------+-------------------------------------------------------------------------------------------------------------+
-| Data Attribute             | Expected Value                                                                                              |
-+============================+=============================================================================================================+
-| ``data-link-type`` *       | ``download``                                                                                                |
-+----------------------------+-------------------------------------------------------------------------------------------------------------+
-| ``data-download-os`` *     | ``Desktop``, ``Android``, ``iOS``                                                                           |
-+----------------------------+-------------------------------------------------------------------------------------------------------------+
-| ``data-download-name``     | ``Windows 32-bit``, ``Windows 64-bit``, ``macOS``, ``Linux 32-bit``, ``Linux 64-bit``, ``iOS``, ``Android`` |
-+----------------------------+-------------------------------------------------------------------------------------------------------------+
-| ``data-download-version``  | ``win``, ``win64``, ``osx``, ``linux``, ``linux64``, ``ios``, ``android``                                   |
-+----------------------------+-------------------------------------------------------------------------------------------------------------+
-| ``data-download-location`` | ``primary``, ``secondary``, ``nav``, ``other``                                                              |
-+----------------------------+-------------------------------------------------------------------------------------------------------------+
+.. code-block:: html
 
+    <li><a href="{{ url('firefox.developer.index') }}" data-link-text="Firefox Developer Edition" data-link-position="footer">{{ ftl('footer-developer-edition') }}</a></li>
 
-GA4
----
+    <li><a href="{{ url('firefox.browsers.mobile.android') }}" data-link-text="Firefox for Android" data-link-position="topnav - firefox"></li>
 
-.. Note::
 
-    The migration to GA4 has begun but is incomplete.
+Data Layer Events
+~~~~~~~~~~~~~~~~~
 
-Enhanced Event Measurement
-~~~~~~~~~~~~~~~~~~~~~~~~~~
+The data layer is a JS object we can push events to and GTM will read from it.
+
+.. code-block:: js
+
+    window.dataLayer.push({'event': 'event_name'});
 
-Pageviews, video events, and external link clicks are being collected using GA4's
-`enhanced event measurement`_.
+We push a mix of recommended events and custom events to the data layer. When creating a new custom event please follow the
+Implementation Principles outlined above. Remember, both GTM and GA must be configured to recieve new events.
 
-Some form submissions are also being collected but newsletter signups are not.
-`(See Bug #13348)`_
+https://developers.google.com/analytics/devguides/collection/ga4/reference/events?client_type=gtag#begin_checkout
+
+https://mozilla-hub.atlassian.net/wiki/spaces/EN/pages/430866463/GA4+Custom+Events
+
+https://developers.google.com/tag-platform/tag-manager/datalayer
+
+
+Events that bedrock will send to GTM include:
+
+- begin_checkout
+- cta_click
+- default_browser_set
+- dimension_set
+- experiment_view
+- link_click
+- newsletter_subscribe
+- product_download (firefox_download, firefox_mobile_download, etc)
+- send_to_device
+- social_share
+- stub_session_set
+- widget_action
 
 
 Begin Checkout
-~~~~~~~~~~~~~~
+""""""""""""""
 
-We are using GA4's recommended eCommerce event `begin_checkout`_ for VPN and Relay
-referrals to the FxA Subscription Platform with purchase intent.
+We are using GA4's recommended eCommerce event `begin_checkout`_ for VPN referrals to the FxA Subscription Platform with purchase intent.
+This event can accept values for other products but we are not currently using it for anything other than VPN.
 
 .. Note::
 
     Any link to Mozilla accounts should also be using :ref:`mozilla accounts attribution<mozilla-accounts-attribution>`
 
 
-``datalayer-begincheckout.es6.js`` contains generic functions
-that can be called on to push the appropriate information to the dataLayer. The
+``datalayer-begincheckout.es6.js`` contains generic functions that can be called on to push the appropriate information to the dataLayer. The
 script is expecting the following values:
 
+
++---------------+----------------------------------------------------------------------------------+
+| Property      | Value                                                                            |
++===============+==================================================================================+
+| ``item_id``   | Text or name of the link (e.g. ``Sign Up``, ``Join Now``, ``Start Here``).       |
++---------------+----------------------------------------------------------------------------------+
+| ``brand``     | fxa-servicename (e.g. ``fxa-sync``, ``fxa-monitor``)                             |
++---------------+----------------------------------------------------------------------------------+
+| ``plan``      | Location of CTA on the page (e.g. ``primary``, ``secondary``, ``header``)        |
++---------------+----------------------------------------------------------------------------------+
+| ``period``    | Location of CTA on the page (e.g. ``primary``, ``secondary``, ``header``)        |
++---------------+----------------------------------------------------------------------------------+
+| ``price``     | Location of CTA on the page (e.g. ``primary``, ``secondary``, ``header``)        |
++---------------+----------------------------------------------------------------------------------+
+| ``currency``  | Location of CTA on the page (e.g. ``primary``, ``secondary``, ``header``)        |
++---------------+----------------------------------------------------------------------------------+
+| ``discount``  | Location of CTA on the page (e.g. ``primary``, ``secondary``, ``header``)        |
++---------------+----------------------------------------------------------------------------------+
+
+
 - item_id: Stripe Plan ID
 - brand: ``relay``, ``vpn``, or ``monitor``
 - plan:
@@ -327,64 +282,26 @@ To use this method you will need to include ``datalayer-begincheckout-init.es6.j
     </a>
 
 
-CTA Click
-~~~~~~~~~
-
-Like our UA implementation (documented above) the implementation of ``cta_click`` for GA4 is based of
-the existence of certain data-attributes on an element.
-
-`data-cta-text` must be present to trigger the event:
-
-- data-cta-text
-  - Defining this is useful to group the link clicks across locales
-  - The value does not need to exactly match the text
-  - Provide something more useful than "click here" or "learn more". If that is the copy you were provided consider asking for copy that is more useful to the users too!
-- data-cta-position (examples: banner, pricing, primary, secondary)
-- data-cta-type (examples: fxa-sync, fxa-monitor, fxa-vpn, monitor, relay, pocket)
-  - This is to group CTAs by their destination
-  - Do not use this to identify the element (ie. link, button)
-
-
-.. code-block:: html
-
-    <a href="https://monitor.firefox.com/" data-cta-text="Check for breaches" data-cta-type="fxa-monitor">Check for breaches</a>
-
-    <a href="{{ url('firefox.browsers.mobile.get-app') }}" data-cta-text="Send Link for Firefox Mobile" data-cta-position="banner">Send me a link</a>
-
-    <a href="{{ url('firefox.browsers.mobile.ios') }}" data-cta-text="Firefox for iOS">Firefox for iOS</a>
-
 
-For all links to accounts.firefox.com use these data attributes (* indicates a required attribute):
-
-+-----------------------+----------------------------------------------------------------------------------+
-| Data Attribute        | Expected Value                                                                   |
-+=======================+==================================================================================+
-| ``data-cta-text`` *   | Text or name of the link (e.g. ``Sign Up``, ``Join Now``, ``Start Here``).       |
-+-----------------------+----------------------------------------------------------------------------------+
-| ``data-cta-type`` *   | fxa-servicename (e.g. ``fxa-sync``, ``fxa-monitor``)                             |
-+-----------------------+----------------------------------------------------------------------------------+
-| ``data-cta-position`` | Location of CTA on the page (e.g. ``primary``, ``secondary``, ``header``)        |
-+-----------------------+----------------------------------------------------------------------------------+
+Default Browser
+"""""""""""""""
 
+Trigger this event when a user sets their default browser to Firefox. It's an important conversion for us!
 
-Link Click
-~~~~~~~~~~
+.. code-block:: javascript
 
-Our implementation of ``link_click`` for GA4 is based of the existence of certain data-attributes on a
-link element.
+    window.dataLayer.push({
+        event: 'default_browser_set',
+    });
 
-`data-link-text` must be present to trigger the event:
 
-- data-link-text (examples: “Monitor”, “Features”, “Instagram (mozilla)”, “Mozilla VPN”)
-- data-link-position (examples: topnav, subnav, topnav - firefox, footer - company)
 
-```
-<a href="" data-link-text=""></a>
-```
+Newsletter Subscribe
+""""""""""""""""""""
 
 
 Product Downloads
-~~~~~~~~~~~~~~~~~
+"""""""""""""""""
 
 .. Important::
 
@@ -402,10 +319,6 @@ talked about as `product_download` :
 - `klar_download`
 - `pocket_download`
 
-We are not using the default GA4 event file_download for a combination of reasons:
-it does not trigger for the Firefox file types, we would like to collect more information than is included with
-the default events, and we would like to treat product downloads as goals but not all file downloads are goals.
-
 Properties for use with `product_download` (not all products will have all options):
 
 - product (one of: firefox, firefox_mobile, focus, klar, pocket, vpn)
@@ -450,8 +363,28 @@ get and send the event object manually. This most often happens with adjust link
     TrackProductDownload.sendEvent(customEventObject);
 
 
+.. Note::
+
+    Calling TrackProductDownload will also fire an event named `product_download` so two events are being logged for each product download.
+    This is because prior to Feb 2024 we only used one unified product download event and did not have the individual product download
+    events yet. The split events are considered easier to deal with for reporting purposes inside GA4. Some data science dashboards
+    use `product_download` because it has existed longer. Ideally, we will remove it some day.
+
+
+Send to Device
+""""""""""""""
+
+Social Share
+""""""""""""
+
+
+Stub Session Set
+""""""""""""""""
+
+
+
 Widget Action
-~~~~~~~~~~~~~
+"""""""""""""
 
 We are using the custom event ``widget_action`` to track the behaviour of javascript widgets.
 
@@ -480,7 +413,7 @@ We are using the custom event ``widget_action`` to track the behaviour of javasc
 +-------------------------------------------------+-------------------------------------------------+
 
 
-Properties for use with `widget_action`  (not all widgets will use all options):
+Properties for use with `widget_action` (not all widgets will use all options):
 
 - type
     - **Required.**
@@ -492,16 +425,15 @@ Properties for use with `widget_action`  (not all widgets will use all options):
     - The thing that happened.
     - Examples: "open", "accept", "timeout", "vote up".
     - *Avoid “click”. If you want to track a click use `cta_click`.*
-- name
-    - Give the widget a name.
-    - This can help you group actions from the same widget, or make it easier to find
-      the widget in the reports.
-    - The dashes are not required but they're allowed if you want to match the element
-      class or ID.
-    - Examples: "dad-joke-banner", "focus-qr-code", "Join Firefox Modal"
 - text
     - How is this action labeled to the user?
     - Examples: "Okay", "Check your protection report", "Get the app"
+- name
+    - Give the widget a name.
+    - You probably only need this optional attribute if the `text` value is not enough to tell the widgets apart.
+    - This can help you group actions from the same widget, or make it easier to find the widget in the reports.
+    - The dashes are not required but they're allowed if you want to match the element class or ID.
+    - Examples: "dad-joke-banner", "focus-qr-code", "Join Firefox Modal"
 - non_interaction (boolean)
     - True if the action was triggered by something other than a user gesture.
     - If it's not included we assume the value is *false*
@@ -541,20 +473,10 @@ To use ``widget_action`` push your event to the ``dataLayer``:
         text: 'Where is Relay available?'
     });
 
-Default Browser
-~~~~~~~~~~~~~~~
-
-Trigger this event when a user sets their default browser to Firefox. It's an important conversion for us!
-
-.. code-block:: javascript
-
-    window.dataLayer.push({
-        event: 'default_browser_set',
-    });
 
 
-User Scoped Custom Dimensions
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Dimension Set
+"""""""""""""
 
 When using GA4 through GTM there isn’t a way to set user scoped custom dimensions without an accompanying event.
 The custom event we use for this is `dimension_set`.
@@ -572,18 +494,6 @@ User scoped custom dimensions must be configured in GA4. The list of supported c
 - `firefox_is_signed_in` (boolean)
 
 
-How can visitors opt out of GA?
--------------------------------
-
-Visitors to the website can opt-out of loading Google Analytics on our
-website by enabling `Do Not Track (DNT)`_ in their web browser. We
-facilitate this by using a `DNT helper`_ that our team maintains. We
-also respect `Global Privacy Control (GPC)`_ as an additional opt-out
-signal.
-
-Alternatively, visitors can also opt-out of GA by visiting the
-`cookie settings page`_, which is linked to in the main site
-footer on every page.
 
 Glean
 *****
diff --git a/docs/attribution/0002-firefox-desktop.rst b/docs/attribution/0002-firefox-desktop.rst
index 387ff6ed9d0..8f1b6c26434 100644
--- a/docs/attribution/0002-firefox-desktop.rst
+++ b/docs/attribution/0002-firefox-desktop.rst
@@ -66,6 +66,10 @@ of the steps below (Mozilla access only).
 #. During analysis, the download token can be used to join Telemetry data
    with the corresponding GA data in the server logs.
 
+.. Note::
+
+   The stub attribution script uses the attribute ``data-download-version`` to identify what links are download links.
+
 Attribution data
 ----------------
 
diff --git a/docs/attribution/0004-mozilla-accounts.rst b/docs/attribution/0004-mozilla-accounts.rst
index efb8e93d6e8..efd8eadb028 100644
--- a/docs/attribution/0004-mozilla-accounts.rst
+++ b/docs/attribution/0004-mozilla-accounts.rst
@@ -169,7 +169,7 @@ The helper supports the following parameters:
 +--------------------------+--------------------------------------------------------------------------------------------------+-----------------------------------+----------------------------------------------------------------------------------------------------+
 | ``page_anchor``          | An optional page anchor for the link destination.                                                | String                            | '#pricing'                                                                                         |
 +--------------------------+--------------------------------------------------------------------------------------------------+-----------------------------------+----------------------------------------------------------------------------------------------------+
-| ``optional_attributes``  | An dictionary of key value pairs containing additional data attributes to include in the button. | Dictionary                        | {'data-cta-text': 'Get Mozilla VPN', 'data-cta-type': 'button', 'data-cta-position': 'navigation'} |
+| ``optional_attributes``  | An dictionary of key value pairs containing additional data attributes to include in the button. | Dictionary                        | {'data-cta-text': 'Get Mozilla VPN', 'data-cta-type': 'vpn', 'data-cta-position': 'navigation'}    |
 +--------------------------+--------------------------------------------------------------------------------------------------+-----------------------------------+----------------------------------------------------------------------------------------------------+
 
 The cookie has the following configuration:
diff --git a/docs/l10n.rst b/docs/l10n.rst
index 331ad2d2063..910fd95183f 100644
--- a/docs/l10n.rst
+++ b/docs/l10n.rst
@@ -212,7 +212,7 @@ attributes but we do occasionally pass classes with other tags.)
 
 .. code-block:: jinja
 
-    {% set created_attrs = 'href="%s" data-cta-type="link" data-cta-text="created by Mozilla"'|safe|format(url('mozorg.about.index')) %}
+    {% set created_attrs = 'href="%s" data-cta-text="created by Mozilla"'|safe|format(url('mozorg.about.index')) %}
     <p>{{ ftl('example-created', attrs=created_attrs) }}</p>
 
     {{ ftl('example-firefox-relay', class_name='class="mzp-c-wordmark mzp-t-wordmark-md mzp-t-product-relay"') }}
diff --git a/docs/mozilla-accounts.rst b/docs/mozilla-accounts.rst
index 0c0303953df..ba45af9cb79 100644
--- a/docs/mozilla-accounts.rst
+++ b/docs/mozilla-accounts.rst
@@ -200,7 +200,7 @@ all support the same standard parameters:
 +---------------------+-------------------------------------------------------------------------------------------------------------------------------+-----------------------------------+--------------------------------------------------------------------------------------------------------+
 | optional_parameters | An dictionary of key value pairs containing additional parameters to append the the href.                                     | Dictionary                        | {'s': 'ffpocket'}                                                                                      |
 +---------------------+-------------------------------------------------------------------------------------------------------------------------------+-----------------------------------+--------------------------------------------------------------------------------------------------------+
-| optional_attributes | An dictionary of key value pairs containing additional data attributes to include in the button.                              | Dictionary                        | {'data-cta-text': 'Try Pocket Now', 'data-cta-type': 'activate pocket','data-cta-position': 'primary'} |
+| optional_attributes | An dictionary of key value pairs containing additional data attributes to include in the button.                              | Dictionary                        | {'data-cta-text': 'Try Pocket Now', 'data-cta-type': 'pocket','data-cta-position': 'primary'}          |
 +---------------------+-------------------------------------------------------------------------------------------------------------------------------+-----------------------------------+--------------------------------------------------------------------------------------------------------+
 
 .. Note::
diff --git a/media/js/base/banners/mozilla-banner.es6.js b/media/js/base/banners/mozilla-banner.es6.js
index c8a6394566e..8e386a3bbc6 100644
--- a/media/js/base/banners/mozilla-banner.es6.js
+++ b/media/js/base/banners/mozilla-banner.es6.js
@@ -62,13 +62,6 @@ MozBanner.close = function () {
     // Set a cookie to not display it again.
     MozBanner.setCookie(MozBanner.id);
 
-    // UA
-    window.dataLayer.push({
-        event: 'in-page-interaction',
-        eLabel: 'Banner Dismissal',
-        'data-banner-name': MozBanner.id,
-        'data-banner-dismissal': '1'
-    });
     // GA4
     window.dataLayer.push({
         event: 'widget_action',
diff --git a/media/js/base/protocol/init-lang-switcher.es6.js b/media/js/base/protocol/init-lang-switcher.es6.js
index 04722bb42a1..c4759449522 100644
--- a/media/js/base/protocol/init-lang-switcher.es6.js
+++ b/media/js/base/protocol/init-lang-switcher.es6.js
@@ -10,12 +10,6 @@
 import MzpLangSwitcher from '@mozilla-protocol/core/protocol/js/lang-switcher';
 
 MzpLangSwitcher.init(function (previousLanguage, newLanguage) {
-    // UA
-    window.dataLayer.push({
-        event: 'change-language',
-        languageSelected: newLanguage,
-        previousLanguage: previousLanguage
-    });
     //GA4
     window.dataLayer.push({
         event: 'widget_action',
diff --git a/media/js/base/send-to-device.es6.js b/media/js/base/send-to-device.es6.js
index 0c7dcaa708d..0002eef4c58 100644
--- a/media/js/base/send-to-device.es6.js
+++ b/media/js/base/send-to-device.es6.js
@@ -152,12 +152,6 @@ SendToDevice.prototype.onFormSuccess = function () {
 
     this.enableForm();
 
-    // UA
-    window.dataLayer.push({
-        event: 'send-to-device-success',
-        input: 'email-address'
-    });
-
     // GA4
     window.dataLayer.push({
         event: 'send_to_device',
diff --git a/media/js/firefox/all/all-init.es6.js b/media/js/firefox/all/all-init.es6.js
index f2aef258d1f..8f52040b5b6 100644
--- a/media/js/firefox/all/all-init.es6.js
+++ b/media/js/firefox/all/all-init.es6.js
@@ -23,12 +23,6 @@ import MzpModal from '@mozilla-protocol/core/protocol/js/modal';
                 className: 'help-modal'
             });
 
-            // UA
-            window.dataLayer.push({
-                event: 'in-page-interaction',
-                eAction: 'link click',
-                eLabel: eventLabel
-            });
             // GA4
             window.dataLayer.push({
                 event: 'widget_action',
diff --git a/media/js/firefox/challenge-the-default/challenge-the-default.es6.js b/media/js/firefox/challenge-the-default/challenge-the-default.es6.js
index a1cf8c23b85..f95da3daadc 100644
--- a/media/js/firefox/challenge-the-default/challenge-the-default.es6.js
+++ b/media/js/firefox/challenge-the-default/challenge-the-default.es6.js
@@ -49,13 +49,6 @@ for (let index = 0; index < summaries.length; index++) {
             }
 
             if (!parent.hasAttribute('open')) {
-                // UA
-                window.dataLayer.push({
-                    event: 'in-page-interaction',
-                    eAction: 'Open details',
-                    eLabel: label
-                });
-
                 // GA4
                 window.dataLayer.push({
                     event: 'widget_action',
@@ -89,12 +82,6 @@ kittenButton.addEventListener(
             }
         });
 
-        // UA
-        window.dataLayer.push({
-            event: 'in-page-interaction',
-            eAction: 'Kitten modal'
-        });
-
         // GA4
         window.dataLayer.push({
             event: 'widget_action',
@@ -145,11 +132,6 @@ for (let index = 0; index < toggles.length; index++) {
                 input.parentElement.classList.toggle('animate-slide');
             }
             checkToggles();
-            // UA
-            window.dataLayer.push({
-                event: 'in-page-interaction',
-                eAction: 'Toggle change'
-            });
             // GA4
             window.dataLayer.push({
                 event: 'widget_action',
@@ -179,11 +161,6 @@ heroClose.addEventListener(
             heroEasterEgg.classList.toggle('hidden');
         }, 4500);
 
-        // UA
-        window.dataLayer.push({
-            event: 'in-page-interaction',
-            eAction: 'Hero close'
-        });
         // GA4
         window.dataLayer.push({
             event: 'widget_action',
@@ -216,11 +193,6 @@ function isWednesday() {
         wednesdayWrapper.classList.remove('animate-wednesday');
     }, 5000);
 
-    // UA
-    window.dataLayer.push({
-        event: 'in-page-interaction',
-        eAction: 'Wednesday Lizard View'
-    });
     // GA4
     window.dataLayer.push({
         event: 'widget_action',
diff --git a/media/js/firefox/family/banner.es6.js b/media/js/firefox/family/banner.es6.js
index 8ff9f9a3038..0cfcec1068e 100644
--- a/media/js/firefox/family/banner.es6.js
+++ b/media/js/firefox/family/banner.es6.js
@@ -33,13 +33,6 @@ function showBanner() {
 }
 
 function hideBanner() {
-    // UA
-    window.dataLayer.push({
-        eLabel: 'Banner Dismissal',
-        'data-banner-name': 'firefox-for-families-banner',
-        'data-banner-dismissal': '1',
-        event: 'in-page-interaction'
-    });
     // GA4
     window.dataLayer.push({
         event: 'widget_action',
diff --git a/media/js/firefox/new/common/thanks-direct.es6.js b/media/js/firefox/new/common/thanks-direct.es6.js
index 2fe418a461e..45d98ea1b0d 100644
--- a/media/js/firefox/new/common/thanks-direct.es6.js
+++ b/media/js/firefox/new/common/thanks-direct.es6.js
@@ -82,12 +82,6 @@ function onSuccess() {
     requestComplete = true;
 
     // Fire GA event to log attribution success
-    // UA
-    window.dataLayer.push({
-        event: 'non-interaction',
-        eAction: 'direct-attribution',
-        eLabel: 'success'
-    });
     // GA4
     window.dataLayer.push({
         event: 'widget_action',
@@ -108,12 +102,6 @@ function onTimeout() {
     requestComplete = true;
 
     // Fire GA event to log attribution timeout
-    // UA
-    window.dataLayer.push({
-        event: 'non-interaction',
-        eAction: 'direct-attribution',
-        eLabel: 'timeout'
-    });
     // GA4
     window.dataLayer.push({
         event: 'widget_action',
diff --git a/media/js/firefox/new/desktop/download.js b/media/js/firefox/new/desktop/download.js
index a6ccc5b62bc..d073ae28dcb 100644
--- a/media/js/firefox/new/desktop/download.js
+++ b/media/js/firefox/new/desktop/download.js
@@ -188,12 +188,6 @@
     function handleOpenProtectionReport(e) {
         e.preventDefault();
 
-        // UA
-        window.dataLayer.push({
-            event: 'in-page-interaction',
-            eAction: 'link click',
-            eLabel: 'See your protection report'
-        });
         // GA4
         window.dataLayer.push({
             event: 'widget_action',
diff --git a/media/js/firefox/set-as-default/thanks.js b/media/js/firefox/set-as-default/thanks.js
index b61649d36c9..8fc63323a15 100644
--- a/media/js/firefox/set-as-default/thanks.js
+++ b/media/js/firefox/set-as-default/thanks.js
@@ -27,8 +27,6 @@
 
     function onDefaultSwitch() {
         document.querySelector('main').classList.add('is-firefox-default');
-        // UA
-        trackEvent('default-changed', 'success');
         // GA4
         window.dataLayer.push({
             event: 'default_browser_set'
@@ -50,15 +48,6 @@
             });
     }
 
-    // UA
-    function trackEvent(action, label) {
-        window.dataLayer.push({
-            event: 'in-page-interaction',
-            eAction: action,
-            eLabel: label
-        });
-    }
-
     function isSupported() {
         return Mozilla.Client.isFirefoxDesktop && 'Promise' in window;
     }
@@ -78,8 +67,6 @@
                 document
                     .querySelector('main')
                     .classList.add('is-firefox-default');
-                // UA
-                trackEvent('visited', 'firefox-default');
                 // GA4
                 window.dataLayer.push({
                     event: 'dimension_set',
@@ -101,8 +88,6 @@
                         timer = setInterval(checkForDefaultSwitch, 1000);
                     }, 1500);
                 }
-                // UA
-                trackEvent('visited', 'firefox-not-default');
                 // GA4
                 window.dataLayer.push({
                     event: 'dimension_set',
diff --git a/media/js/firefox/share-page.es6.js b/media/js/firefox/share-page.es6.js
index bab81f9df4d..464f10c91cb 100644
--- a/media/js/firefox/share-page.es6.js
+++ b/media/js/firefox/share-page.es6.js
@@ -25,13 +25,6 @@ function copyText() {
         copyButtonText.style.display = 'block';
     }, 2500);
 
-    // UA
-    window.dataLayer.push({
-        event: 'in-page-interaction',
-        eAction: 'copy',
-        eLabel: 'Copy and share'
-    });
-
     // GA4
     window.dataLayer.push({
         event: 'widget_action',
diff --git a/media/js/firefox/welcome/welcome6.es6.js b/media/js/firefox/welcome/welcome6.es6.js
index 9459bbeda73..0cde7020536 100644
--- a/media/js/firefox/welcome/welcome6.es6.js
+++ b/media/js/firefox/welcome/welcome6.es6.js
@@ -30,12 +30,6 @@ trigger.addEventListener(
             closeText: window.Mozilla.Utils.trans('global-close')
         });
 
-        // UA
-        window.dataLayer.push({
-            event: 'in-page-interaction',
-            eAction: 'link click',
-            eLabel: 'Get Firefox for mobile'
-        });
         // GA4
         window.dataLayer.push({
             event: 'widget_action',
diff --git a/media/js/firefox/welcome/welcome8.js b/media/js/firefox/welcome/welcome8.js
index eb2c5ccafad..288313875f7 100644
--- a/media/js/firefox/welcome/welcome8.js
+++ b/media/js/firefox/welcome/welcome8.js
@@ -9,12 +9,6 @@
 
     function handleOpenProtectionReport(e) {
         e.preventDefault();
-        // UA
-        window.dataLayer.push({
-            event: 'in-page-interaction',
-            eAction: 'link click',
-            eLabel: 'View your protection report'
-        });
         // GA4
         window.dataLayer.push({
             event: 'widget_action',
@@ -27,12 +21,6 @@
 
     function handleOpenProtectionReportLink(e) {
         e.preventDefault();
-        // UA
-        window.dataLayer.push({
-            event: 'in-page-interaction',
-            eAction: 'link click',
-            eLabel: 'See what`s blocked'
-        });
         // GA4
         window.dataLayer.push({
             event: 'widget_action',
diff --git a/media/js/firefox/whatsnew/whatsnew-125-eu.js b/media/js/firefox/whatsnew/whatsnew-125-eu.js
index 32586f71ee5..1383a3f036a 100644
--- a/media/js/firefox/whatsnew/whatsnew-125-eu.js
+++ b/media/js/firefox/whatsnew/whatsnew-125-eu.js
@@ -10,26 +10,12 @@
     // Log account status
     Mozilla.Client.getFxaDetails(function (details) {
         if (details.setup) {
-            // UA
-            window.dataLayer.push({
-                event: 'non-interaction',
-                eAction: 'whatsnew-125-eu',
-                eLabel: 'firefox-signed-in'
-            });
-
             // GA4
             window.dataLayer.push({
                 event: 'dimension_set',
                 firefox_is_signed_in: true
             });
         } else {
-            // UA
-            window.dataLayer.push({
-                event: 'non-interaction',
-                eAction: 'whatsnew-125-eu',
-                eLabel: 'firefox-signed-out'
-            });
-
             // GA4
             window.dataLayer.push({
                 event: 'dimension_set',
@@ -41,26 +27,12 @@
     // Log default status
     Mozilla.UITour.getConfiguration('appinfo', function (details) {
         if (details.defaultBrowser) {
-            // UA
-            window.dataLayer.push({
-                event: 'non-interaction',
-                eAction: 'whatsnew-125-eu',
-                eLabel: 'firefox-default'
-            });
-
             // GA4
             window.dataLayer.push({
                 event: 'dimension_set',
                 firefox_is_default: true
             });
         } else {
-            // UA
-            window.dataLayer.push({
-                event: 'non-interaction',
-                eAction: 'whatsnew-125-eu',
-                eLabel: 'firefox-not-default'
-            });
-
             // GA4
             window.dataLayer.push({
                 event: 'dimension_set',
diff --git a/media/js/firefox/whatsnew/whatsnew-125-na.js b/media/js/firefox/whatsnew/whatsnew-125-na.js
index 69a3192f964..7fdda2897b6 100644
--- a/media/js/firefox/whatsnew/whatsnew-125-na.js
+++ b/media/js/firefox/whatsnew/whatsnew-125-na.js
@@ -11,13 +11,6 @@ function defaultTrue() {
     document.querySelector('.wnp-default').classList.add('hide');
     document.querySelector('.wnp-fast').classList.add('show');
 
-    // UA
-    window.dataLayer.push({
-        event: 'non-interaction',
-        eAction: 'whatsnew-125-na',
-        eLabel: 'default-true'
-    });
-
     // GA4
     window.dataLayer.push({
         event: 'dimension_set',
@@ -32,13 +25,6 @@ function defaultFalse() {
     document.querySelector('.wnp-fast').classList.add('hide');
     document.querySelector('.wnp-default').classList.add('show');
 
-    // UA
-    window.dataLayer.push({
-        event: 'non-interaction',
-        eAction: 'whatsnew-125-na',
-        eLabel: 'default-false'
-    });
-
     // GA4
     window.dataLayer.push({
         event: 'dimension_set',
@@ -68,26 +54,12 @@ function init() {
     // Log account status
     Mozilla.Client.getFxaDetails((details) => {
         if (details.setup) {
-            // UA
-            window.dataLayer.push({
-                event: 'non-interaction',
-                eAction: 'whatsnew-125-na',
-                eLabel: 'firefox-signed-in'
-            });
-
             // GA4
             window.dataLayer.push({
                 event: 'dimension_set',
                 firefox_is_signed_in: true
             });
         } else {
-            // UA
-            window.dataLayer.push({
-                event: 'non-interaction',
-                eAction: 'whatsnew-125-na',
-                eLabel: 'firefox-signed-out'
-            });
-
             // GA4
             window.dataLayer.push({
                 event: 'dimension_set',
diff --git a/media/js/firefox/whatsnew/whatsnew-126.js b/media/js/firefox/whatsnew/whatsnew-126.js
index 6e29af92de2..f0123341397 100644
--- a/media/js/firefox/whatsnew/whatsnew-126.js
+++ b/media/js/firefox/whatsnew/whatsnew-126.js
@@ -9,26 +9,12 @@ Mozilla.Client.getFxaDetails((details) => {
     'use strict';
 
     if (details.setup) {
-        // UA
-        window.dataLayer.push({
-            event: 'non-interaction',
-            eAction: 'whatsnew-126',
-            eLabel: 'firefox-signed-in'
-        });
-
         // GA4
         window.dataLayer.push({
             event: 'dimension_set',
             firefox_is_signed_in: true
         });
     } else {
-        // UA
-        window.dataLayer.push({
-            event: 'non-interaction',
-            eAction: 'whatsnew-126',
-            eLabel: 'firefox-signed-out'
-        });
-
         // GA4
         window.dataLayer.push({
             event: 'dimension_set',
@@ -42,26 +28,12 @@ Mozilla.UITour.getConfiguration('appinfo', (details) => {
     'use strict';
 
     if (details.defaultBrowser) {
-        // UA
-        window.dataLayer.push({
-            event: 'non-interaction',
-            eAction: 'whatsnew-126',
-            eLabel: 'firefox-default'
-        });
-
         // GA4
         window.dataLayer.push({
             event: 'dimension_set',
             firefox_is_default: true
         });
     } else {
-        // UA
-        window.dataLayer.push({
-            event: 'non-interaction',
-            eAction: 'whatsnew-126',
-            eLabel: 'firefox-not-default'
-        });
-
         // GA4
         window.dataLayer.push({
             event: 'dimension_set',
diff --git a/media/js/firefox/whatsnew/whatsnew-126beta.js b/media/js/firefox/whatsnew/whatsnew-126beta.js
index fffb586757e..1383a3f036a 100644
--- a/media/js/firefox/whatsnew/whatsnew-126beta.js
+++ b/media/js/firefox/whatsnew/whatsnew-126beta.js
@@ -10,26 +10,12 @@
     // Log account status
     Mozilla.Client.getFxaDetails(function (details) {
         if (details.setup) {
-            // UA
-            window.dataLayer.push({
-                event: 'non-interaction',
-                eAction: 'whatsnew-126beta',
-                eLabel: 'firefox-signed-in'
-            });
-
             // GA4
             window.dataLayer.push({
                 event: 'dimension_set',
                 firefox_is_signed_in: true
             });
         } else {
-            // UA
-            window.dataLayer.push({
-                event: 'non-interaction',
-                eAction: 'whatsnew-126beta',
-                eLabel: 'firefox-signed-out'
-            });
-
             // GA4
             window.dataLayer.push({
                 event: 'dimension_set',
@@ -41,26 +27,12 @@
     // Log default status
     Mozilla.UITour.getConfiguration('appinfo', function (details) {
         if (details.defaultBrowser) {
-            // UA
-            window.dataLayer.push({
-                event: 'non-interaction',
-                eAction: 'whatsnew-126beta',
-                eLabel: 'firefox-default'
-            });
-
             // GA4
             window.dataLayer.push({
                 event: 'dimension_set',
                 firefox_is_default: true
             });
         } else {
-            // UA
-            window.dataLayer.push({
-                event: 'non-interaction',
-                eAction: 'whatsnew-126beta',
-                eLabel: 'firefox-not-default'
-            });
-
             // GA4
             window.dataLayer.push({
                 event: 'dimension_set',
diff --git a/media/js/firefox/whatsnew/whatsnew-127-eu.js b/media/js/firefox/whatsnew/whatsnew-127-eu.js
index d157a7da39d..758a92875b0 100644
--- a/media/js/firefox/whatsnew/whatsnew-127-eu.js
+++ b/media/js/firefox/whatsnew/whatsnew-127-eu.js
@@ -9,26 +9,12 @@ Mozilla.Client.getFxaDetails((details) => {
     'use strict';
 
     if (details.setup) {
-        // UA
-        window.dataLayer.push({
-            event: 'non-interaction',
-            eAction: 'whatsnew-127',
-            eLabel: 'firefox-signed-in'
-        });
-
         // GA4
         window.dataLayer.push({
             event: 'dimension_set',
             firefox_is_signed_in: true
         });
     } else {
-        // UA
-        window.dataLayer.push({
-            event: 'non-interaction',
-            eAction: 'whatsnew-127',
-            eLabel: 'firefox-signed-out'
-        });
-
         // GA4
         window.dataLayer.push({
             event: 'dimension_set',
@@ -42,26 +28,12 @@ Mozilla.UITour.getConfiguration('appinfo', (details) => {
     'use strict';
 
     if (details.defaultBrowser) {
-        // UA
-        window.dataLayer.push({
-            event: 'non-interaction',
-            eAction: 'whatsnew-127',
-            eLabel: 'firefox-default'
-        });
-
         // GA4
         window.dataLayer.push({
             event: 'dimension_set',
             firefox_is_default: true
         });
     } else {
-        // UA
-        window.dataLayer.push({
-            event: 'non-interaction',
-            eAction: 'whatsnew-127',
-            eLabel: 'firefox-not-default'
-        });
-
         // GA4
         window.dataLayer.push({
             event: 'dimension_set',
diff --git a/media/js/firefox/whatsnew/whatsnew-127-na.js b/media/js/firefox/whatsnew/whatsnew-127-na.js
index dbe9ca78b6d..f0123341397 100644
--- a/media/js/firefox/whatsnew/whatsnew-127-na.js
+++ b/media/js/firefox/whatsnew/whatsnew-127-na.js
@@ -9,26 +9,12 @@ Mozilla.Client.getFxaDetails((details) => {
     'use strict';
 
     if (details.setup) {
-        // UA
-        window.dataLayer.push({
-            event: 'non-interaction',
-            eAction: 'whatsnew-127',
-            eLabel: 'firefox-signed-in'
-        });
-
         // GA4
         window.dataLayer.push({
             event: 'dimension_set',
             firefox_is_signed_in: true
         });
     } else {
-        // UA
-        window.dataLayer.push({
-            event: 'non-interaction',
-            eAction: 'whatsnew-127',
-            eLabel: 'firefox-signed-out'
-        });
-
         // GA4
         window.dataLayer.push({
             event: 'dimension_set',
@@ -42,26 +28,12 @@ Mozilla.UITour.getConfiguration('appinfo', (details) => {
     'use strict';
 
     if (details.defaultBrowser) {
-        // UA
-        window.dataLayer.push({
-            event: 'non-interaction',
-            eAction: 'whatsnew-127',
-            eLabel: 'firefox-default'
-        });
-
         // GA4
         window.dataLayer.push({
             event: 'dimension_set',
             firefox_is_default: true
         });
     } else {
-        // UA
-        window.dataLayer.push({
-            event: 'non-interaction',
-            eAction: 'whatsnew-127',
-            eLabel: 'firefox-not-default'
-        });
-
         // GA4
         window.dataLayer.push({
             event: 'dimension_set',
diff --git a/media/js/newsletter/newsletter-init.es6.js b/media/js/newsletter/newsletter-init.es6.js
index 0981a671919..d105cb35032 100644
--- a/media/js/newsletter/newsletter-init.es6.js
+++ b/media/js/newsletter/newsletter-init.es6.js
@@ -14,11 +14,6 @@ const successCustomCallback = () => {
     ).map((newsletter) => newsletter.value);
 
     if (window.dataLayer) {
-        // UA
-        window.dataLayer.push({
-            event: 'newsletter-signup-success',
-            newsletter: newsletters
-        });
         // GA4
         for (let i = 0; i < newsletters.length; ++i) {
             window.dataLayer.push({
diff --git a/media/js/products/vpn/resource-center-article.es6.js b/media/js/products/vpn/resource-center-article.es6.js
index 1ce18d1248d..445acdc3120 100644
--- a/media/js/products/vpn/resource-center-article.es6.js
+++ b/media/js/products/vpn/resource-center-article.es6.js
@@ -9,12 +9,6 @@ const upvoteBtn = document.querySelector('.vpn-c-vote-btn.up');
 const downvoteBtn = document.querySelector('.vpn-c-vote-btn.down');
 
 function trackVoteInteraction(url, vote) {
-    // UA
-    window.dataLayer.push({
-        event: 'vpn-article-vote',
-        label: url,
-        value: vote
-    });
     // GA4
     window.dataLayer.push({
         event: 'widget_action',
diff --git a/tests/unit/spec/products/vpn/invite.js b/tests/unit/spec/products/vpn/invite.js
index 48122cc0449..1c6c9766ab3 100644
--- a/tests/unit/spec/products/vpn/invite.js
+++ b/tests/unit/spec/products/vpn/invite.js
@@ -71,7 +71,7 @@ describe('WaitListForm', function () {
                         </select>
                     </div>
                     <p class="mzp-c-form-submit">
-                        <button class="mzp-c-button mzp-t-xl" id="newsletter-submit" type="submit">Join the Waitlist</button>
+                        <button class="mzp-c-button mzp-t-xl" id="newsletter-submit" type="submit" data-cta-text="Join the Waitlist">Join the Waitlist</button>
                     </p>
                 </fieldset>
             </form>