diff --git a/doc/source/user/drivers.rst b/doc/source/user/drivers.rst
index c4283939..c3808a87 100644
--- a/doc/source/user/drivers.rst
+++ b/doc/source/user/drivers.rst
@@ -16,11 +16,11 @@ below the table of supported drivers and maintainers:
      - IRC Nick
    * - File System
      - Glance Team
-     - openstack-dev@lists.openstack.org
+     - openstack-discuss@lists.openstack.org
      - openstack-glance
    * - HTTP
      - Glance Team
-     - openstack-dev@lists.openstack.org
+     - openstack-discuss@lists.openstack.org
      - openstack-glance
    * - RBD
      - Fei Long Wang
diff --git a/setup.cfg b/setup.cfg
index 54a297e4..be55d42c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,7 +4,7 @@ summary = OpenStack Image Service Store Library
 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/glance_store/latest/
 classifier =
     Development Status :: 5 - Production/Stable