diff --git a/.changeset/cyan-beds-dream.md b/.changeset/cyan-beds-dream.md
deleted file mode 100644
index 825e4bbeaa8..00000000000
--- a/.changeset/cyan-beds-dream.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-"@hashicorp/design-system-components": patch
----
-
-Upgraded the following dependencies:
-
-- `@embroider/addon-shim` from `1.9.0` to `1.10.0`
-- `@embroider/macros` from `1.16.12` to `1.18.0`
-- `@nullvoxpopuli/ember-composable-helpers` from `5.2.9` to `5.2.10`
-- `ember-concurrency` from `4.0.2` to `4.0.4`
-- `ember-power-select` from `8.6.2` to `8.7.1`
diff --git a/.changeset/hip-tools-return.md b/.changeset/hip-tools-return.md
deleted file mode 100644
index 5a38658b566..00000000000
--- a/.changeset/hip-tools-return.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@hashicorp/flight-icons": patch
----
-
-Removed extra space in `PingID` name, and updated description.
diff --git a/.changeset/tasty-teachers-look.md b/.changeset/tasty-teachers-look.md
deleted file mode 100644
index c617c4926d5..00000000000
--- a/.changeset/tasty-teachers-look.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-"@hashicorp/design-system-components": patch
----
-
-`Button` - added missing types to the barrel export file
-
-`Layout::Flex` - added missing types to the barrel export file
-
-`Layout::Grid` - added missing types to the barrel export file
diff --git a/.changeset/tidy-tigers-care.md b/.changeset/tidy-tigers-care.md
deleted file mode 100644
index abb2ed58e13..00000000000
--- a/.changeset/tidy-tigers-care.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@hashicorp/design-system-components": patch
----
-
-`Modal` - Reverted changes introduced in [#2846](https://github.com/hashicorp/design-system/pull/2846) and [#2902](https://github.com/hashicorp/design-system/pull/2902) related to the click behaviour outside the modal when dismissing is disabled
diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index e8a62f50215..bc3de03492e 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -1,5 +1,43 @@
 # @hashicorp/design-system-components
 
+## 4.20.2
+
+[4.20.2 documentation](https://hds-website-4-20-2.vercel.app/)
+
+### Patch Changes
+
+Upgraded the following dependencies:
+
+- `@embroider/addon-shim` from `1.9.0` to `1.10.0`
+- `@embroider/macros` from `1.16.12` to `1.18.0`
+- `@nullvoxpopuli/ember-composable-helpers` from `5.2.9` to `5.2.10`
+- `ember-concurrency` from `4.0.2` to `4.0.4`
+- `ember-power-select` from `8.6.2` to `8.7.1`
+
+<small class="doc-whats-new-changelog-metadata">[#2952](https://github.com/hashicorp/design-system/pull/2952)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+`Button` - added missing types to the barrel export file
+
+`Layout::Flex` - added missing types to the barrel export file
+
+`Layout::Grid` - added missing types to the barrel export file
+
+<small class="doc-whats-new-changelog-metadata">[#2943](https://github.com/hashicorp/design-system/pull/2943)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+`Modal` - Reverted changes introduced in [#2846](https://github.com/hashicorp/design-system/pull/2846) and [#2902](https://github.com/hashicorp/design-system/pull/2902) related to the click behavior outside the modal when dismissing is disabled
+
+<small class="doc-whats-new-changelog-metadata">[#2964](https://github.com/hashicorp/design-system/pull/2964)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+**🔄 Updated dependencies:**
+
+- @hashicorp/flight-icons@3.11.1
+
 ## 4.20.1
 
 [4.20.1 documentation](https://hds-website-4-20-1.vercel.app/)
diff --git a/packages/components/package.json b/packages/components/package.json
index 8185ea33139..4809aefce87 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hashicorp/design-system-components",
-  "version": "4.20.1",
+  "version": "4.20.2",
   "description": "Helios Design System Components",
   "keywords": [
     "hashicorp",
@@ -53,7 +53,7 @@
     "@embroider/util": "^1.13.2",
     "@floating-ui/dom": "^1.6.12",
     "@hashicorp/design-system-tokens": "workspace:^2.3.0",
-    "@hashicorp/flight-icons": "workspace:^3.11.0",
+    "@hashicorp/flight-icons": "workspace:^3.11.1",
     "@lezer/highlight": "^1.2.1",
     "@nullvoxpopuli/ember-composable-helpers": "^5.2.10",
     "clipboard-polyfill": "^4.1.1",
diff --git a/packages/flight-icons/CHANGELOG.md b/packages/flight-icons/CHANGELOG.md
index a3c4143d3b5..d220a6467fe 100644
--- a/packages/flight-icons/CHANGELOG.md
+++ b/packages/flight-icons/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @hashicorp/flight-icons
 
+## 3.11.1
+
+### Patch Changes
+
+Removed extra space in `PingID` name, and updated description.
+
+<small class="doc-whats-new-changelog-metadata">[#2959](https://github.com/hashicorp/design-system/pull/2959)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
 ## 3.11.0
 
 ### Minor Changes
diff --git a/packages/flight-icons/package.json b/packages/flight-icons/package.json
index efb3c8ce0cf..621737d4717 100644
--- a/packages/flight-icons/package.json
+++ b/packages/flight-icons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hashicorp/flight-icons",
-  "version": "3.11.0",
+  "version": "3.11.1",
   "description": "Flight: HashiCorp SVG icon set",
   "keywords": [
     "hashicorp",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6a5e4d34a37..1e2ade20df2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -133,7 +133,7 @@ importers:
         specifier: workspace:^2.3.0
         version: link:../tokens
       '@hashicorp/flight-icons':
-        specifier: workspace:^3.11.0
+        specifier: workspace:^3.11.1
         version: link:../flight-icons
       '@lezer/highlight':
         specifier: ^1.2.1
diff --git a/website/docs/components/button/index.md b/website/docs/components/button/index.md
index 58b20222a51..08b0a26fb7d 100644
--- a/website/docs/components/button/index.md
+++ b/website/docs/components/button/index.md
@@ -19,6 +19,8 @@ navigation:
   keywords:
     - action
     - link
+status:
+  updated: 4.20.2
 ---
 
 <section data-tab="Guidelines">
diff --git a/website/docs/components/button/partials/version-history/version-history.md b/website/docs/components/button/partials/version-history/version-history.md
new file mode 100644
index 00000000000..7ac2a6957b6
--- /dev/null
+++ b/website/docs/components/button/partials/version-history/version-history.md
@@ -0,0 +1,4 @@
+## 4.20.2
+
+added missing types to the barrel export file
+
diff --git a/website/docs/components/modal/index.md b/website/docs/components/modal/index.md
index 526b691f464..80e6aeb747b 100644
--- a/website/docs/components/modal/index.md
+++ b/website/docs/components/modal/index.md
@@ -25,7 +25,7 @@ navigation:
     - popup
     - dialog
 status:
-  updated: 4.20.0
+  updated: 4.20.2
 ---
 
 <section data-tab="Guidelines">
diff --git a/website/docs/components/modal/partials/version-history/version-history.md b/website/docs/components/modal/partials/version-history/version-history.md
index c9adc29e50f..184d65c7b56 100644
--- a/website/docs/components/modal/partials/version-history/version-history.md
+++ b/website/docs/components/modal/partials/version-history/version-history.md
@@ -1,3 +1,7 @@
+## 4.20.2
+
+Reverted changes introduced in [#2846](https://github.com/hashicorp/design-system/pull/2846) and [#2902](https://github.com/hashicorp/design-system/pull/2902) related to the click behavior outside the modal when dismissing is disabled
+
 ## 4.20.0
 
 Fixed bug with click event listener not properly removed
diff --git a/website/docs/layouts/flex/index.md b/website/docs/layouts/flex/index.md
index 498e020ddec..9560074972d 100644
--- a/website/docs/layouts/flex/index.md
+++ b/website/docs/layouts/flex/index.md
@@ -17,7 +17,7 @@ navigation:
     - grid
   label: Flex
 status:
-  updated: 4.20.0
+  updated: 4.20.2
 ---
 
 <section data-tab="Code">
diff --git a/website/docs/layouts/flex/partials/version-history/version-history.md b/website/docs/layouts/flex/partials/version-history/version-history.md
index cf5532da1d3..1ffd880dc93 100644
--- a/website/docs/layouts/flex/partials/version-history/version-history.md
+++ b/website/docs/layouts/flex/partials/version-history/version-history.md
@@ -1,3 +1,7 @@
+## 4.20.2
+
+added missing types to the barrel export file
+
 ## 4.20.0
 
 Added missing export of component/subcomponent
diff --git a/website/docs/layouts/grid/index.md b/website/docs/layouts/grid/index.md
index 8aef73d1754..c09849aabe8 100644
--- a/website/docs/layouts/grid/index.md
+++ b/website/docs/layouts/grid/index.md
@@ -18,7 +18,7 @@ navigation:
     - flex
   label: Grid
 status:
-  updated: 4.20.0
+  updated: 4.20.2
 ---
 
 <section data-tab="Code">
diff --git a/website/docs/layouts/grid/partials/version-history/version-history.md b/website/docs/layouts/grid/partials/version-history/version-history.md
index e8b45af3317..386713188cc 100644
--- a/website/docs/layouts/grid/partials/version-history/version-history.md
+++ b/website/docs/layouts/grid/partials/version-history/version-history.md
@@ -1,3 +1,7 @@
+## 4.20.2
+
+added missing types to the barrel export file
+
 ## 4.20.0
 
 Added missing export of component/subcomponent
diff --git a/website/docs/whats-new/release-notes/partials/components.md b/website/docs/whats-new/release-notes/partials/components.md
index 91cc39953d9..79a7c49be38 100644
--- a/website/docs/whats-new/release-notes/partials/components.md
+++ b/website/docs/whats-new/release-notes/partials/components.md
@@ -12,6 +12,44 @@
   </a>
 </p>
 
+## 4.20.2
+
+[4.20.2 documentation](https://hds-website-4-20-2.vercel.app/)
+
+**Patch changes**
+
+Upgraded the following dependencies:
+
+- `@embroider/addon-shim` from `1.9.0` to `1.10.0`
+- `@embroider/macros` from `1.16.12` to `1.18.0`
+- `@nullvoxpopuli/ember-composable-helpers` from `5.2.9` to `5.2.10`
+- `ember-concurrency` from `4.0.2` to `4.0.4`
+- `ember-power-select` from `8.6.2` to `8.7.1`
+
+<small class="doc-whats-new-changelog-metadata">[#2952](https://github.com/hashicorp/design-system/pull/2952)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+`Button` - added missing types to the barrel export file
+
+`Layout::Flex` - added missing types to the barrel export file
+
+`Layout::Grid` - added missing types to the barrel export file
+
+<small class="doc-whats-new-changelog-metadata">[#2943](https://github.com/hashicorp/design-system/pull/2943)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+`Modal` - Reverted changes introduced in [#2846](https://github.com/hashicorp/design-system/pull/2846) and [#2902](https://github.com/hashicorp/design-system/pull/2902) related to the click behavior outside the modal when dismissing is disabled
+
+<small class="doc-whats-new-changelog-metadata">[#2964](https://github.com/hashicorp/design-system/pull/2964)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+**🔄 Updated dependencies:**
+
+- @hashicorp/flight-icons@3.11.1
+
 ## 4.20.1
 
 [4.20.1 documentation](https://hds-website-4-20-1.vercel.app/)
@@ -1525,17 +1563,7 @@ Removed `popover-polyfill` dependency and instantiating code
 
 - @hashicorp/ember-flight-icons@5.1.2
 
-## 4.5.2
-
-**🚨 Caution: This version has been deprecated 🚨**
-
-**Patch changes**
-
-**🔄 Updated dependencies:**
-
-- @hashicorp/ember-flight-icons@5.1.1
-
 
 ---
 
-_[Read the full changelog](https://github.com/hashicorp/design-system/blob/main/packages/components/CHANGELOG.md)_
\ No newline at end of file
+_[Read the full changelog](https://github.com/hashicorp/design-system/blob/main/packages/components/CHANGELOG.md)_
diff --git a/website/docs/whats-new/release-notes/partials/flight-icons.md b/website/docs/whats-new/release-notes/partials/flight-icons.md
index ad883d66f93..f1fc51195d5 100644
--- a/website/docs/whats-new/release-notes/partials/flight-icons.md
+++ b/website/docs/whats-new/release-notes/partials/flight-icons.md
@@ -12,6 +12,16 @@
   </a>
 </p>
 
+## 3.11.1
+
+**Patch changes**
+
+Removed extra space in `PingID` name, and updated description.
+
+<small class="doc-whats-new-changelog-metadata">[#2959](https://github.com/hashicorp/design-system/pull/2959)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
 ## 3.11.0
 
 **Minor changes**
@@ -238,20 +248,6 @@ Added `Vault Secrets` icon.
 
 <small class="doc-whats-new-changelog-metadata">[#1638](https://github.com/hashicorp/design-system/pull/1638)</small>
 
-## 2.18.0
-
-**Minor changes**
-
-Added `Vercel` and `Jira` icons
-
-<small class="doc-whats-new-changelog-metadata">[#1585](https://github.com/hashicorp/design-system/pull/1585)</small>
-
-<div class="doc-whats-new-changelog-separator"></div>
-
-Added `twitter-x` icon, and older `twitter` icon. Also the `aws-cdk` and `jfrog` icons.
-
-<small class="doc-whats-new-changelog-metadata">[#1610](https://github.com/hashicorp/design-system/pull/1610)</small>
-
 
 ---