diff --git a/CODEOWNERS b/CODEOWNERS
index 4d96c3f..c914dcb 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,2 +1,2 @@
 # Add the list of code owners here (using their GitHub username)
-* gatekeeper-PullAssigner
+* @alexandruag @gsserge @jiangliu
diff --git a/Cargo.toml b/Cargo.toml
index e10f0b9..0157b34 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "vm-device"
 version = "0.1.0"
-authors = ["Samuel Ortiz <sameo@linux.intel.com>"]
+authors = ["Samuel Ortiz <sameo@linux.intel.com>", "Liu Jiang <gerry@linux.alibaba.com>", "rust-vmm AWS maintainers <rust-vmm-maintainers@amazon.com>"]
 edition = "2018"
 repository = "https://github.com/rust-vmm/vm-device"
 license = "Apache-2.0 OR BSD-3-Clause"