diff --git a/cfgov/tccp/jinja2/tccp/includes/tooltip.html b/cfgov/tccp/jinja2/tccp/includes/tooltip.html
index 08984332887..581c961fb1e 100644
--- a/cfgov/tccp/jinja2/tccp/includes/tooltip.html
+++ b/cfgov/tccp/jinja2/tccp/includes/tooltip.html
@@ -1,9 +1,12 @@
-{% macro tooltip(name, heading=none, body=none, icon="help-round", tabindex="0") -%}
+{% set c = namespace(value=0)%}
 
-<span tabindex="{% if tabindex == False %}0{% else %}-1{% endif %}" data-tooltip>
+{% macro tooltip(name, heading=none, body=none, icon="help-round", tabindex="0") -%}
+{% set id = "tooltip" + c.value | string %}
+{% set c.value = c.value + 1 %}
+<span tabindex="{% if tabindex == False %}0{% else %}-1{% endif %}" data-tooltip={{id}}>
     {{ svg_icon(icon) }}
 </span>
-<template>
+<template id={{id}}>
     {% if heading %}<div class="tippy-heading">{{ heading }}</div>{% endif %}
     {% if body %}<div class="tippy-body">{{ body }}</div>{% endif %}
 </template>
diff --git a/cfgov/unprocessed/apps/ask-cfpb/js/Autocomplete.js b/cfgov/unprocessed/apps/ask-cfpb/js/Autocomplete.js
index 07e1cf30ee3..b5f998b9b9f 100644
--- a/cfgov/unprocessed/apps/ask-cfpb/js/Autocomplete.js
+++ b/cfgov/unprocessed/apps/ask-cfpb/js/Autocomplete.js
@@ -1,8 +1,4 @@
-import {
-  EventObserver,
-  checkDom,
-  setInitFlag,
-} from '@cfpb/cfpb-design-system';
+import { EventObserver, checkDom, setInitFlag } from '@cfpb/cfpb-design-system';
 import throttle from 'lodash.throttle';
 
 // Class constants
diff --git a/cfgov/unprocessed/apps/tccp/css/main.scss b/cfgov/unprocessed/apps/tccp/css/main.scss
index fe677421e63..389138dd071 100644
--- a/cfgov/unprocessed/apps/tccp/css/main.scss
+++ b/cfgov/unprocessed/apps/tccp/css/main.scss
@@ -1,7 +1,6 @@
 @use 'sass:math';
 @use '@cfpb/cfpb-design-system/src/abstracts' as *;
 @use '@cfpb/cfpb-design-system/src/utilities' as *;
