diff --git a/doc/source/contributor/index.rst b/doc/source/contributor/index.rst
index 8116bacb514a..ef9fb135c8b1 100644
--- a/doc/source/contributor/index.rst
+++ b/doc/source/contributor/index.rst
@@ -24,7 +24,7 @@ is important for maintaining the strong ecosystem around nova.
 
 Our process is always evolving, just as nova and the community around nova
 evolves over time. If there are things that seem strange, or you have ideas on
-how to improve things, please bring them forward on IRC or the openstack-dev
+how to improve things, please bring them forward on IRC or the openstack-discuss
 mailing list, so we continue to improve how the nova community operates.
 
 This section looks at the processes and why. The main aim behind all the
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/272_add_keypair_type.py b/nova/db/sqlalchemy/migrate_repo/versions/272_add_keypair_type.py
index 5137b1667563..b46c87db8d8d 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/272_add_keypair_type.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/272_add_keypair_type.py
@@ -20,7 +20,7 @@
 #
 # It is hypothetically possible that a hyper-v continuous deployer exists who
 # will have a poor experience because of this code revert, if that deployer
-# is you, please contact the nova team at openstack-dev@lists.openstack.org
+# is you, please contact the nova team at openstack-discuss@lists.openstack.org
 # and we will walk you through the manual fix required for this problem.
 
 
diff --git a/nova/image/download/__init__.py b/nova/image/download/__init__.py
index ae6542cade44..f464e2c02c66 100644
--- a/nova/image/download/__init__.py
+++ b/nova/image/download/__init__.py
@@ -49,6 +49,6 @@ def load_transfer_modules():
                     'of its use in production clouds. If you are using this '
                     'extension point, please make the nova development team '
                     'aware by contacting us in the #openstack-nova freenode '
-                    'IRC channel or on the openstack-dev mailing list.')
+                    'IRC channel or on the openstack-discuss mailing list.')
 
     return module_dictionary
diff --git a/setup.cfg b/setup.cfg
index de54a1141192..27ee214868d2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,7 +4,7 @@ summary = Cloud computing fabric controller
 description-file =
     README.rst
 author = OpenStack
-author-email = openstack-dev@lists.openstack.org
+author-email = openstack-discuss@lists.openstack.org
 home-page = https://docs.openstack.org/nova/latest/
 classifier =
     Environment :: OpenStack