diff --git a/ghost/admin/.lint-todo b/ghost/admin/.lint-todo
index 8ee2b85e45..d5754c7c05 100644
--- a/ghost/admin/.lint-todo
+++ b/ghost/admin/.lint-todo
@@ -973,3 +973,31 @@ remove|ember-template-lint|no-unused-block-params|1|0|1|0|fa339a96dc0cc3f7b98495
remove|ember-template-lint|no-unused-block-params|1|0|1|0|08ed50a248b697129b713403bcaf9549b027bd11|1662076800000|1672448400000|1677632400000|lib/koenig-editor/addon/components/koenig-card-email-cta.hbs
add|ember-template-lint|no-unused-block-params|1|0|1|0|39510f0b01fa581ee49eb4b946639301abb536f9|1662076800000|1672448400000|1677632400000|lib/koenig-editor/addon/components/koenig-card-button.hbs
add|ember-template-lint|no-unused-block-params|1|0|1|0|6640f2d788e2ebf173ee6ae789259ca65c097404|1662076800000|1672448400000|1677632400000|lib/koenig-editor/addon/components/koenig-card-email-cta.hbs
+add|ember-template-lint|no-action|14|39|14|39|913b0cf6525ac677112a899b2b0f15e07fbf204a|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|no-action|66|35|66|35|39b616c69eeb0dc420dc1430e0ecd38668f4d3fa|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|no-action|81|35|81|35|9b8af5e8622a324a4f80d12a88e2af649e742fe6|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|no-action|93|28|93|28|0b3589b667ef29b9e01bb49bd2645db31eceed1a|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|no-action|94|28|94|28|be80faed6c7a41a2ac377b4f6d3eece8b858408c|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|no-action|108|63|108|63|3cbb83b28eaf63d37b15aa99151bac2a301a4b41|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|no-action|124|43|124|43|4a1f665e2bd695f7db25f2a126670a524a3a112b|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|no-action|139|43|139|43|763dced49c969df89ec39d7258b70c1e91c74c67|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|no-action|151|43|151|43|b0ec7092966648e6ba28055946b1fff735f8c08d|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|no-action|182|63|182|63|afe185fdf8e3368a25e965330d4fca4da08b63a7|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|no-action|196|40|196|40|d2abbb4bb55b6cb1131ca0bc56c31632b32b980c|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|no-action|197|40|197|40|3ede83bd64d206d665edb4f1b73f03b4122edfad|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|no-action|208|43|208|43|c742c00638da1ba8d067d21307f96e57df44c2b7|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|no-action|223|43|223|43|bd00aa5009b99f82b02b9ea6ddf65ba8fa74d1ad|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|no-action|276|63|276|63|4842445c912ca9073389537718b6fe02c3e621e3|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|no-action|290|40|290|40|32101c0834d9e8d2caa87dee9cb1a92fe633cfde|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|no-action|291|40|291|40|c8a82286cfe4220cb2d8a059b1daf7f6c8d54cf5|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|no-action|302|43|302|43|fd3e947561e280e8a04867bfb9143df32dec0aa9|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|no-action|317|43|317|43|b8cf39b2313c6eaa9d4e9042eaf133079b6a5743|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|no-action|371|63|371|63|fad67fa01283f9b309c508725105158c3243b324|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|no-action|383|34|383|34|74ae86c6b029ad523f821e7385eeb58bc2ab4975|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|no-action|385|32|385|32|cc59d0154028a8f107aaaea52ea6d9e8710b3f83|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|no-action|396|34|396|34|406ce271cdc31541e8199b7729098b4392dc133e|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|no-action|398|32|398|32|2b3c6732bdd27bdef2d535007c670f1f4286db0e|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|no-passed-in-event-handlers|383|24|383|24|d8b5d7c4140d1dc6151eb7486382da38928232b0|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|no-passed-in-event-handlers|396|24|396|24|3e1dad0fb19c62adea14c5534d52cd95cfad280a|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|require-input-label|30|28|30|28|af62541280c3dc86d2ca7a4be8c980ee164fba5a|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
+add|ember-template-lint|require-input-label|47|32|47|32|8e299cf5bf0e93e054410239451997a196933d25|1662508800000|1672880400000|1678064400000|app/components/tags/tag-form.hbs
diff --git a/ghost/admin/app/components/gh-tags-list-item.hbs b/ghost/admin/app/components/tags/list-item.hbs
similarity index 100%
rename from ghost/admin/app/components/gh-tags-list-item.hbs
rename to ghost/admin/app/components/tags/list-item.hbs
diff --git a/ghost/admin/app/components/gh-tag-settings-form.hbs b/ghost/admin/app/components/tags/tag-form.hbs
similarity index 100%
rename from ghost/admin/app/components/gh-tag-settings-form.hbs
rename to ghost/admin/app/components/tags/tag-form.hbs
diff --git a/ghost/admin/app/components/gh-tag-settings-form.js b/ghost/admin/app/components/tags/tag-form.js
similarity index 100%
rename from ghost/admin/app/components/gh-tag-settings-form.js
rename to ghost/admin/app/components/tags/tag-form.js
diff --git a/ghost/admin/app/templates/tag.hbs b/ghost/admin/app/templates/tag.hbs
index 04cc2e25d2..f0a49e1f9c 100644
--- a/ghost/admin/app/templates/tag.hbs
+++ b/ghost/admin/app/templates/tag.hbs
@@ -11,7 +11,7 @@
-