diff --git a/CODEOWNERS b/CODEOWNERS
index 69c1ac3e1..6b0679389 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,7 +1,7 @@
 # keep-sorted start
 .golangci.yml @katexochen
-/3rdparty/gcp-guest-agent @malt3
-/bazel @malt3
+/3rdparty/gcp-guest-agent @3u13r
+/bazel @burgerdev
 /bazel/ci @katexochen
 /bazel/sh @katexochen
 /bootstrapper @3u13r
@@ -10,58 +10,57 @@
 /cli/internal/libvirt @daniel-weisse
 /cli/internal/terraform @elchead
 /csi @daniel-weisse
-/debugd @malt3
+/debugd @daniel-weisse
 /disk-mapper @daniel-weisse
 /docs @thomasten
 /e2e @3u13r
 /hack/azure-snp-report-verify @derpsteb
-/hack/bazel-deps-mirror @malt3
+/hack/bazel-deps-mirror @burgerdev
 /hack/cli-k8s-compatibility @derpsteb
 /hack/clidocgen @thomasten
 /hack/fetch-broken-e2e @katexochen
 /hack/gocoverage @katexochen
-/hack/oci-pin @malt3
+/hack/oci-pin @burgerdev
 /hack/qemu-metadata-api @daniel-weisse
 /hack/remove-tf-providers @katexochen
 /hack/terraform @3u13r
 /hack/tools @katexochen
 /hack/versioninfogen @daniel-weisse
-/image @malt3
+/image @msanft
 /internal/api @derpsteb
 /internal/atls @thomasten
 /internal/attestation @daniel-weisse
 /internal/cloud @3u13r
 /internal/compatibility @derpsteb
 /internal/config @derpsteb
-/internal/constellation/featureset @malt3
+/internal/constellation/featureset @thomasten
 /internal/constellation/helm @derpsteb
 /internal/constellation/kubecmd @daniel-weisse
 /internal/constellation/state @elchead
-/internal/containerimage @malt3
+/internal/containerimage @burgerdev
 /internal/crypto @thomasten
 /internal/cryptsetup @daniel-weisse
 /internal/file @daniel-weisse
 /internal/grpc @thomasten
-/internal/imagefetcher @malt3
+/internal/imagefetcher @msanft
 /internal/installer @3u13r
 /internal/kms @daniel-weisse
-/internal/kubernetes @malt3
+/internal/kubernetes @3u13r
 /internal/license @thomasten
 /internal/logger @daniel-weisse
 /internal/nodestate @daniel-weisse
-/internal/osimage @malt3
+/internal/osimage @msanft
 /internal/retry @katexochen
 /internal/semver @derpsteb
 /internal/sigstore @elchead
-/internal/staticupload @malt3
+/internal/staticupload @msanft
 /internal/versions @3u13r
 /joinservice @daniel-weisse
 /keyservice @daniel-weisse
 /measurement-reader @daniel-weisse
-/operators @malt3
-/rpm @malt3
+/operators @3u13r
 /terraform-provider-constellation @msanft @elchead
-/tools @malt3
+/tools @burgerdev
 /upgrade-agent @3u13r
 /verify @daniel-weisse
 # keep-sorted end