diff --git a/github/ipfs.yml b/github/ipfs.yml
index 1c83d28..051df19 100644
--- a/github/ipfs.yml
+++ b/github/ipfs.yml
@@ -641,15 +641,13 @@ repositories:
     squash_merge_commit_title: PR_TITLE
     teams:
       admin:
-        - admin
         - ipdx
         - kubo maintainers
-        - w3dt-stewards
       maintain:
+        - shipyard
+      push:
         - Merge - Go
         - Repos - Go
-      pull:
-        - github-mgmt stewards
     topics:
       - go
       - ipfs
@@ -3388,9 +3386,6 @@ repositories:
           restrict_dismissals: false
         required_status_checks:
           strict: true
-    collaborators:
-      admin:
-        - achingbrain
     default_branch: main
     description: Run helia as a daemon process
     files:
@@ -3408,8 +3403,8 @@ repositories:
     teams:
       admin:
         - helia-dev
-      pull:
-        - github-mgmt stewards
+      maintain:
+        - shipyard
       push:
         - Repos - JavaScript
     topics:
@@ -3424,8 +3419,6 @@ repositories:
     allow_update_branch: true
     archived: false
     collaborators:
-      admin:
-        - achingbrain
       push:
         - web3-bot
     default_branch: main
@@ -3446,9 +3439,8 @@ repositories:
       admin:
         - helia-dev
         - ipdx
-        - w3dt-stewards
-      pull:
-        - github-mgmt stewards
+      maintain:
+        - shipyard
       push:
         - Repos - JavaScript
     topics:
@@ -3458,10 +3450,6 @@ repositories:
     advanced_security: false
     allow_update_branch: true
     archived: false
-    collaborators:
-      admin:
-        - SgtPooki
-        - whizzzkid
     default_branch: main
     description: Run Helia NodeJS in a Docker Container.
     files:
@@ -3479,8 +3467,8 @@ repositories:
     teams:
       admin:
         - helia-dev
-      pull:
-        - github-mgmt stewards
+      maintain:
+        - shipyard
     topics:
       - docker
       - helia-nodejs
@@ -3496,9 +3484,6 @@ repositories:
     advanced_security: false
     allow_update_branch: false
     archived: false
-    collaborators:
-      admin:
-        - SgtPooki
     default_branch: main
     description: A library that helps Helia consumers pin content via the
       https://ipfs.github.io/pinning-services-api-spec/. Initial design at
@@ -3518,8 +3503,8 @@ repositories:
     teams:
       admin:
         - helia-dev
-      pull:
-        - github-mgmt stewards
+      maintain:
+        - shipyard
     topics:
       - helia
       - ipfs-helia
@@ -3555,9 +3540,8 @@ repositories:
       admin:
         - helia-dev
         - ipdx
-        - w3dt-stewards
-      pull:
-        - github-mgmt stewards
+      maintain:
+        - shipyard
       push:
         - Repos - JavaScript
     visibility: public
@@ -3606,9 +3590,8 @@ repositories:
       admin:
         - helia-dev
         - ipdx
-        - w3dt-stewards
-      pull:
-        - github-mgmt stewards
+      maintain:
+        - shipyard
       push:
         - Repos - JavaScript
     topics:
@@ -5213,9 +5196,7 @@ repositories:
         enforce_admins: false
         lock_branch: false
         push_restrictions:
-          - /aschmahmann
-          - /gmasgras
-          - /thattommyhall
+          - ipfs/kubo-maintainers
         require_conversation_resolution: false
         require_signed_commits: false
         required_linear_history: false
@@ -5226,8 +5207,7 @@ repositories:
         enforce_admins: false
         lock_branch: false
         push_restrictions:
-          - /aschmahmann
-          - /gmasgras
+          - ipfs/kubo-maintainers
         require_conversation_resolution: false
         require_signed_commits: false
         required_linear_history: false
@@ -5237,6 +5217,8 @@ repositories:
         blocks_creations: false
         enforce_admins: false
         lock_branch: false
