diff --git a/substrate/docs/CODEOWNERS b/substrate/docs/CODEOWNERS
index 701df299a3..b4f1b64c4b 100644
--- a/substrate/docs/CODEOWNERS
+++ b/substrate/docs/CODEOWNERS
@@ -20,15 +20,22 @@
 
 # Wasm execution and the wasm side of Substrate Runtime Interface
 /client/executor/ @pepyakin
-/primitives/io/ @pepyakin
+/primitives/io/ @pepyakin @NikVolf
+
+# Crypto, execution extensions, etc.
+/primitives/core/ @NikVolf
+
+# Block production
+/primitives/authorship/ @NikVolf
+/client/basic-authorship/ @NikVolf
 
 # Sandboxing capability of Substrate Runtime
 /primitives/sr-sandbox/ @pepyakin
 /primitives/core/src/sandbox.rs @pepyakin
 
 # Transaction pool
-/client/transaction-pool/ @tomusdrw
-/primitives/transaction-pool/ @tomusdrw
+/client/transaction-pool/ @tomusdrw @NikVolf
+/primitives/transaction-pool/ @tomusdrw @NikVolf
 
 # Offchain
 /client/offchain/ @tomusdrw