diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 118f9dab27..1b1d05ed78 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -94,9 +94,10 @@ apps/desktop/src/services/native-message-handler.service.ts @bitwarden/team-auto
 apps/desktop/src/services/native-messaging.service.ts @bitwarden/team-autofill-dev
 
 ## Component Library ##
-.storybook @bitwarden/team-component-library
-libs/components @bitwarden/team-component-library
-apps/web/src/app/layouts/header
+.storybook @bitwarden/team-design-system
+libs/components @bitwarden/team-design-system
+apps/browser/src/platform/popup/layout @bitwarden/team-design-system 
+apps/web/src/app/layouts @bitwarden/team-design-system 
 
 ## Desktop native module ##
 apps/desktop/desktop_native @bitwarden/team-platform-dev
diff --git a/.github/renovate.json b/.github/renovate.json
index e202e02667..a1200912dc 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -105,6 +105,26 @@
       "commitMessagePrefix": "[deps] Billing:",
       "reviewers": ["team:team-billing-dev"]
     },
+    {
+      "matchPackageNames": [
+        "@types/argon2-browser",
+        "@types/chrome",
+        "@types/firefox-webext-browser",
+        "@types/jquery",
+        "@types/node",
+        "@types/node-forge",
+        "argon2",
+        "argon2-browser",
+        "big-integer",
+        "node-forge",
+        "rxjs",
+        "type-fest",
+        "typescript"
+      ],
+      "description": "Platform owned dependencies",
+      "commitMessagePrefix": "[deps] Platform:",
+      "reviewers": ["team:team-platform-dev"]
+    },
     {
       "matchPackageNames": [
         "@angular-devkit/build-angular",
@@ -119,30 +139,6 @@
         "@angular/platform",
         "@angular/compiler",
         "@angular/router",
-        "@types/argon2-browser",
-        "@types/chrome",
-        "@types/firefox-webext-browser",
-        "@types/jquery",
-        "@types/node",
-        "@types/node-forge",
-        "argon2",
-        "argon2-browser",
-        "big-integer",
-        "bootstrap",
-        "jquery",
-        "node-forge",
-        "popper.js",
-        "rxjs",
-        "type-fest",
-        "typescript",
-        "zone.js"
-      ],
-      "description": "Platform owned dependencies",
-      "commitMessagePrefix": "[deps] Platform:",
-      "reviewers": ["team:team-platform-dev"]
-    },
-    {
-      "matchPackageNames": [
         "@compodoc/compodoc",
         "@ng-select/ng-select",
         "@storybook/addon-a11y",
@@ -153,17 +149,21 @@
         "@storybook/angular",
         "@types/react",
         "autoprefixer",
+        "bootstrap",
         "chromatic",
+        "jquery",
         "ngx-toastr",
+        "popper.js",
         "react",
         "react-dom",
         "remark-gfm",
         "storybook",
-        "tailwindcss"
+        "tailwindcss",
+        "zone.js"
       ],
       "description": "Component library owned dependencies",
-      "commitMessagePrefix": "[deps] Platform (CL):",
-      "reviewers": ["team:team-component-library"]
+      "commitMessagePrefix": "[deps] Design System:",
+      "reviewers": ["team:team-design-system"]
     },
     {
       "matchPackageNames": [