diff --git a/inventory/group_vars/mailman b/inventory/group_vars/mailman
index 66b2a17fb0..9dbb922c05 100644
--- a/inventory/group_vars/mailman
+++ b/inventory/group_vars/mailman
@@ -69,3 +69,13 @@ primary_auth_source: ipa
 tcp_ports: [25, 80, 443,
   # For outgoing fedmsg
   3000, 3001, 3002, 3003]
+
+# mailman role variables
+mailman_rest_api_username: "{{ mailman_rest_api_user }}"
+mailman_rest_api_password: "{{ 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
diff --git a/inventory/group_vars/mailman_stg b/inventory/group_vars/mailman_stg
index 43d7d2be62..8ed0960dbf 100644
--- a/inventory/group_vars/mailman_stg
+++ b/inventory/group_vars/mailman_stg
@@ -62,3 +62,15 @@ postfix_group: mailman-stg
 tcp_ports: [25, 80, 443,
   # For outbound fedmsg
   3000, 3001, 3002, 3003]
+
+# mailman role variables
+mailman_log_level: debug
+mailman_rest_api_username: "{{ mailman_stg_rest_api_user }}"
+mailman_rest_api_password: "{{ mailman_stg_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_stg_archiver_key }}"
+mailman_openidc_server_url: "https://id.stg.fedoraproject.org/"
+mailman_httpd_hostname: lists.stg.fedoraproject.org
diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml
index 2ab6bc607c..0a5ab11527 100644
--- a/playbooks/groups/mailman.yml
+++ b/playbooks/groups/mailman.yml
@@ -96,27 +96,6 @@
 
   roles:
   - role: mailman3
-    mailman_rest_api_username: "{{ mailman_rest_api_user }}"
-    mailman_rest_api_password: "{{ 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
-    mailman_log_level: debug
-    mailman_rest_api_username: "{{ mailman_stg_rest_api_user }}"
-    mailman_rest_api_password: "{{ mailman_stg_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_stg_archiver_key }}"
-    mailman_openidc_server_url: "https://id.stg.fedoraproject.org/"
-    mailman_httpd_hostname: lists.stg.fedoraproject.org
-    when: env == "staging"
   # Set up for fedora-messaging
   - role: rabbit/user
     username: "mailman{{ env_suffix }}"