diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index dca4c98f..2e320002 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3,8 +3,8 @@
 * @baentsch
 /oqsprov/oqs_hyb_kem.c @bhess
 /oqs-template/generate.yml @baentsch @bhess @feventura @alexrow
-/CMakeLists.txt @baentsch @thb-sb
-/.circleci/config.yml @baentsch @thb-sb
-/.github/workflows @baentsch @thb-sb @jplomas
+/CMakeLists.txt @baentsch @zadlg
+/.circleci/config.yml @baentsch @zadlg
+/.github/workflows @baentsch @zadlg @jplomas
 /oqsprov/oqs_sig.c @baentsch @feventura
 /scripts/oqsprovider-pkcs12gen.sh @iyanmv
diff --git a/GOVERNANCE.md b/GOVERNANCE.md
index 680c9cfa..76a1bacc 100644
--- a/GOVERNANCE.md
+++ b/GOVERNANCE.md
@@ -102,7 +102,7 @@ Votes are to be executed by way of open GitHub discussions. No quorum is needed
 
 @baentsch
 @bhess
-@thb-sb
+@zadlg
 @christianpaquin
 
 ## Afterword