diff --git a/README.md b/README.md
index f56bd504..d0dc5510 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ They happen on the fourth Thursday of every month at 10 AM US/Pacific.
 
 [Join this group](https://groups.google.com/forum/#!forum/istio-community-video-meetings)
 to have the meetings automatically added to your calendar.
-You can also find them on [the community calendar](https://calendar.google.com/calendar/embed?src=i10ogf58krfbrsjai5qi16g4do%40group.calendar.google.com&ctz=America%2FLos_Angeles), along with other major community events.
+You can also find them on [the community calendar](https://calendar.google.com/calendar/u/0/embed?src=c_fe9cd8d091d0d4d2818d01a930dc925f00d4f97995efe50a8d72512b241568f5@group.calendar.google.com), along with other major community events.
 
 Meeting agendas and notes can be accessed in the [working doc](http://bit.ly/istiocommunitymeet).
 
diff --git a/WORKING-GROUPS.md b/WORKING-GROUPS.md
index 95fa5cb0..bd6646f0 100644
--- a/WORKING-GROUPS.md
+++ b/WORKING-GROUPS.md
@@ -42,14 +42,14 @@ so please join us. The meeting can be joined with [this](https://meet.google.com
 There's a number of ways to track the
 meeting schedule:
 
-* You can view the schedule of upcoming working group meetings in this [calendar](https://calendar.google.com/calendar/u/1?cid=Y19mZTljZDhkMDkxZDBkNGQyODE4ZDAxYTkzMGRjOTI1ZjAwZDRmOTc5OTVlZmU1MGE4ZDcyNTEyYjI0MTU2OGY1QGdyb3VwLmNhbGVuZGFyLmdvb2dsZS5jb20).
+* You can view the schedule of upcoming working group meetings in this [calendar](https://calendar.google.com/calendar/u/0/embed?src=c_fe9cd8d091d0d4d2818d01a930dc925f00d4f97995efe50a8d72512b241568f5@group.calendar.google.com).
 
 * You can download [an ICS file](https://calendar.google.com/calendar/ical/c_fe9cd8d091d0d4d2818d01a930dc925f00d4f97995efe50a8d72512b241568f5%40group.calendar.google.com/public/basic.ics)
 to import the working group meetings into your favorite iCal client.
 
 If you have a Google account, you can also:
 
-* Link the [working group event calendar](https://calendar.google.com/calendar/u/1?cid=Y19mZTljZDhkMDkxZDBkNGQyODE4ZDAxYTkzMGRjOTI1ZjAwZDRmOTc5OTVlZmU1MGE4ZDcyNTEyYjI0MTU2OGY1QGdyb3VwLmNhbGVuZGFyLmdvb2dsZS5jb20)
+* Link the [working group event calendar](https://calendar.google.com/calendar/u/1?cid=c_fe9cd8d091d0d4d2818d01a930dc925f00d4f97995efe50a8d72512b241568f5@group.calendar.google.com)
 directly to your account.
 
 * Add yourself to the [istio-working-group-calendar-invites@](https://groups.google.com/forum/#!forum/istio-working-group-calendar-invites) group. This will
@@ -69,8 +69,5 @@ Each working group has one or more leads which coordinate the activities of the
                                                                                 | [Steven Landow](https://github.com/stevenctl)      | Solo.io    | Networking - Control Plane
 <img width="30px" src="https://avatars.githubusercontent.com/u/64559656?v=4">        | [Jackie Maertens (Elliot)](https://github.com/jaellio)        | Microsoft  | Product Security
 &nbsp;                                                                               | [Costin Manolache](https://github.com/costinm)     | Google     | Environments
-&nbsp;                                                                               | [Sam Naser](https://github.com/monkeyanator)       | Aviatrix   | Environments
-<img width="30px" src="https://avatars3.githubusercontent.com/u/3237651?s=400&v=4">  | [Ed Snible](https://github.com/esnible)            | IBM        | User Experience
 &nbsp;                                                                               | [Lei Tang](https://github.com/lei-tang)            | Google     | Security, Extensions and Telemetry
 <img width="30px" src="https://avatars1.githubusercontent.com/u/10537847?s=400&v=4"> | [Eric Van Norman](https://github.com/ericvn)       | IBM        | Test and Release
-<img width="30px" src="https://avatars0.githubusercontent.com/u/1016047?s=400&v=4">  | [Lizan Zhou](https://github.com/lizan)             | Aviatrix   | Networking - Data Plane, Security
diff --git a/org/teams.yaml b/org/teams.yaml
index eccc25f0..c91a44f3 100644
--- a/org/teams.yaml
+++ b/org/teams.yaml
@@ -321,10 +321,10 @@ teams:
     description: Working group leads - for easy communication in github
     members:
       - costinm # Env
+      - dhawton # PSWG
       - ericvn # T&R
       - howardjohn # Control Plane
       - jaellio # PSWG
-      - justinpettit # PSWG
       - lei-tang # Security, E&T
       - ramaraochavali # Control Plane
       - stevenctl # Control Plane