diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7a1aa55..8cf56c7 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @contentful/team-developer-experience
\ No newline at end of file
+* @contentful/team-tundra
\ No newline at end of file
diff --git a/catalog-info.yaml b/catalog-info.yaml
index 6e73d16..f6a8349 100644
--- a/catalog-info.yaml
+++ b/catalog-info.yaml
@@ -11,4 +11,4 @@ metadata:
 spec:
   type: library
   lifecycle: production
-  owner: group:team-developer-experience
+  owner: group:team-tundra