diff --git a/.changeset/fair-grapes-joke.md b/.changeset/fair-grapes-joke.md
new file mode 100644
index 0000000000..5abfa0bb50
--- /dev/null
+++ b/.changeset/fair-grapes-joke.md
@@ -0,0 +1,5 @@
+---
+'@backstage/create-app': patch
+---
+
+Register the `TechDocs` addons on the catalog page and also test their rendering in `EntityDocs` sub pages.
diff --git a/.changeset/techdocs-buttons-film.md b/.changeset/techdocs-buttons-film.md
new file mode 100644
index 0000000000..46895ff7ce
--- /dev/null
+++ b/.changeset/techdocs-buttons-film.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-techdocs': patch
+---
+
+Fix `EntityDocs` component to use objects instead of `<Route>` elements, otherwise "outlet" will be null on sub-pages and add-ons won't render.