diff --git a/inventory/service/host_vars/lists.openstack.org.yaml b/inventory/service/host_vars/lists.openstack.org.yaml
index ef15c41963..b0934fad18 100644
--- a/inventory/service/host_vars/lists.openstack.org.yaml
+++ b/inventory/service/host_vars/lists.openstack.org.yaml
@@ -36,6 +36,7 @@ exim_aliases:
   spam: ':fail: delivery temporarily disabled due to ongoing spam flood'
 exim_domain_aliases:
   community@lists.openstack.org: community@lists.openinfra.dev
+  edge-computing@lists.openstack.org: edge-computing@lists.opendev.org
   foundation@lists.openstack.org: foundation@lists.openinfra.dev
   foundation-board@lists.openstack.org: foundation-board@lists.openinfra.dev
   foundation-board-confidential@lists.openstack.org: foundation-board-confidential@lists.openinfra.dev
@@ -157,6 +158,10 @@ mailman_sites:
         description: 'The mailman site list'
         admin: 'nobody@openstack.org'
         password: "{{ mailman_list_password }}"
+      - name: edge-computing
+        description: 'Organizing efforts around the edge-computing focus area.'
+        admin: 'ildiko@openinfra.dev'
+        password: "{{ mailman_list_password }}"
       - name: rust-vmm
         description: 'Collaborating on Rust-based virtual machine monitors.'
         admin: 'claire@openstack.org'
@@ -369,10 +374,6 @@ mailman_sites:
         description: 'Announcement of official OpenStack releases.'
         admin: 'thierry@openstack.org'
         password: "{{ mailman_list_password }}"
-      - name: edge-computing
-        description: 'Organizing efforts around the edge-computing focus area.'
-        admin: 'claire@openstack.org'
-        password: "{{ mailman_list_password }}"
       - name: openstack-mentoring
         description: 'List to coordinate interactions between mentors and mentees of the OpenStack mentoring program. Also for questions about the mentoring program (i.e. how to get involved, how it works, etc.'
         admin: 'amy@demarco.com'
diff --git a/playbooks/roles/mailman-site/templates/mailman_multihost.vhost.j2 b/playbooks/roles/mailman-site/templates/mailman_multihost.vhost.j2
index 47d13e5efe..60e2dd173f 100644
--- a/playbooks/roles/mailman-site/templates/mailman_multihost.vhost.j2
+++ b/playbooks/roles/mailman-site/templates/mailman_multihost.vhost.j2
@@ -16,6 +16,8 @@ RewriteEngine on
 RewriteRule ^/$ /cgi-bin/mailman/listinfo [R]
 RewriteCond %{HTTP_HOST} ^lists\.openstack\.org$ [nocase]
 RewriteRule /(cgi-bin/mailman/listinfo|pipermail)/(community|foundation|foundation-board|foundation-board-confidential|goldmembers|marketing|staff|summitsponsors)(/.*|$) %{REQUEST_SCHEME}://lists.openinfra.dev/$1/$2$3 [last,redirect=permanent]
+RewriteCond %{HTTP_HOST} ^lists\.openstack\.org$ [nocase]
+RewriteRule /(cgi-bin/mailman/listinfo|pipermail)/(edge-computing)(/.*|$) %{REQUEST_SCHEME}://lists.opendev.org/$1/$2$3 [last,redirect=permanent]
 
 # We can find mailman here:
 ScriptAlias /cgi-bin/mailman/ /usr/lib/cgi-bin/mailman/
@@ -85,6 +87,8 @@ Alias /images/mailman/ /usr/share/images/mailman/
   RewriteRule ^/$ /cgi-bin/mailman/listinfo [R]
   RewriteCond %{HTTP_HOST} ^lists\.openstack\.org$ [nocase]
   RewriteRule /(cgi-bin/mailman/listinfo|pipermail)/(community|foundation|foundation-board|foundation-board-confidential|goldmembers|marketing|staff|summitsponsors)(/.*|$) %{REQUEST_SCHEME}://lists.openinfra.dev/$1/$2$3 [last,redirect=permanent]
+  RewriteCond %{HTTP_HOST} ^lists\.openstack\.org$ [nocase]
+  RewriteRule /(cgi-bin/mailman/listinfo|pipermail)/(edge-computing)(/.*|$) %{REQUEST_SCHEME}://lists.opendev.org/$1/$2$3 [last,redirect=permanent]
 
   ScriptAlias /cgi-bin/mailman/ /usr/lib/cgi-bin/mailman/
   Alias /pipermail/ /srv/mailman/{{ mailman_site.name }}/archives/public/