diff --git a/CODEOWNERS b/CODEOWNERS
index e790f8204..7c13be759 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -11,12 +11,12 @@
 /debugd @malt3
 /disk-mapper @daniel-weisse
 /docs @thomasten
-/e2e @datosh
+/e2e @katexochen
 /hack/azure-jump-host @malt3
 /hack/azure-snp-report-verify @derpsteb
 /hack/check-licenses.sh @thomasten
 /hack/clidocgen @thomasten
-/hack/fetch-broken-e2e @datosh
+/hack/fetch-broken-e2e @katexochen
 /hack/image-measurement @daniel-weisse
 /hack/pcr-compare @nirusu
 /hack/pcr-reader @daniel-weisse
@@ -27,13 +27,13 @@
 /image @malt3
 /internal/atls @thomasten
 /internal/attestation @daniel-weisse
-/internal/config @datosh
+/internal/config @derpsteb
 /internal/crypto @thomasten
-/internal/license @datosh
+/internal/license @thomasten
 /internal/logger @daniel-weisse
 /internal/oid @thomasten
 /internal/retry @katexochen
-/internal/sigstore @datosh
+/internal/sigstore @malt3
 /internal/versions @katexochen
 /internal/versionsapi @katexochen
 /joinservice @daniel-weisse