+        push_restrictions:
+          - ipfs/kubo-maintainers
         require_conversation_resolution: false
         require_signed_commits: false
         required_linear_history: false
@@ -5260,11 +5242,6 @@ repositories:
         blocks_creations: false
         enforce_admins: true
         lock_branch: false
-        push_restrictions:
-          - /aschmahmann
-          - /hsanjuan
-          - /Stebalien
-          - /whyrusleeping
         require_conversation_resolution: false
         require_signed_commits: false
         required_linear_history: false
@@ -5274,12 +5251,6 @@ repositories:
         blocks_creations: false
         enforce_admins: false
         lock_branch: false
-        push_restrictions:
-          - /aschmahmann
-          - /hacdias
-          - /Jorropo
-          - /Stebalien
-          - /whyrusleeping
         require_conversation_resolution: false
         require_signed_commits: false
         required_linear_history: false
@@ -5297,11 +5268,6 @@ repositories:
             - go-test
             - sharness-test
           strict: true
-    collaborators:
-      admin:
-        - lidel
-      push:
-        - dennis-tra
     default_branch: master
     description: An IPFS implementation in Go
     files:
@@ -5318,15 +5284,12 @@ repositories:
     squash_merge_commit_title: COMMIT_OR_PR_TITLE
     teams:
       admin:
-        - admin
-        - ipdx
         - kubo maintainers
-        - w3dt-stewards
+      maintain:
+        - shipyard
       pull:
         - contributors
-        - github-mgmt stewards
       push:
-        - Maintainers
         - Merge - Go
         - Repos - Go
     topics:
@@ -5765,12 +5728,9 @@ repositories:
     squash_merge_commit_title: COMMIT_OR_PR_TITLE
     teams:
       admin:
-        - admin
-        - ipdx
         - kubo maintainers
-        - w3dt-stewards
-      pull:
-        - github-mgmt stewards
+      maintain:
+        - shipyard
     topics:
       - http
       - ipfs-gateway
@@ -5872,13 +5832,6 @@ repositories:
         require_conversation_resolution: false
         require_signed_commits: false
         required_linear_history: false
-    collaborators:
-      admin:
-        - 2color
-        - aschmahmann
-        - lidel
-        - MarcoPolo
-        - SgtPooki
     default_branch: main
     description: IPFS Gateway implemented in Service Worker
     files:
@@ -5892,9 +5845,9 @@ repositories:
     squash_merge_commit_message: COMMIT_MESSAGES
     squash_merge_commit_title: COMMIT_OR_PR_TITLE
     teams:
-      pull:
-        - github-mgmt stewards
+      admin:
         - helia-dev
+        - shipyard
     topics:
       - helia
       - ipfs-gateway
@@ -5977,12 +5930,10 @@ repositories:
     squash_merge_commit_title: COMMIT_OR_PR_TITLE
     teams:
       admin:
-        - admin
         - ipdx
         - kubo maintainers
-        - w3dt-stewards
-      pull:
-        - github-mgmt stewards
+      maintain:
+        - shipyard
     topics:
       - ipfs
       - p2p
@@ -6418,7 +6369,6 @@ teams:
       member:
         - 2color
         - SgtPooki
-        - whizzzkid
     privacy: closed
   ipdx:
     members:
@@ -6445,7 +6395,6 @@ teams:
       member:
         - aschmahmann
         - gammazero
-        - Jorropo
     privacy: closed
   Maintainers:
     description: People with Maintainer access to all repositories
@@ -6543,6 +6492,19 @@ teams:
         - vmx
         - wemeetagain
     privacy: closed
+  shipyard:
+    description: Members of Interplanetary Shipyard who work with or on IPFS
+    members:
+      maintainer:
+        - aschmahmann
+        - lidel
+      member:
+        - 2color
+        - achingbrain
+        - gammazero
+        - guillaumemichel
+        - MarcoPolo
+        - SgtPooki
   Specs Stewards:
     description: IPFS Specifications Stewards
     members: