diff --git a/inventory/host_vars/mailman01.iad2.fedoraproject.org b/inventory/host_vars/mailman01.iad2.fedoraproject.org
index 4c75cdda64..ec93424361 100644
--- a/inventory/host_vars/mailman01.iad2.fedoraproject.org
+++ b/inventory/host_vars/mailman01.iad2.fedoraproject.org
@@ -2,13 +2,14 @@
 datacenter: iad2
 eth0_ipv4_gw: 10.3.163.254
 eth0_ipv4_ip: 10.3.163.57
-ks_repo: http://10.3.163.35/repo/rhel/RHEL7-x86_64/
-ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel-7-iad2
-lvm_size: 750000
+ks_repo: http://10.3.163.35/repo/rhel/RHEL9-x86_64/
+ks_url: http://10.3.163.35/repo/rhel/ks/kvm-rhel
+lvm_size: 1500000
 sar_output_file: mailinglists.json
 # GDPR SAR variables
 sar_script: /srv/webui/bin/mailman-sar.py
-sar_script_user: apache
-vmhost: vmhost-x86-04.iad2.fedoraproject.org
+sar_script_user: mailman
+vmhost: vmhost-x86-08.iad2.fedoraproject.org
 volgroup: /dev/vg_guests
 num_cpus: 8
+mem_size: 16384
diff --git a/inventory/host_vars/mailman01.stg.iad2.fedoraproject.org b/inventory/host_vars/mailman01.stg.iad2.fedoraproject.org
index 1d6e36399b..2cf20ab8e6 100644
--- a/inventory/host_vars/mailman01.stg.iad2.fedoraproject.org
+++ b/inventory/host_vars/mailman01.stg.iad2.fedoraproject.org
@@ -11,4 +11,4 @@ mem_size: 16384
 sar_output_file: mailinglists.json
 # GDPR SAR variables
 sar_script: /srv/webui/bin/mailman-sar.py
-sar_script_user: apache
+sar_script_user: mailman
diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml
index 95f7b549c7..76d632a5b5 100644
--- a/playbooks/groups/mailman.yml
+++ b/playbooks/groups/mailman.yml
@@ -95,11 +95,14 @@
   - "/srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml"
 
   roles:
-  - role: mailman
+  - role: mailman3
+    mailman_rest_api_user: "{{ mailman_rest_api_user }}"
+    mailman_rest_api_pass: "{{ mailman_rest_api_pass }}"
     mailman_mailman_db_pass: "{{ mailman_mm_db_pass }}"
     mailman_hyperkitty_admin_db_pass: "{{ mailman_hk_admin_db_pass }}"
     mailman_hyperkitty_db_pass: "{{ mailman_hk_db_pass }}"
     mailman_hyperkitty_cookie_key: "{{ mailman_hk_cookie_key }}"
+    mailman_hyperkitty_archiver_key: "{{ mailman_hk_archiver_key }}"
     mailman_smtp_port: 587
     when: env != "staging"
   - role: mailman3