diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 826b533b50..4f162a7fdd 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -11,7 +11,6 @@
 # - Either Dominik (oncilla) or Lukas (lukedirtwalker) should be involved for
 #   changes that could impact the compatibility between this implementation and
 #   their proprietary system.
-# - Matthias (matzf) would like to be involved for changes to the router
 antlr/** @oncilla @lukedirtwalker
 control/trust/** @oncilla
 gateway/dataplane/encoder.go @oncilla @lukedirtwalker
@@ -21,6 +20,5 @@ pkg/slayers/** @scionproto/scion-core-team
 pkg/snet/** @scionproto/scion-core-team
 private/trust/** @oncilla
 proto/** @oncilla @lukedirtwalker
-router/dataplane.go @matzf
 scion-pki/** @oncilla
 tools/braccept/cases/** @scionproto/scion-core-team
diff --git a/doc/dev/contribute.rst b/doc/dev/contribute.rst
index 7f101a6142..2d035f69b8 100644
--- a/doc/dev/contribute.rst
+++ b/doc/dev/contribute.rst
@@ -93,11 +93,11 @@ implementation projects.
 
 The current members of the TC Implementation are:
 
+* Jean-Christophe Hugly (|span-github| `@jiceatscion <https://github.com/jiceatscion>`_, |span-slack| @Jean-Christophe Hugly)
 * Dominik Roos (|span-github| `@oncilla <https://github.com/oncilla>`_, |span-slack| @roosd)
 * François Wirz (|span-github| `@FR4NK-W <https://github.com/FR4NK-W>`_, |span-slack| @frank)
 * Lukas Vogel (|span-github| `@lukedirtwalker <https://github.com/lukedirtwalker>`_, |span-slack| @luke)
 * Marc Frei (|span-github| `@marcfrei <https://github.com/marcfrei>`_, |span-slack| @marcfrei)
-* Matthias Frei (|span-github| `@matzf <https://github.com/matzf>`_, |span-slack| @matzf)
 
 
 .. rubric:: Responsibilities and Tasks
diff --git a/doc/dev/testing/buildkite.rst b/doc/dev/testing/buildkite.rst
index cebb56a1ea..98f9ef6a53 100644
--- a/doc/dev/testing/buildkite.rst
+++ b/doc/dev/testing/buildkite.rst
@@ -89,7 +89,7 @@ Cluster configuration
 
    The agent cluster is operated by the SCION Association, in the AWS account ``scion-association``.
 
-   Primary contacts `matzf <https://github.com/matzf>`_, `jiceatscion <https://github.com/jiceatscion>`_,
+   Primary contact `jiceatscion <https://github.com/jiceatscion>`_,
    alt contact `nicorusti <https://github.com/nicorusti>`_.