diff --git a/.changeset/brave-planets-reply.md b/.changeset/brave-planets-reply.md
deleted file mode 100644
index d2c1add4e5..0000000000
--- a/.changeset/brave-planets-reply.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@primer/view-components": patch
----
-
-Fixing whitespace in rendered LinkComponent
diff --git a/.changeset/four-adults-guess.md b/.changeset/four-adults-guess.md
deleted file mode 100644
index 7fc9966f33..0000000000
--- a/.changeset/four-adults-guess.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@primer/view-components': patch
----
-
-Revert removal of BlankslateComponent
diff --git a/.changeset/nice-ears-give.md b/.changeset/nice-ears-give.md
deleted file mode 100644
index 6d9ea2df29..0000000000
--- a/.changeset/nice-ears-give.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@primer/view-components': patch
----
-
-Use a custom form builder; introduce primer_form_for
diff --git a/.changeset/rare-coins-move.md b/.changeset/rare-coins-move.md
deleted file mode 100644
index ffb272611b..0000000000
--- a/.changeset/rare-coins-move.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@primer/view-components': patch
----
-
-updating component migrator script with improvements in component reference updates, deprecations, etc.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0367ed0df9..17164909e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # CHANGELOG
 
+## 0.0.87
+
+### Patch Changes
+
+- [#1274](https://github.com/primer/view_components/pull/1274) [`c153f734`](https://github.com/primer/view_components/commit/c153f734a891fc3bc7dfc3bed34630ff38ab39d7) Thanks [@jonrohan](https://github.com/jonrohan)! - Fixing whitespace in rendered LinkComponent
+
+* [#1273](https://github.com/primer/view_components/pull/1273) [`f38517ac`](https://github.com/primer/view_components/commit/f38517acf1aed43b27f2c6b94634d70b124883e6) Thanks [@camertron](https://github.com/camertron)! - Revert removal of BlankslateComponent
+
+- [#1270](https://github.com/primer/view_components/pull/1270) [`44919308`](https://github.com/primer/view_components/commit/4491930812d16a9bcb5d8f05b4d94e49e469afa5) Thanks [@camertron](https://github.com/camertron)! - Use a custom form builder; introduce primer_form_for
+
+* [#1269](https://github.com/primer/view_components/pull/1269) [`9ae9615f`](https://github.com/primer/view_components/commit/9ae9615f31acf43875feb89661cac6311527f9fd) Thanks [@mxriverlynn](https://github.com/mxriverlynn)! - updating component migrator script with improvements in component reference updates, deprecations, etc.
+
+- [#1276](https://github.com/primer/view_components/pull/1276) [`759ea56f`](https://github.com/primer/view_components/commit/759ea56f00cbe3e536f4e558a9fb9a3e1b89bf7b) Thanks [@mxriverlynn](https://github.com/mxriverlynn)! - correcting the updates to nav.yml in the component status migrator
+
 ## 0.0.86
 
 ### Patch Changes
diff --git a/Gemfile.lock b/Gemfile.lock
index b6ea25c1cf..352b6505ac 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    primer_view_components (0.0.86)
+    primer_view_components (0.0.87)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
       octicons (>= 17.0.0)
diff --git a/component_status_migrator.thor b/component_status_migrator.thor
index 5d560097dd..6fff0d4a9c 100644
--- a/component_status_migrator.thor
+++ b/component_status_migrator.thor
@@ -72,7 +72,9 @@ class ComponentStatusMigrator < Thor::Group
   end
 
   def rename_nav_entry
-    gsub_file("docs/src/@primer/gatsby-theme-doctocat/nav.yml", "class #{name}", name_without_suffix)
+    nav_file = "docs/src/@primer/gatsby-theme-doctocat/nav.yml"
+    gsub_file(nav_file, "title: #{name}", "title: #{name_without_suffix}")
+    gsub_file(nav_file, "url: \"/components/#{name_without_suffix.downcase}\"", "url: \"/components/#{status_url}#{name_without_suffix.downcase}\"")
   end
 
   def update_all_references
@@ -219,14 +221,19 @@ class ComponentStatusMigrator < Thor::Group
     @status ||= options[:status].downcase
   end
 
+  def status_url
+    @status_url ||= "#{status}/" unless stable?
+  end
+
   def name_without_suffix
-    name.gsub("Component", "")
+    @name_without_suffix ||= name.gsub("Component", "")
   end
 
   def short_name
-    name_with_status = name.gsub(/Primer::|Component/, "")
-
-    m = name_with_status.match(/(?<status>Beta|Alpha|Deprecated)?(?<_colons>::)?(?<name>.*)/)
-    m[:name].gsub("::", "").downcase
+    @short_name ||= begin
+      name_with_status = name.gsub(/Primer::|Component/, "")
+      m = name_with_status.match(/(?<status>Beta|Alpha|Deprecated)?(?<_colons>::)?(?<name>.*)/)
+      m[:name].gsub("::", "").downcase
+    end
   end
 end
diff --git a/demo/Gemfile.lock b/demo/Gemfile.lock
index c0844ec93d..c3aff34843 100644
--- a/demo/Gemfile.lock
+++ b/demo/Gemfile.lock
@@ -20,7 +20,7 @@ GIT
 PATH
   remote: ..
   specs:
-    primer_view_components (0.0.86)
+    primer_view_components (0.0.87)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
       octicons (>= 17.0.0)
diff --git a/lib/primer/view_components/version.rb b/lib/primer/view_components/version.rb
index 705de9dcb3..6290a7725c 100644
--- a/lib/primer/view_components/version.rb
+++ b/lib/primer/view_components/version.rb
@@ -5,7 +5,7 @@ module ViewComponents
     module VERSION
       MAJOR = 0
       MINOR = 0
-      PATCH = 86
+      PATCH = 87
 
       STRING = [MAJOR, MINOR, PATCH].join(".")
     end
diff --git a/package.json b/package.json
index af0ca76030..5826c8107e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@primer/view-components",
-  "version": "0.0.86",
+  "version": "0.0.87",
   "description": "ViewComponents for the Primer Design System",
   "main": "app/assets/javascripts/primer_view_components.js",
   "module": "app/components/primer/primer.js",