diff --git a/bedrock/contentful/api.py b/bedrock/contentful/api.py
index edddeb5463e..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-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/tests/test_contentful_api.py b/bedrock/contentful/tests/test_contentful_api.py
index 440663a8364..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-text="Example" rel="external noopener">Example</a>'
+        'data-cta-text="Example" rel="external noopener">Example</a>'
     )
 
     assert output == expected
@@ -534,7 +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-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
 
diff --git a/bedrock/mozorg/templates/mozorg/antiharassment-tool.html b/bedrock/mozorg/templates/mozorg/antiharassment-tool.html
index 1b351f77ff4..cbac8262ba4 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" data-cta-type="newsletter" 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/newsletter/templates/newsletter/includes/form.html b/bedrock/newsletter/templates/newsletter/includes/form.html
index 2d62d709cc1..f96e19b8f89 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-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-cta-type="newsletter" data-testid="newsletter-submit-button">
           {% if submit_text %}
             {{ submit_text }}
           {% else %}
diff --git a/bedrock/newsletter/tests/test_views.py b/bedrock/newsletter/tests/test_views.py
index 0a0e8dbbcc2..d7884f67414 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-type"], "newsletter")
 
     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-type"], "newsletter")
 
     @patch("bedrock.newsletter.views.basket")
     def test_returns_success(self, basket_mock):
diff --git a/bedrock/products/templates/products/mozsocial/invite.html b/bedrock/products/templates/products/mozsocial/invite.html
index c42ccd159c9..c9ce6f77b9c 100644
--- a/bedrock/products/templates/products/mozsocial/invite.html
+++ b/bedrock/products/templates/products/mozsocial/invite.html
@@ -85,7 +85,7 @@ <h1 class="mzp-c-form-header">{{ ftl('mozsocial-invite-welcome-to-mozillasocial'
       </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">
+        <button type="submit" id="newsletter-submit" class="mzp-c-button button-dark" data-cta-text="Sign me up" data-cta-type="newsletter">
           {{ ftl('newsletter-form-sign-me-up') }}
         </button>
       </p>
diff --git a/bedrock/products/templates/products/vpn/invite.html b/bedrock/products/templates/products/vpn/invite.html
index f5a2e36f2b7..b529bb83452 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-cta-type="newsletter" data-testid="vpn-invite-submit-button">{{ ftl('vpn-shared-waitlist-link') }}</button>
       </p>
 
       <div class="vpn-invite-privacy">
diff --git a/tests/unit/spec/products/vpn/invite.js b/tests/unit/spec/products/vpn/invite.js
index 48122cc0449..1d74e5b9869 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" data-cta-type="newsletter">Join the Waitlist</button>
                     </p>
                 </fieldset>
             </form>