diff --git a/.changeset/blue-gorillas-lie.md b/.changeset/blue-gorillas-lie.md
deleted file mode 100644
index b6268336b63..00000000000
--- a/.changeset/blue-gorillas-lie.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@primer/react': major
----
-
-Update styled-components and related dependencies to v5.x
-
-<!-- Changed components: _none_ -->
diff --git a/.changeset/clever-wolves-move.md b/.changeset/clever-wolves-move.md
deleted file mode 100644
index 05364569593..00000000000
--- a/.changeset/clever-wolves-move.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-'@primer/react': major
----
-
-Remove components from deprecated
-- `BorderBox`, `ChoiceFieldset`, `Flex`, `Grid`, `Position`, `Dropdown`, `FormGroup`, `SelectMenu`, `InputField`, `Label`
-
-<!-- Changed components: _none_ -->
diff --git a/.changeset/early-timers-speak.md b/.changeset/early-timers-speak.md
deleted file mode 100644
index 41ccecac220..00000000000
--- a/.changeset/early-timers-speak.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-'@primer/react': major
----
-
-Remove components from draft bundle
-
-* Move UnderlineNav2 (draft) to the main bundle
-    
-```diff 
-- import {UnderlineNav} from '@primer/react/drafts'
-+ import {UnderlineNav} from '@primer/react'
-```
-
-....
-* Remove TreeView from drafts
-
-```diff
-- import {TreeView} from '@primer/react/drafts'
-+ import {TreeView} from '@primer/react'
-```
-
-* Remove SegmentedControl from drafts
-
-```diff
-- import {SegmentedControl} from '@primer/react/drafts'
-+ import {SegmentedControl} from '@primer/react'
-```
-
-* Remove NavList from drafts
-
-```diff
-- import {NavList} from '@primer/react/drafts'
-+ import {NavList} from '@primer/react'
-```
-
-* Remove SplitPageLayout from drafts
-
-```diff
-- import {SplitPageLayout} from '@primer/react/drafts'
-+ import {SplitPageLayout} from '@primer/react'
-```
-
-<!-- Changed components: UnderlineNav, TreeView, SegmentedControl, NavList, SplitPageLayout -->
diff --git a/.changeset/few-rocks-run.md b/.changeset/few-rocks-run.md
deleted file mode 100644
index 4a4276a6e9f..00000000000
--- a/.changeset/few-rocks-run.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@primer/react': patch
----
-
-Fixes type errors that appeared during v36 development. Likely caused by Button updates
diff --git a/.changeset/flat-onions-sort.md b/.changeset/flat-onions-sort.md
deleted file mode 100644
index 50ba08cfec0..00000000000
--- a/.changeset/flat-onions-sort.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-"@primer/react": major
----
-
-- Changes `leadingIcon` and `trailingIcon` to `leadingVisual` and `trailingVisual`
-- Removes `Button.Counter` as a child component, replacing it with a `count` prop. This change allows us to use the `trailingVisual` slot for counters.
-- Removes the `outline` button variant as we wish to only support `invisible` buttons.
diff --git a/.changeset/giant-bobcats-deliver.md b/.changeset/giant-bobcats-deliver.md
deleted file mode 100644
index ada0448a3f7..00000000000
--- a/.changeset/giant-bobcats-deliver.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@primer/react': patch
----
-
-Update ActionList to place `id` on item with an ARIA role
-
-<!-- Changed components: ActionList -->
diff --git a/.changeset/great-spies-deliver.md b/.changeset/great-spies-deliver.md
deleted file mode 100644
index 3a8005ec2ef..00000000000
--- a/.changeset/great-spies-deliver.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@primer/react': major
----
-
-Remove deprecated `extralarge` variant from `Token` and `TextInputWithToken` component
diff --git a/.changeset/happy-rivers-attend.md b/.changeset/happy-rivers-attend.md
deleted file mode 100644
index 82def6ab5a5..00000000000
--- a/.changeset/happy-rivers-attend.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-"@primer/react": minor
----
-
-Updates link styles to support underline link preferences.
-
-<!-- Changed components: ActionList, BranchName, Breadcrumbs, Button, Button2, Heading, Link -->
diff --git a/.changeset/kind-readers-grab.md b/.changeset/kind-readers-grab.md
deleted file mode 100644
index 9d4356c9a2c..00000000000
--- a/.changeset/kind-readers-grab.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-"@primer/react": major
----
-
-Remove StyledOcticon component. The component was renamed to `Octicon`. Update your imports by swapping `StyledOcticon` with `Octicon`
-
-<!-- Changed components: Octicon -->
diff --git a/.changeset/lemon-dancers-marry.md b/.changeset/lemon-dancers-marry.md
deleted file mode 100644
index 5b1d1d8f81f..00000000000
--- a/.changeset/lemon-dancers-marry.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@primer/react': major
----
-
-Deprecates FilterList and FilteredSearch components
diff --git a/.changeset/lovely-windows-juggle.md b/.changeset/lovely-windows-juggle.md
deleted file mode 100644
index 59c50d1d53a..00000000000
--- a/.changeset/lovely-windows-juggle.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@primer/react': major
----
-
-Makes @types/styled-components an optional peer dependency, not a dependency
diff --git a/.changeset/lucky-coins-guess.md b/.changeset/lucky-coins-guess.md
deleted file mode 100644
index 6377f43d809..00000000000
--- a/.changeset/lucky-coins-guess.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@primer/react": patch
----
-
-Use createRoot instead of ReactDOM.render for React 18 compatibility.
diff --git a/.changeset/nasty-bottles-draw.md b/.changeset/nasty-bottles-draw.md
deleted file mode 100644
index 8ee2c976d5a..00000000000
--- a/.changeset/nasty-bottles-draw.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@primer/react': major
----
-
-Update minimum version for react and react-dom to v18
diff --git a/.changeset/nine-news-walk.md b/.changeset/nine-news-walk.md
deleted file mode 100644
index c5ae12cd1cb..00000000000
--- a/.changeset/nine-news-walk.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@primer/react': major
----
-
-Remove `DropdownButton` and `DropdownMenu` from deprecated and update the usages across
-
-<!-- Changed components: SelectPanel, ActionList -->
diff --git a/.changeset/odd-socks-hunt.md b/.changeset/odd-socks-hunt.md
deleted file mode 100644
index 7843ed2f006..00000000000
--- a/.changeset/odd-socks-hunt.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@primer/react': major
----
-
-The Autocomplete component no longer uses the deprecated ActionList component. There have been minor API updates, but it's largely the same.
diff --git a/.changeset/old-coats-sniff.md b/.changeset/old-coats-sniff.md
deleted file mode 100644
index a5ab61e987d..00000000000
--- a/.changeset/old-coats-sniff.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@primer/react': major
----
-
-Removes 'warning' option from form components' `validationStatus` props
diff --git a/.changeset/poor-wasps-stare.md b/.changeset/poor-wasps-stare.md
deleted file mode 100644
index deca619ad6a..00000000000
--- a/.changeset/poor-wasps-stare.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-"@primer/react": patch
----
-
-Use IconButton instead of ButtonClose in v1 Dialog.
-
-<!-- Changed components: Dialog -->
diff --git a/.changeset/popular-rivers-warn.md b/.changeset/popular-rivers-warn.md
deleted file mode 100644
index 9e94618d6b6..00000000000
--- a/.changeset/popular-rivers-warn.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@primer/react': major
----
-
-Remove support for `activeClassName` for Breadcrumb, SubNav, TabNav, UnderlineNav
diff --git a/.changeset/purple-panthers-accept.md b/.changeset/purple-panthers-accept.md
deleted file mode 100644
index 11443b511e1..00000000000
--- a/.changeset/purple-panthers-accept.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-'@primer/react': patch
----
-
-Button: Allow leadingIcon, trailingIcon, trailingAction to be overridable with sx
-
-<!-- Changed components: Button -->
diff --git a/.changeset/shaggy-insects-march.md b/.changeset/shaggy-insects-march.md
deleted file mode 100644
index 7aac422843e..00000000000
--- a/.changeset/shaggy-insects-march.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@primer/react": major
----
-
-Ensure ActionList item has `border-radius` on hover with `full` variant
diff --git a/.changeset/weak-jokes-chew.md b/.changeset/weak-jokes-chew.md
deleted file mode 100644
index 1c2445cec20..00000000000
--- a/.changeset/weak-jokes-chew.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@primer/react": patch
----
-
-FilteredActionList now uses new ActionList as a base, and SelectPanel reflects those changes.
diff --git a/.changeset/wise-boxes-peel.md b/.changeset/wise-boxes-peel.md
deleted file mode 100644
index 406b91a61d1..00000000000
--- a/.changeset/wise-boxes-peel.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-"@primer/react": patch
----
-
-Revert "Add aria-selected value to ActionList.Item."
-
-<!-- Changed components: ActionList -->
diff --git a/.changeset/yellow-windows-accept.md b/.changeset/yellow-windows-accept.md
deleted file mode 100644
index 79b7a1079fb..00000000000
--- a/.changeset/yellow-windows-accept.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@primer/react": major
----
-
-Removes PageLayout.Pane position prop.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d6c6628367..e05b0493324 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,121 @@
 # @primer/components
 
