From 66567f800e8b924edb8c5f2d0c5b4010ba8efa31 Mon Sep 17 00:00:00 2001
From: Jiaying Wang <42981373+jennijuju@users.noreply.github.com>
Date: Wed, 4 Jun 2025 18:54:30 -0400
Subject: [PATCH 1/3] Update FilOzone.yml

---
 github/FilOzone.yml | 40 +++++++---------------------------------
 1 file changed, 7 insertions(+), 33 deletions(-)

diff --git a/github/FilOzone.yml b/github/FilOzone.yml
index a8d7b28..9cea5da 100644
--- a/github/FilOzone.yml
+++ b/github/FilOzone.yml
@@ -28,7 +28,7 @@ repositories:
     archived: false
     collaborators:
       admin:
-        - shrenujbansal
+        - ZenGround0
       push:
         - aashidham
         - masih
@@ -104,7 +104,6 @@ repositories:
     collaborators:
       admin:
         - jennijuju
-        - shrenujbansal
         - snissn
       maintain:
         - elizabeth-griffiths
@@ -146,32 +145,6 @@ repositories:
     squash_merge_commit_title: COMMIT_OR_PR_TITLE
     visibility: public
     web_commit_signoff_required: false
-  filecoin-services:
-    advanced_security: false
-    allow_update_branch: false
-    archived: false
-    collaborators:
-      admin:
-        - aarshkshah1992
-        - rjan90
-        - ZenGround0
-      maintain:
-        - rvagg
-      push:
-        - silent-cipher
-    has_discussions: false
-    merge_commit_message: PR_TITLE
-    merge_commit_title: MERGE_MESSAGE
-    secret_scanning_push_protection: true
-    secret_scanning: true
-    squash_merge_commit_message: COMMIT_MESSAGES
-    squash_merge_commit_title: COMMIT_OR_PR_TITLE
-    teams:
-      push:
-        - filoz-fs
-        - SpaceMeridian
-    visibility: public
-    web_commit_signoff_required: false
   FilForwarder:
     advanced_security: false
     allow_update_branch: false
@@ -476,11 +449,12 @@ repositories:
     collaborators:
       admin:
         - momack2
-        - rjan90
         - rvagg
         - ZenGround0
+        - jennijuju
       maintain:
         - aarshkshah1992
+        - rjan90
       push:
         - masih
         - timfong888
@@ -506,13 +480,14 @@ teams:
         - jennijuju
         - momack2
         - rjan90
-        - ZenGround0
       member:
+        - ZenGround0
         - aarshkshah1992
         - masih
         - rvagg
         - timfong888
         - TippyFlitsUK
+        - BigLep
   github-mgmt approvers:
     # Notes:
     # 1. These members have triage access to the github-mgmt repository.
@@ -570,10 +545,9 @@ teams:
     create_default_maintainer: false
     members:
       maintainer:
-        - jennijuju
-      member:
+        - patrickwoodhead
         - bajtos
+      member:
         - juliangruber
         - NikolasHaimerl
-        - patrickwoodhead
         - pyropy

From d358ba2066037900a913226474a180c938b2ff16 Mon Sep 17 00:00:00 2001
From: Jiaying Wang <42981373+jennijuju@users.noreply.github.com>
Date: Wed, 4 Jun 2025 18:57:08 -0400
Subject: [PATCH 2/3] Update FilOzone.yml

---
 github/FilOzone.yml | 43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/github/FilOzone.yml b/github/FilOzone.yml
index a8d7b28..4966a9c 100644
--- a/github/FilOzone.yml
+++ b/github/FilOzone.yml
@@ -224,22 +224,33 @@ repositories:
     squash_merge_commit_title: PR_TITLE
     visibility: public
     web_commit_signoff_required: false
