diff --git a/doc/source/contribute-cloud.rst b/doc/source/contribute-cloud.rst
index 023bd8637c..9b6bdf20a7 100644
--- a/doc/source/contribute-cloud.rst
+++ b/doc/source/contribute-cloud.rst
@@ -95,10 +95,8 @@ https://www.openstack.org/foundation/companies/#infra-donors
 If this sounds interesting, and you have some capacity to spare, it
 would be very much appreciated.  You are welcome to contact the
 Infrastructure team on our public mailing list at
-<openstack-infra@lists.openstack.org>, or in our IRC channel,
-`#opendev` on Freenode.  You are also welcome to privately
-contact the `Infrastructure Project Team lead
-<https://governance.openstack.org/tc/reference/projects/infrastructure.html>`_.
+<service-discuss@lists.opendev.org>, or in our IRC channel,
+`#opendev` on Freenode.
 
 Contribution Workflow
 =====================
diff --git a/docker/gitea/custom/templates/home.tmpl b/docker/gitea/custom/templates/home.tmpl
index 96612d3680..e56d4f6463 100644
--- a/docker/gitea/custom/templates/home.tmpl
+++ b/docker/gitea/custom/templates/home.tmpl
@@ -60,10 +60,10 @@
                         <p>For scaling and redundancy purposes we are actually running a number of independent Giteas behind a load balancer. We can keep git repos in sync from Gerrit reasonably well, but the issue tracker and wiki functionality would need another level of state syncing. Once Gitea can be run as a proper cluster this may change, but until then the functionality is limited.</p>
 
                         <h1 id="contact-info">Contact info</h1>
-                        <p>These will be updated when moved to their new OpenDev locations</p>
                         <ul>
-                                <li>Mailing list: openstack-infra@lists.openstack.org</li>
                                 <li>IRC #opendev on Freenode</li>
+                                <li>Mailing list: service-discuss@lists.opendev.org</li>
+                                <li>Important announcements: service-announce@lists.opendev.org</li>
                         </ul>
 
                 </div>
diff --git a/setup.cfg b/setup.cfg
index efc5ee3297..33acc097a9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,8 +3,8 @@ name = openstack-infra-config
 summary = OpenStack Infrastructure Config
 description-file =
     README.rst
-author = OpenStack Infrastructure Team
-author-email = openstack-infra@lists.openstack.org
+author = OpenDev Contributors
+author-email = service-discuss@lists.opendev.org
 home-page = http://docs.openstack.org/infra/system-config/
 classifier =
     Environment :: OpenStack