diff --git a/committee-code-of-conduct/README.md b/committee-code-of-conduct/README.md
index c869eb949..65d713b69 100644
--- a/committee-code-of-conduct/README.md
+++ b/committee-code-of-conduct/README.md
@@ -15,7 +15,7 @@ The [charter](charter.md) defines the scope and governance of the Code of Conduc
 ## Members
 
 * Celeste Horgan (**[@celestehorgan](https://github.com/celestehorgan)**), Independent
-* Carlos Tadeu Panato Jr. (**[@cpanato](https://github.com/cpanato)**), Mattermost
+* Carlos Tadeu Panato Jr. (**[@cpanato](https://github.com/cpanato)**), Chainguard, Inc
 * Karen Chu (**[@karenhchu](https://github.com/karenhchu)**), Microsoft
 * Nabarun Pal (**[@palnabarun](https://github.com/palnabarun)**), VMware
 * Vallery Lancey (**[@vllry](https://github.com/vllry)**), Apple
@@ -45,7 +45,7 @@ The members and their terms are as follows:
 
 - Karen Chu (Microsoft)
 - Celeste Horgan (Independent)
-- Carlos Tadeu Panato Jr. (Mattermost)
+- Carlos Tadeu Panato Jr. (Chainguard, Inc)
 
 ### Term ends on August 23, 2023
 
diff --git a/sig-list.md b/sig-list.md
index ba00d616f..428605131 100644
--- a/sig-list.md
+++ b/sig-list.md
@@ -82,7 +82,7 @@ When the need arises, a [new SIG can be created](sig-wg-lifecycle.md)
 
 | Name |  Label | Members | Contact |
 |------|--------|---------|---------|
-|[Code of Conduct](committee-code-of-conduct/README.md)|[code-of-conduct](https://github.com/kubernetes/kubernetes/labels/committee%2Fcode-of-conduct)|* [Celeste Horgan](https://github.com/celestehorgan), Independent<br>* [Carlos Tadeu Panato Jr.](https://github.com/cpanato), Mattermost<br>* [Karen Chu](https://github.com/karenhchu), Microsoft<br>* [Nabarun Pal](https://github.com/palnabarun), VMware<br>* [Vallery Lancey](https://github.com/vllry), Apple<br>|* [Slack](https://kubernetes.slack.com/messages/code-of-conduct)<br>* [Private Mailing List](conduct@kubernetes.io)
+|[Code of Conduct](committee-code-of-conduct/README.md)|[code-of-conduct](https://github.com/kubernetes/kubernetes/labels/committee%2Fcode-of-conduct)|* [Celeste Horgan](https://github.com/celestehorgan), Independent<br>* [Carlos Tadeu Panato Jr.](https://github.com/cpanato), Chainguard, Inc<br>* [Karen Chu](https://github.com/karenhchu), Microsoft<br>* [Nabarun Pal](https://github.com/palnabarun), VMware<br>* [Vallery Lancey](https://github.com/vllry), Apple<br>|* [Slack](https://kubernetes.slack.com/messages/code-of-conduct)<br>* [Private Mailing List](conduct@kubernetes.io)
 |[Security Response](committee-security-response/README.md)|[security-response](https://github.com/kubernetes/kubernetes/labels/committee%2Fsecurity-response)|* [CJ Cullen](https://github.com/cjcullen), Google<br>* [Mo Khan](https://github.com/enj), VMware<br>* [Joel Smith](https://github.com/joelsmith), Red Hat<br>* [Luke Hinds](https://github.com/lukehinds), Red Hat<br>* [Micah Hausler](https://github.com/micahhausler), Amazon<br>* [Tabitha Sable](https://github.com/tabbysable), Datadog<br>* [Tim Allclair](https://github.com/tallclair), Google<br>|* [Private Mailing List](security@kubernetes.io)
 |[Steering](committee-steering/README.md)|[steering](https://github.com/kubernetes/kubernetes/labels/committee%2Fsteering)|* [Christoph Blecker](https://github.com/cblecker), Red Hat<br>* [Davanum Srinivas](https://github.com/dims), VMware<br>* [Stephen Augustus](https://github.com/justaugustus), Cisco<br>* [Jordan Liggitt](https://github.com/liggitt), Google<br>* [Bob Killen](https://github.com/mrbobbytables), Google<br>* [Paris Pittman](https://github.com/parispittman), Apple<br>* [Tim Pepper](https://github.com/tpepper), VMware<br>|* [Slack](https://kubernetes.slack.com/messages/steering-committee)<br>* [Mailing List](https://groups.google.com/a/kubernetes.io/forum/#!forum/steering)<br>* [Private Mailing List](steering-private@kubernetes.io)
 <!-- BEGIN CUSTOM CONTENT -->
diff --git a/sig-release/README.md b/sig-release/README.md
index 68d6b24c0..4aa4b7157 100644
--- a/sig-release/README.md
+++ b/sig-release/README.md
@@ -30,7 +30,7 @@ The Chairs of the SIG run operations and processes governing the SIG.
 The Technical Leads of the SIG establish new subprojects, decommission existing
 subprojects, and resolve cross-subproject technical issues and decisions.
 
-* Carlos Tadeu Panato Jr. (**[@cpanato](https://github.com/cpanato)**), Mattermost
+* Carlos Tadeu Panato Jr. (**[@cpanato](https://github.com/cpanato)**), Chainguard, Inc
 * Jeremy Rickard (**[@jeremyrickard](https://github.com/jeremyrickard)**), Apple
 * Adolfo García Veytia (**[@puerco](https://github.com/puerco)**), Chainguard, Inc
 
diff --git a/sigs.yaml b/sigs.yaml
index fda38d138..4c33c0338 100644
--- a/sigs.yaml
+++ b/sigs.yaml
@@ -2023,7 +2023,7 @@ sigs:
     tech_leads:
     - github: cpanato
       name: Carlos Tadeu Panato Jr.
-      company: Mattermost
+      company: Chainguard, Inc
     - github: jeremyrickard
       name: Jeremy Rickard
       company: Apple
@@ -3279,7 +3279,7 @@ committees:
       company: Independent
     - github: cpanato
       name: Carlos Tadeu Panato Jr.
-      company: Mattermost
+      company: Chainguard, Inc
     - github: karenhchu
       name: Karen Chu
       company: Microsoft