-  fws-website:
-    advanced_security: false
-    allow_update_branch: false
-    archived: false
-    collaborators:
-      admin:
-        - jennijuju
-    has_discussions: false
-    merge_commit_message: PR_TITLE
-    merge_commit_title: MERGE_MESSAGE
-    secret_scanning_push_protection: false
-    secret_scanning: false
-    squash_merge_commit_message: COMMIT_MESSAGES
-    squash_merge_commit_title: COMMIT_OR_PR_TITLE
-    visibility: private
-    web_commit_signoff_required: false
+  filecoin-services:
+      advanced_security: false
+      allow_update_branch: false
+      archived: false
+      collaborators:
+        admin:
+          - jennijuju
+          - aarshkshah1992
+          - ZenGround0
+        maintain:
+          - rvagg
+          - rjan90
+        push:
+          - silent-cipher
+      has_discussions: false
+      merge_commit_message: PR_TITLE
+      merge_commit_title: MERGE_MESSAGE
+      secret_scanning_push_protection: true
+      secret_scanning: true
+      squash_merge_commit_message: COMMIT_MESSAGES
+      squash_merge_commit_title: COMMIT_OR_PR_TITLE
+      teams:
+        push:
+          - filoz-fs
+          - SpaceMeridian
+      visibility: public
+      web_commit_signoff_required: false
   gas-model:
     advanced_security: false
     allow_update_branch: false

From dff13822e6046434d72ff4ef674ea1565fba7291 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 4 Jun 2025 22:59:22 +0000
Subject: [PATCH 3/3] fix@15454451013 [skip fix]

---
 github/FilOzone.yml | 62 ++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/github/FilOzone.yml b/github/FilOzone.yml
index c927abf..a643823 100644
--- a/github/FilOzone.yml
+++ b/github/FilOzone.yml
@@ -145,6 +145,33 @@ repositories:
     squash_merge_commit_title: COMMIT_OR_PR_TITLE
     visibility: public
     web_commit_signoff_required: false
+  filecoin-services:
+    advanced_security: false
+    allow_update_branch: false
+    archived: false
+    collaborators:
+      admin:
+        - aarshkshah1992
+        - jennijuju
+        - ZenGround0
+      maintain:
+        - rjan90
+        - rvagg
+      push:
+        - silent-cipher
+    has_discussions: false
+    merge_commit_message: PR_TITLE
+    merge_commit_title: MERGE_MESSAGE
+    secret_scanning_push_protection: true
+    secret_scanning: true
+    squash_merge_commit_message: COMMIT_MESSAGES
+    squash_merge_commit_title: COMMIT_OR_PR_TITLE
+    teams:
+      push:
+        - filoz-fs
+        - SpaceMeridian
+    visibility: public
+    web_commit_signoff_required: false
   FilForwarder:
     advanced_security: false
     allow_update_branch: false
@@ -197,33 +224,6 @@ repositories:
     squash_merge_commit_title: PR_TITLE
     visibility: public
     web_commit_signoff_required: false
-  filecoin-services:
-      advanced_security: false
-      allow_update_branch: false
-      archived: false
-      collaborators:
-        admin:
-          - jennijuju
-          - aarshkshah1992
-          - ZenGround0
-        maintain:
-          - rvagg
-          - rjan90
-        push:
-          - silent-cipher
-      has_discussions: false
-      merge_commit_message: PR_TITLE
-      merge_commit_title: MERGE_MESSAGE
-      secret_scanning_push_protection: true
-      secret_scanning: true
-      squash_merge_commit_message: COMMIT_MESSAGES
-      squash_merge_commit_title: COMMIT_OR_PR_TITLE
-      teams:
-        push:
-          - filoz-fs
-          - SpaceMeridian
-      visibility: public
-      web_commit_signoff_required: false
   gas-model:
     advanced_security: false
     allow_update_branch: false
@@ -459,10 +459,10 @@ repositories:
     archived: false
     collaborators:
       admin:
+        - jennijuju
         - momack2
         - rvagg
         - ZenGround0
-        - jennijuju
       maintain:
         - aarshkshah1992
         - rjan90
@@ -492,13 +492,13 @@ teams:
         - momack2
         - rjan90
       member:
-        - ZenGround0
         - aarshkshah1992
+        - BigLep
         - masih
         - rvagg
         - timfong888
         - TippyFlitsUK
-        - BigLep
+        - ZenGround0
   github-mgmt approvers:
     # Notes:
     # 1. These members have triage access to the github-mgmt repository.
@@ -556,8 +556,8 @@ teams:
     create_default_maintainer: false
     members:
       maintainer:
-        - patrickwoodhead
         - bajtos
+        - patrickwoodhead
       member:
         - juliangruber
         - NikolasHaimerl