diff --git a/substrate/CODEOWNERS b/substrate/CODEOWNERS
index 6233b87b800335d55b2b2225afe3039286a07ee1..866f16522316bcfa0d89aaf1ea1762982a36bc9c 100644
--- a/substrate/CODEOWNERS
+++ b/substrate/CODEOWNERS
@@ -1,4 +1,11 @@
-# Lists some code owners
+# Lists some code owners.
+#
+# A codeowner just oversees some part of the codebase. If an owned file is changed then the
+# corresponding codeowner receives a review request. An approval of the codeowner is
+# not required for merging a PR though.
+#
+# **This is pretty much an experiment at the moment**. Feel free to remove yourself at any time if
+# you do not want to receive review requests any longer.
 #
 # For details about syntax, see:
 # https://help.github.com/en/articles/about-code-owners
@@ -11,5 +18,51 @@
 #   are more recognizable on GitHub, you can use them for mentioning unlike an email.
 # - The latest matching rule, if multiple, takes precedence.
 
-/srml/contracts/ @pepyakin
+# Wasm execution and the wasm side of Substrate Runtime Interface
 /core/executor/ @pepyakin
+/core/sr-io/without_std.rs @pepyakin
+/core/sr-std/without_std.rs @pepyakin
+
+# Sandboxing capability of Substrate Runtime
+/core/sr-sandbox/ @pepyakin
+/core/primitives/src/sandbox.rs @pepyakin
+
+# Transaction pool
+/core/transaction-pool/ @tomusdrw
+
+# Offchain
+/core/offchain/ @tomusdrw
+/sr-io/src/offchain/ @tomusdrw
+
+# Everything that has RPC in it
+/core/rpc/ @tomusdrw
+/node/rpc/ @tomusdrw
+/node/rpc-client/ @tomusdrw
+/core/rpc-servers/ @tomusdrw
+
+# GRANDPA, BABE, consensus stuff
+/srml/babe/ @andresilva @DemiMarie-parity
+/srml/grandpa/ @andresilva @DemiMarie-parity
+/core/finality-grandpa/ @andresilva @DemiMarie-parity
+/core/consensus/babe/ @andresilva @DemiMarie-parity
+/core/consensus/slots/ @andresilva @DemiMarie-parity
+
+# Contracts
+/srml/contracts/ @pepyakin @thiolliere @jimpo
+/srml/contracts/src/wasm/runtime.rs @Robbepop
+
+# Inflation points
+/srml/staking/src/inflation.rs @thiolliere
+
+# NPoS and Governance
+/srml/staking/ @kianenigma
+/srml/election/ @kianenigma
+
+# End to end testing of substrate node
+/node/executor/ @kianenigma
+
+# Transaction weight stuff
+/core/sr-primitives/weights.rs @kianenigma
+
+# Support crates
+/srml/support/ @thiolliere @kianenigma