diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index c7326c5f4e613..b31cca1080929 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -12,10 +12,12 @@ yarn.lock                                         @backstage/maintainers @backst
 /docs                                             @backstage/maintainers @backstage/documentation-maintainers
 /docs/assets/search                               @backstage/search-maintainers
 /docs/features/search                             @backstage/search-maintainers
+/docs/dls                                         @backstage/design-system-maintainers
 /docs/features/techdocs                           @backstage/techdocs-maintainers
 /docs/plugins/integrating-search-into-plugins.md  @backstage/search-maintainers
 /packages/cli/src/commands/onboard                @backstage/sharks
 /packages/backend-openapi-utils                   @backstage/maintainers @backstage/reviewers @backstage/openapi-tooling-maintainers
+/packages/canon                                   @backstage/design-system-maintainers
 /packages/techdocs-cli                            @backstage/techdocs-maintainers
 /packages/techdocs-cli-embedded-app               @backstage/techdocs-maintainers
 /plugins/api-docs                                 @backstage/maintainers @backstage/reviewers @backstage/sda-se-reviewers
diff --git a/OWNERS.md b/OWNERS.md
index 58672a20daf17..0932d3386b013 100644
--- a/OWNERS.md
+++ b/OWNERS.md
@@ -30,6 +30,17 @@ Scope: The catalog plugin and catalog model
 | Patrik Oldsberg      | Spotify      | Cubic Belugas | [Rugvip](https://github.com/Rugvip)             | `Rugvip#0019`   |
 | Vincenzo Scamporlino | Spotify      | Cubic Belugas | [vinzscam](http://github.com/vinzscam)          | `vinzscam#6944` |
 
+### Design System
+
+Team: @backstage/design-system-maintainers
+
+Scope: The Backstage design system, component library, as well as surrounding tooling such as Storybook.
+
+| Name                | Organization | Team          | GitHub                                        | Discord       |
+| ------------------- | ------------ | ------------- | --------------------------------------------- | ------------- |
+| Charles de Dreuille | Spotify      |               | [cdedreuille](https://github.com/cdedreuille) | `cdedreuille` |
+| Patrik Oldsberg     | Spotify      | Cubic Belugas | [Rugvip](https://github.com/Rugvip)           | `Rugvip`      |
+
 ### Home
 
 Team: @backstage/home-maintainers
diff --git a/packages/canon/catalog-info.yaml b/packages/canon/catalog-info.yaml
index 37aa7b1cafb02..8369c314b3ce7 100644
--- a/packages/canon/catalog-info.yaml
+++ b/packages/canon/catalog-info.yaml
@@ -6,4 +6,4 @@ metadata:
 spec:
   lifecycle: experimental
   type: backstage-web-library
-  owner: maintainers
+  owner: design-system-maintainers