diff --git a/mail_activity_team/README.rst b/mail_activity_team/README.rst
index d0501fc..f473dbb 100644
--- a/mail_activity_team/README.rst
+++ b/mail_activity_team/README.rst
@@ -87,8 +87,8 @@ Contributors
 
 * `ForgeFlow <https://www.forgeflow.com>`_:
 
-  * Jordi Ballester Alomar (jordi.ballester@eficent.com)
-  * Miquel Raïch (miquel.raich@eficent.com)
+  * Jordi Ballester Alomar (jordi.ballester@forgeflow.com)
+  * Miquel Raïch (miquel.raich@forgeflow.com)
   * Bernat Puig Font (bernat.puig@forgeflow.com)
 * Pedro Gonzalez (pedro.gonzalez@pesol.es)
 * `Tecnativa <https://www.tecnativa.com>`_:
diff --git a/mail_activity_team/static/description/index.html b/mail_activity_team/static/description/index.html
index 6d9e9a0..23d2a8c 100644
--- a/mail_activity_team/static/description/index.html
+++ b/mail_activity_team/static/description/index.html
@@ -434,8 +434,8 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 <h2><a class="toc-backref" href="#id6">Contributors</a></h2>
 <ul class="simple">
 <li><a class="reference external" href="https://www.forgeflow.com">ForgeFlow</a>:<ul>
-<li>Jordi Ballester Alomar (<a class="reference external" href="mailto:jordi.ballester&#64;eficent.com">jordi.ballester&#64;eficent.com</a>)</li>
-<li>Miquel Raïch (<a class="reference external" href="mailto:miquel.raich&#64;eficent.com">miquel.raich&#64;eficent.com</a>)</li>
+<li>Jordi Ballester Alomar (<a class="reference external" href="mailto:jordi.ballester&#64;forgeflow.com">jordi.ballester&#64;forgeflow.com</a>)</li>
+<li>Miquel Raïch (<a class="reference external" href="mailto:miquel.raich&#64;forgeflow.com">miquel.raich&#64;forgeflow.com</a>)</li>
 <li>Bernat Puig Font (<a class="reference external" href="mailto:bernat.puig&#64;forgeflow.com">bernat.puig&#64;forgeflow.com</a>)</li>
 </ul>
 </li>
diff --git a/mail_debrand/README.rst b/mail_debrand/README.rst
index bcb0d21..a3eeff6 100644
--- a/mail_debrand/README.rst
+++ b/mail_debrand/README.rst
@@ -67,7 +67,7 @@ Authors
 ~~~~~~~
 
 * Tecnativa
-* Eficent
+* ForgeFlow
 * Onestein
 * Sodexis
 * Nexterp Romania
@@ -75,7 +75,7 @@ Authors
 Contributors
 ~~~~~~~~~~~~
 
-* Lois Rilo <lois.rilo@eficent.com>
+* Lois Rilo <lois.rilo@forgeflow.com>
 * Graeme Gellatly <graeme@o4sb.com>
 * `Tecnativa <https://www.tecnativa.com>`__:
 
diff --git a/mail_debrand/static/description/index.html b/mail_debrand/static/description/index.html
index 1d81907..b1db9b4 100644
--- a/mail_debrand/static/description/index.html
+++ b/mail_debrand/static/description/index.html
@@ -419,7 +419,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 <h2><a class="toc-backref" href="#id7">Authors</a></h2>
 <ul class="simple">
 <li>Tecnativa</li>
-<li>Eficent</li>
+<li>ForgeFlow</li>
 <li>Onestein</li>
 <li>Sodexis</li>
 <li>Nexterp Romania</li>
@@ -428,7 +428,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 <div class="section" id="contributors">
 <h2><a class="toc-backref" href="#id8">Contributors</a></h2>
 <ul class="simple">
-<li>Lois Rilo &lt;<a class="reference external" href="mailto:lois.rilo&#64;eficent.com">lois.rilo&#64;eficent.com</a>&gt;</li>
+<li>Lois Rilo &lt;<a class="reference external" href="mailto:lois.rilo&#64;forgeflow.com">lois.rilo&#64;forgeflow.com</a>&gt;</li>
 <li>Graeme Gellatly &lt;<a class="reference external" href="mailto:graeme&#64;o4sb.com">graeme&#64;o4sb.com</a>&gt;</li>
 <li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:<ul>
 <li>Pedro M. Baeza</li>