-@use 'tooltip' as *;
 
 @include respond-to-min($bp-sm-min) {
   .o-form__group {
diff --git a/cfgov/unprocessed/apps/tccp/css/tooltip.scss b/cfgov/unprocessed/apps/tccp/css/tooltip.scss
deleted file mode 100644
index 70b6e69de12..00000000000
--- a/cfgov/unprocessed/apps/tccp/css/tooltip.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-@use 'sass:math';
-@use '@cfpb/cfpb-design-system/src/abstracts' as *;
-@import '../node_modules/tippy.js/dist/tippy.css';
-@import '../node_modules/tippy.js/dist/border.css';
-
-// Custom theme, see https://atomiks.github.io/tippyjs/v6/themes/
-.tippy-box[data-theme='cfpb'] {
-  background-color: var(--gray-5);
-  border: 1px solid var(--gray-40);
-  border-radius: 0;
-  color: var(--black);
-  padding: math.div(15px, $base-font-size-px) + rem;
-
-  .tippy-arrow {
-    color: var(--gray-5);
-  }
-
-  .tippy-heading {
-    font-weight: 500;
-    font-size: math.div(18px, $base-font-size-px) + rem;
-  }
-
-  .tippy-body {
-    font-size: math.div(16px, $base-font-size-px) + rem;
-    margin-top: math.div(15px, $base-font-size-px) + rem;
-  }
-}
diff --git a/cfgov/unprocessed/apps/tccp/js/index.js b/cfgov/unprocessed/apps/tccp/js/index.js
index cd6f9a008af..ca7de671fca 100644
--- a/cfgov/unprocessed/apps/tccp/js/index.js
+++ b/cfgov/unprocessed/apps/tccp/js/index.js
@@ -1,6 +1,6 @@
-import tippy from 'tippy.js';
 import { analyticsSendEvent } from '@cfpb/cfpb-analytics';
 import { behaviorAttach } from '@cfpb/cfpb-design-system';
+import { Tooltip } from '@cfpb/cfpb-design-system/tooltips';
 
 import orderingDropdown from './ordering';
 import webStorageProxy from '../../../js/modules/util/web-storage-proxy';
@@ -28,7 +28,7 @@ function init() {
   // Move the card ordering dropdown below the expandable
   orderingDropdown.move();
   // Initialize any tooltips on the page
-  initializeTooltips();
+  tooltips = Tooltip.init();
   // Reinitialize tooltips after an htmx request replaces DOM nodes
   behaviorAttach(document, 'htmx:afterSwap', initializeAndReport);
 }
@@ -38,7 +38,7 @@ function init() {
  * @param {Event} event - htmx event
  */
 function initializeAndReport(event) {
-  initializeTooltips();
+  tooltips = Tooltip.init();
   reportFilter(event);
   // Attach handler for "Enter" on card details link proxy
   behaviorAttach('card-link-proxy', 'keydown', handleCardLinkProxies);
@@ -68,50 +68,6 @@ function reportFilter(event) {
   });
 }
 
-/**
- * Set up Tippy.js tooltips
- * See https://kabbouchi.github.io/tippyjs-v4-docs/html-content/
- */
-function initializeTooltips() {
-  tooltips = tippy('[data-tooltip]', {
-    theme: 'cfpb',
-    maxWidth: 450,
-    content: function (reference) {
-      const template = reference.nextElementSibling;
-      const container = document.createElement('div');
-      const node = document.importNode(template.content, true);
-      container.appendChild(node);
-      return container;
-    },
-    // See https://atomiks.github.io/tippyjs/v6/plugins/
-    plugins: [
-      {
-        name: 'hideOnEsc',
-        defaultValue: true,
-        fn({ hide }) {
-          /**
-           * Hide when the escape key is pressed.
-           * @param {KeyboardEvent} event - Key down event.
-           */
-          function onKeyDown(event) {
-            if (event.key === 'Escape') {
-              hide();
-            }
-          }
-          return {
-            onShow() {
-              document.addEventListener('keydown', onKeyDown);
-            },
-            onHide() {
-              document.removeEventListener('keydown', onKeyDown);
-            },
-          };
-        },
-      },
-    ],
-  });
-}
-
 /**
  * Handle links that shouldn't be followed when
  * specified children elements are targeted
@@ -122,7 +78,8 @@ function handleIgnoreLinkTargets(event) {
   const ignoredTargets = event.currentTarget?.getAttribute(
     'data-ignore-link-targets',
   );
-  const tooltipIsOpen = tooltips.some((tip) => tip.state.isMounted);
+  const tooltipIsOpen = tooltips.some((tip) => tip.tooltip.state.isMounted);
+
   if (event.target.closest(ignoredTargets) || tooltipIsOpen) {
     event.preventDefault();
   }
diff --git a/cfgov/unprocessed/apps/tccp/npm-packages-offline-cache/@popperjs-core-2.11.8.tgz b/cfgov/unprocessed/apps/tccp/npm-packages-offline-cache/@popperjs-core-2.11.8.tgz
deleted file mode 100644
index 16bd24218ea..00000000000
Binary files a/cfgov/unprocessed/apps/tccp/npm-packages-offline-cache/@popperjs-core-2.11.8.tgz and /dev/null differ
diff --git a/cfgov/unprocessed/apps/tccp/npm-packages-offline-cache/tippy.js-6.3.7.tgz b/cfgov/unprocessed/apps/tccp/npm-packages-offline-cache/tippy.js-6.3.7.tgz
deleted file mode 100644
index ba98c4249df..00000000000
Binary files a/cfgov/unprocessed/apps/tccp/npm-packages-offline-cache/tippy.js-6.3.7.tgz and /dev/null differ
diff --git a/cfgov/unprocessed/apps/tccp/package.json b/cfgov/unprocessed/apps/tccp/package.json
index 0da0b8335f8..d47e4390d92 100644
--- a/cfgov/unprocessed/apps/tccp/package.json
+++ b/cfgov/unprocessed/apps/tccp/package.json
@@ -14,7 +14,6 @@
   "license": "SEE LICENSE IN TERMS.md",
   "type": "module",
   "dependencies": {
-    "htmx.org": "1.9.10",
-    "tippy.js": "6.3.7"
+    "htmx.org": "1.9.10"
   }
 }
diff --git a/cfgov/unprocessed/apps/tccp/yarn.lock b/cfgov/unprocessed/apps/tccp/yarn.lock
index dd5d342763f..63f4f0427d0 100644
--- a/cfgov/unprocessed/apps/tccp/yarn.lock
+++ b/cfgov/unprocessed/apps/tccp/yarn.lock
@@ -2,19 +2,7 @@
 # yarn lockfile v1
 
 
-"@popperjs/core@^2.9.0":
-  version "2.11.8"
-  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f"
-  integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==
-
 htmx.org@1.9.10:
   version "1.9.10"
   resolved "https://registry.yarnpkg.com/htmx.org/-/htmx.org-1.9.10.tgz#63c67e1e7a447086a3119c156f08722c624aacac"
   integrity sha512-UgchasltTCrTuU2DQLom3ohHrBvwr7OqpwyAVJ9VxtNBng4XKkVsqrv0Qr3srqvM9ZNI3f1MmvVQQqK7KW/bTA==
-
-tippy.js@6.3.7:
-  version "6.3.7"
-  resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-6.3.7.tgz#8ccfb651d642010ed9a32ff29b0e9e19c5b8c61c"
-  integrity sha512-E1d3oP2emgJ9dRQZdf3Kkn0qJgI6ZLpyS5z6ZkY1DF3kaQaBsGZsndEpHwx+eC+tYM41HaSNvNtLx8tU57FzTQ==
-  dependencies:
-    "@popperjs/core" "^2.9.0"
diff --git a/cfgov/unprocessed/css/main.scss b/cfgov/unprocessed/css/main.scss
index 53e8bc91c80..9c418045d17 100644
--- a/cfgov/unprocessed/css/main.scss
+++ b/cfgov/unprocessed/css/main.scss
@@ -9,6 +9,7 @@
 // Import required CF components.
 
 @use '@cfpb/cfpb-design-system/src/' as *;
+@use '@cfpb/cfpb-design-system/src/components/cfpb-tooltips/tooltip' as *;
 
 // Enhancements that are on a migration path to being added to CF.
 // CF Core
diff --git a/cfgov/unprocessed/js/organisms/VideoPlayer.js b/cfgov/unprocessed/js/organisms/VideoPlayer.js
index 6b59bcfd699..d520a6ae300 100644
--- a/cfgov/unprocessed/js/organisms/VideoPlayer.js
+++ b/cfgov/unprocessed/js/organisms/VideoPlayer.js
@@ -2,11 +2,7 @@
    Video Player Class
    ========================================================================== */
 
-import {
-  checkDom,
-  setInitFlag,
-  EventObserver,
-} from '@cfpb/cfpb-design-system';
+import { checkDom, setInitFlag, EventObserver } from '@cfpb/cfpb-design-system';
 import { formatTimestamp } from '../modules/util/strings.js';
 import youTubeAPI from '../modules/youtube-api.js';
 
diff --git a/cfgov/unprocessed/js/routes/data-research/prepaid-accounts/search-agreements/index.js b/cfgov/unprocessed/js/routes/data-research/prepaid-accounts/search-agreements/index.js
index 973ad5500ba..22734f85016 100644
--- a/cfgov/unprocessed/js/routes/data-research/prepaid-accounts/search-agreements/index.js
+++ b/cfgov/unprocessed/js/routes/data-research/prepaid-accounts/search-agreements/index.js
@@ -1,7 +1,4 @@
-import {
-  Multiselect,
-  SummaryMinimal,
-} from '@cfpb/cfpb-design-system';
+import { Multiselect, SummaryMinimal } from '@cfpb/cfpb-design-system';
 
 Multiselect.init();
 SummaryMinimal.init();
diff --git a/eslint.config.js b/eslint.config.js
index 55ae033b1d3..7b0c6041034 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -56,6 +56,7 @@ export default [
         {
           ignore: [
             '@cfpb/cfpb-design-system$',
+            '@cfpb/cfpb-design-system/tooltips$',
             '@cfpb/cfpb-design-system/icons/.+.svg$',
           ],
         },
diff --git a/npm-packages-offline-cache/@cfpb-cfpb-design-system-3.6.2.tgz b/npm-packages-offline-cache/@cfpb-cfpb-design-system-3.6.2.tgz
deleted file mode 100644
index 6e256a1f408..00000000000
Binary files a/npm-packages-offline-cache/@cfpb-cfpb-design-system-3.6.2.tgz and /dev/null differ
diff --git a/npm-packages-offline-cache/@cfpb-cfpb-design-system-3.6.3.tgz b/npm-packages-offline-cache/@cfpb-cfpb-design-system-3.6.3.tgz
new file mode 100644
index 00000000000..662a6bb67f9
Binary files /dev/null and b/npm-packages-offline-cache/@cfpb-cfpb-design-system-3.6.3.tgz differ
diff --git a/package.json b/package.json
index bb0b8b8f9cf..40950c4991d 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   "dependencies": {
     "@cfpb/browserslist-config": "0.0.3",
     "@cfpb/cfpb-analytics": "0.3.2",
-    "@cfpb/cfpb-design-system": "3.6.2",
+    "@cfpb/cfpb-design-system": "3.6.3",
     "@csstools/postcss-sass": "5.1.1",
     "@csstools/sass-import-resolve": "1.0.0",
     "autoprefixer": "10.4.20",
diff --git a/yarn.lock b/yarn.lock
index 1d8d5abf3aa..d6957637173 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -283,10 +283,10 @@
   resolved "https://registry.yarnpkg.com/@cfpb/cfpb-analytics/-/cfpb-analytics-0.3.2.tgz#3d1e8da7c05cd0d312ae86a3b64e88bc3c3fc12b"
   integrity sha512-0rjHPdAi4emgjMmzKSBHwwRhztxyEk3X8Zay0qRK9pATApsHqBjEJmTn5Npd1ponQQ1m5KEPo3g9kPequOQXSg==
 
-"@cfpb/cfpb-design-system@3.6.2":
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/@cfpb/cfpb-design-system/-/cfpb-design-system-3.6.2.tgz#81b1dbc0087c14ec06e7f826003c5dd8d63505ef"
-  integrity sha512-hHJa6UJs5pfuDBg/09kgs5d9C4QQxQ5l22SC+U6yGRD1GdiPtnzxUbYPE0v4x2HPc+6uGUaQPYPuVqd4cqQUvw==
+"@cfpb/cfpb-design-system@3.6.3":
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/@cfpb/cfpb-design-system/-/cfpb-design-system-3.6.3.tgz#421b87d4ea427ae3cdf7296aadba288f8a0e3ccb"
+  integrity sha512-EAY7rGakAd21x4vkWNIM8+Nkl6xobLiIpIZ2DG14T0GrOAy7GMLsYHJhTrVEWS67dCt0KP/2ykSMLtC88S5IDA==
   dependencies:
     tippy.js "6.3.7"