diff --git a/modules/openstack_project/manifests/lists.pp b/modules/openstack_project/manifests/lists.pp
index efd481512a..d5467646e2 100644
--- a/modules/openstack_project/manifests/lists.pp
+++ b/modules/openstack_project/manifests/lists.pp
@@ -278,14 +278,6 @@ class openstack_project::lists(
     description => 'Discussions around consuming the OpenStack REST APIs and development of API-consuming SDKs and frameworks',
   }
 
-  mailman_list { 'openstack-sigs@openstack':
-    require     => Mailman::Site['openstack'],
-    ensure      => present,
-    admin       => 'thierry@openstack.org',
-    password    => $listpassword,
-    description => 'OpenStack SIGs discussions, gathering users, operators and developers of OpenStack into common groups.',
-  }
-
   mailman_list { 'enterprise-wg@openstack':
     require     => Mailman::Site['openstack'],
     ensure      => present,
diff --git a/playbooks/host_vars/lists.openstack.org.yaml b/playbooks/host_vars/lists.openstack.org.yaml
index fad60c1b69..e2678dc37f 100644
--- a/playbooks/host_vars/lists.openstack.org.yaml
+++ b/playbooks/host_vars/lists.openstack.org.yaml
@@ -2,6 +2,11 @@ mm_domains: 'lists.openstack.org:lists.zuul-ci.org:lists.airshipit.org:lists.sta
 exim_local_domains: "@:{{ mm_domains }}"
 exim_aliases:
   root: "{{ ','.join(listadmins|default([])) }}"
+  openstack: openstack-discuss
+  openstack-dev: openstack-discuss
+  openstack-operators: openstack-discuss
+  openstack-sigs: openstack-discuss
+  openstack-tc: openstack-discuss
   ambassadors-owner: spam
   community-owner: spam
   edge-computing-owner: spam
@@ -12,18 +17,13 @@ exim_aliases:
   mailman-owner: spam
   marketing-owner: spam
   openstack-announce-owner: spam
-  openstack-dev-owner: spam
   openstack-docs-owner: spam
   openstack-fr-owner: spam
   openstack-i18n-owner: spam
   openstack-infra-owner: spam
   openstack-ko-owner: spam
-  openstack-operators-owner: spam
-  openstack-owner: spam
   openstack-qa-owner: spam
   openstack-security-owner: spam
-  openstack-sigs-owner: spam
-  openstack-tc-owner: spam
   openstack-vi-owner: spam
   product-wg-owner: spam
   superuser-owner: spam