+## 36.0.0
+
+### Major Changes
+
+- [#3569](https://github.com/primer/react/pull/3569) [`22434e2d`](https://github.com/primer/react/commit/22434e2daa2998e3735c3a6a996b709066c5465e) Thanks [@joshblack](https://github.com/joshblack)! - Update styled-components and related dependencies to v5.x
+
+  <!-- Changed components: _none_ -->
+
+- [#3542](https://github.com/primer/react/pull/3542) [`8f7186af`](https://github.com/primer/react/commit/8f7186afcfa131c14add762cf49be7abc1b6cc0d) Thanks [@broccolinisoup](https://github.com/broccolinisoup)! - Remove components from deprecated
+
+  - `BorderBox`, `ChoiceFieldset`, `Flex`, `Grid`, `Position`, `Dropdown`, `FormGroup`, `SelectMenu`, `InputField`, `Label`
+
+  <!-- Changed components: _none_ -->
+
+- [#3260](https://github.com/primer/react/pull/3260) [`52c8d220`](https://github.com/primer/react/commit/52c8d220c68143d15b40f5c58a87b9ccb0307a71) Thanks [@broccolinisoup](https://github.com/broccolinisoup)! - Remove components from draft bundle
+
+  - Move UnderlineNav2 (draft) to the main bundle
+
+  ```diff
+  - import {UnderlineNav} from '@primer/react/drafts'
+  + import {UnderlineNav} from '@primer/react'
+  ```
+
+  ....
+
+  - Remove TreeView from drafts
+
+  ```diff
+  - import {TreeView} from '@primer/react/drafts'
+  + import {TreeView} from '@primer/react'
+  ```
+
+  - Remove SegmentedControl from drafts
+
+  ```diff
+  - import {SegmentedControl} from '@primer/react/drafts'
+  + import {SegmentedControl} from '@primer/react'
+  ```
+
+  - Remove NavList from drafts
+
+  ```diff
+  - import {NavList} from '@primer/react/drafts'
+  + import {NavList} from '@primer/react'
+  ```
+
+  - Remove SplitPageLayout from drafts
+
+  ```diff
+  - import {SplitPageLayout} from '@primer/react/drafts'
+  + import {SplitPageLayout} from '@primer/react'
+  ```
+
+  <!-- Changed components: UnderlineNav, TreeView, SegmentedControl, NavList, SplitPageLayout -->
+
+- [#2893](https://github.com/primer/react/pull/2893) [`98ea43fa`](https://github.com/primer/react/commit/98ea43fa01d78e11ba1088f149704c6c2da8a906) Thanks [@langermank](https://github.com/langermank)! - - Changes `leadingIcon` and `trailingIcon` to `leadingVisual` and `trailingVisual`
+
+  - Removes `Button.Counter` as a child component, replacing it with a `count` prop. This change allows us to use the `trailingVisual` slot for counters.
+  - Removes the `outline` button variant as we wish to only support `invisible` buttons.
+
+- [#3313](https://github.com/primer/react/pull/3313) [`77d4042f`](https://github.com/primer/react/commit/77d4042fc4b3ef701eb5d8610a77041d8e857a53) Thanks [@broccolinisoup](https://github.com/broccolinisoup)! - Remove deprecated `extralarge` variant from `Token` and `TextInputWithToken` component
+
+- [#3735](https://github.com/primer/react/pull/3735) [`5676ffc1`](https://github.com/primer/react/commit/5676ffc1ec5cc01de56941b4a27ce6f63ce5beaa) Thanks [@jonrohan](https://github.com/jonrohan)! - Remove StyledOcticon component. The component was renamed to `Octicon`. Update your imports by swapping `StyledOcticon` with `Octicon`
+
+  <!-- Changed components: Octicon -->
+
+- [#3396](https://github.com/primer/react/pull/3396) [`318f9d6d`](https://github.com/primer/react/commit/318f9d6d0d94594658bbe82f70260e2959d8f9f9) Thanks [@mperrotti](https://github.com/mperrotti)! - Deprecates FilterList and FilteredSearch components
+
+- [#3399](https://github.com/primer/react/pull/3399) [`d5f394ea`](https://github.com/primer/react/commit/d5f394eab87cde6021278e44b0226b3fdfa9b172) Thanks [@mperrotti](https://github.com/mperrotti)! - Makes @types/styled-components an optional peer dependency, not a dependency
+
+- [#3240](https://github.com/primer/react/pull/3240) [`5d7d55b0`](https://github.com/primer/react/commit/5d7d55b09ca4bcd98361c89081e7fe16970c4029) Thanks [@joshblack](https://github.com/joshblack)! - Update minimum version for react and react-dom to v18
+
+- [#3544](https://github.com/primer/react/pull/3544) [`134f2658`](https://github.com/primer/react/commit/134f2658f0e73478d84b9caa942748dcef1b4192) Thanks [@broccolinisoup](https://github.com/broccolinisoup)! - Remove `DropdownButton` and `DropdownMenu` from deprecated and update the usages across
+
+  <!-- Changed components: SelectPanel, ActionList -->
+
+- [#3387](https://github.com/primer/react/pull/3387) [`a8dbf4a5`](https://github.com/primer/react/commit/a8dbf4a5e8a773ff36ffde582410a7acb143a764) Thanks [@mperrotti](https://github.com/mperrotti)! - The Autocomplete component no longer uses the deprecated ActionList component. There have been minor API updates, but it's largely the same.
+
+- [#3414](https://github.com/primer/react/pull/3414) [`eab4d15c`](https://github.com/primer/react/commit/eab4d15cf1e0048858ded9cb6f1ba67eb5231426) Thanks [@mperrotti](https://github.com/mperrotti)! - Removes 'warning' option from form components' `validationStatus` props
+
+- [#3319](https://github.com/primer/react/pull/3319) [`5d31e628`](https://github.com/primer/react/commit/5d31e6284b8877080aa9baf02ee9f1c2a92255b0) Thanks [@broccolinisoup](https://github.com/broccolinisoup)! - Remove support for `activeClassName` for Breadcrumb, SubNav, TabNav, UnderlineNav
+
+- [#3556](https://github.com/primer/react/pull/3556) [`ce628a9b`](https://github.com/primer/react/commit/ce628a9bcdeb44c74db5e5c57ba8d2cd383b3635) Thanks [@langermank](https://github.com/langermank)! - Ensure ActionList item has `border-radius` on hover with `full` variant
+
+- [#3386](https://github.com/primer/react/pull/3386) [`7821267f`](https://github.com/primer/react/commit/7821267f3b3856ed753f68cbf29b0e5a25edaac0) Thanks [@radglob](https://github.com/radglob)! - Removes PageLayout.Pane position prop.
+
+### Minor Changes
+
+- [#3720](https://github.com/primer/react/pull/3720) [`521b02f4`](https://github.com/primer/react/commit/521b02f4fa1fcba6375f3642e0cf1a9b01a4bda7) Thanks [@mperrotti](https://github.com/mperrotti)! - Updates link styles to support underline link preferences.
+
+  <!-- Changed components: ActionList, BranchName, Breadcrumbs, Button, Button2, Heading, Link -->
+
+### Patch Changes
+
+- [#3456](https://github.com/primer/react/pull/3456) [`6df7ae21`](https://github.com/primer/react/commit/6df7ae218f7320e71ab24b7937f2452259489491) Thanks [@mperrotti](https://github.com/mperrotti)! - Fixes type errors that appeared during v36 development. Likely caused by Button updates
+
+- [#3691](https://github.com/primer/react/pull/3691) [`f4648b19`](https://github.com/primer/react/commit/f4648b19d664ba07d4a921bcafadd26f151093bd) Thanks [@joshblack](https://github.com/joshblack)! - Update ActionList to place `id` on item with an ARIA role
+
+  <!-- Changed components: ActionList -->
+
+- [#3367](https://github.com/primer/react/pull/3367) [`3a701364`](https://github.com/primer/react/commit/3a701364aa77e24764a468de29602bc90142bbea) Thanks [@radglob](https://github.com/radglob)! - Use createRoot instead of ReactDOM.render for React 18 compatibility.
+
+- [#3557](https://github.com/primer/react/pull/3557) [`b0fc071c`](https://github.com/primer/react/commit/b0fc071c8954c051987800baa51ead4134dd955a) Thanks [@radglob](https://github.com/radglob)! - Use IconButton instead of ButtonClose in v1 Dialog.
+
+  <!-- Changed components: Dialog -->
+
+- [#3683](https://github.com/primer/react/pull/3683) [`a84a1498`](https://github.com/primer/react/commit/a84a149826f658ddca715c4948d5a5002a648e4e) Thanks [@broccolinisoup](https://github.com/broccolinisoup)! - Button: Allow leadingIcon, trailingIcon, trailingAction to be overridable with sx
+
+  <!-- Changed components: Button -->
+
+- [#3354](https://github.com/primer/react/pull/3354) [`d848aa51`](https://github.com/primer/react/commit/d848aa51d538ea8ba4f85e443f6c39a4c826a0b8) Thanks [@joshblack](https://github.com/joshblack)! - FilteredActionList now uses new ActionList as a base, and SelectPanel reflects those changes.
+
+- [#3784](https://github.com/primer/react/pull/3784) [`6f4fe7d2`](https://github.com/primer/react/commit/6f4fe7d2a91786569f2f1492168268c58eca2b53) Thanks [@radglob](https://github.com/radglob)! - Revert "Add aria-selected value to ActionList.Item."
+
+  <!-- Changed components: ActionList -->
+
 ## 35.31.0
 
 ### Minor Changes
diff --git a/package.json b/package.json
index 27e428960e1..3b8a0b2613d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@primer/react",
-  "version": "35.31.0",
+  "version": "36.0.0",
   "description": "An implementation of GitHub's Primer Design System using React",
   "main": "lib/index.js",
   "module": "lib-esm/index.js",