diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e4f5436..02af3e0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -30,6 +30,6 @@
 /doc/constitution.md @NixOS/steering
 /doc/nixpkgs-core.md @NixOS/nixpkgs-core
 /doc/nixpkgs-committers.md @NixOS/nixpkgs-core
-/doc/calendar.md @edolstra @tomberek @fricklerhandwerk @cafkafk
+/doc/calendar.md @tomberek @cafkafk @infinisil
 /doc/nixcon.md @NixOS/steering
 /doc/hetzner.md @NixOS/infra
diff --git a/doc/calendar.md b/doc/calendar.md
index c32dfc9..e8a88fc 100644
--- a/doc/calendar.md
+++ b/doc/calendar.md
@@ -4,13 +4,11 @@ There is [this official Google Calendar](https://calendar.google.com/calendar/u/
 
 These Google accounts have access to manage permissions (and make changes to events):
 <!-- Keep this list in sync with the codeowners of this file! -->
-- edolstra@gmail.com (@edolstra)
 - tomberek@gmail.com (@tomberek)
-- valentin.gagarin@gmail.com (@fricklerhandwerk)
 - cafkafk.nixos@gmail.com (@cafkafk)
+- silvan.mosberger@moduscreate.com (@infinisil)
 
 These Google accounts can only make changes to events:
-- silvan.mosberger@moduscreate.com (@infinisil)
 - jeremyfleischman@gmail.com (@jfly)
 - daniel.n.baker@gmail.com (@djacu)
 - @mweinelt