diff --git a/doc/source/creators.rst b/doc/source/creators.rst
index 80a6f40..f5dfe1c 100644
--- a/doc/source/creators.rst
+++ b/doc/source/creators.rst
@@ -700,8 +700,8 @@ these other steps until the import is complete and the new repository
 is configured.
 
 The OpenDev team can be contacted by pinging ``infra-root`` in the
-``#opendev`` channel on Freenode IRC, or via email to the `openstack-infra
-<http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-infra>`_
+``#opendev`` channel on Freenode IRC, or via email to the `service discuss
+<http://lists.opendev.org/cgi-bin/mailman/listinfo/service-discuss>`_
 mail list.
 
 Update the Gerrit Group Members
diff --git a/doc/source/drivers.rst b/doc/source/drivers.rst
index ce4b773..6da55df 100644
--- a/doc/source/drivers.rst
+++ b/doc/source/drivers.rst
@@ -608,8 +608,8 @@ these criteria, follow the instructions below.
 
 Currently, Zuul is able to report on changes proposed to Gerrit
 systems or GitHub.  If the project you want to test with isn't hosted
-on a Gerrit or GitHub, contact the infrastructure team in
-#openstack-infra to discuss options.
+on a Gerrit or GitHub, contact the infrastructure team in the
+#opendev channel on the Freenode IRC network to discuss options.
 
 In all cases, before starting this process, be sure you have discussed
 this with the team responsible for the project you want to test.  You
@@ -624,7 +624,7 @@ than OpenDev's Gerrit), you may need to connect Zuul to it first, if
 it isn't already.  To do so, propose a change to `system-config
 <https://opendev.org/opendev/system-config/src/hiera/group/zuul-scheduler.yaml>`_
 which adds the connection information for the new server, then work
-with the infra team in #openstack-infra to set up an account.
+with the infra team in #opendev to set up an account.
 
 Once this is complete, propose a change to add the project(s) to
 OpenDev's Zuul.  Add them to `project-config/zuul/main.yaml
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 3d0028d..30e6474 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -21,8 +21,8 @@ any project hosted in the OpenDev infrastructure.
 
    If you notice problems, report them via
    :ref:`#opendev on IRC <irc-technical-support>` or
-   use the `OpenStack-Infra mailing list
-   <http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-infra>`_.
+   use the `service-discuss mailing list
+   <http://lists.opendev.org/cgi-bin/mailman/listinfo/service-discuss>`_.
 
 .. toctree::
    :maxdepth: 2
diff --git a/setup.cfg b/setup.cfg
index cd7eeb9..e79cb3b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,9 +3,9 @@ name = infra-manual
 summary = OpenDev Manual
 description-file =
     README.rst
-author = OpenDev
-author-email = openstack-infra@lists.openstack.org
-home-page = http://www.opendev.org/
+author = OpenDev Contributors
+author-email = service-discuss@lists.opendev.org
+home-page = https://opendev.org/
 classifier =
     Intended Audience :: Developers
     License :: OSI Approved :: Apache Software License