diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 39b1f2c1..bf65b900 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -41,7 +41,7 @@ This Code of Conduct applies both within project spaces and in public spaces
 when an individual is representing the project or its community.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior directed at yourself or another community member may be
-reported by contacting a project maintainer at [conduct@bigchaindb.com](mailto:conduct@bigchaindb.com). All
+reported by contacting a project maintainer at [contact@bigchaindb.com](mailto:contact@bigchaindb.com). All
 complaints will be reviewed and investigated and will result in a response that
 is appropriate to the circumstances. Maintainers are
 obligated to maintain confidentiality with regard to the reporter of an
diff --git a/docs/upgrade-guides/v0.10-v1.0.md b/docs/upgrade-guides/v0.10-v1.0.md
index 8bacca8e..eb9e04c2 100644
--- a/docs/upgrade-guides/v0.10-v1.0.md
+++ b/docs/upgrade-guides/v0.10-v1.0.md
@@ -111,8 +111,7 @@ including:
 
 
 If you don't find your preferred language in this list, do not despair but
-reach out to us for help on Github/Gitter or product@bigchaindb.com.
-
+reach out to us for help on GitHub/Gitter or devs@bigchaindb.com.
 
 #### Revamp of Crypto-Conditions signing details