diff --git a/ansible/create_ec2.yml b/ansible/create_ec2.yml
index 2c62f9d..0963434 100644
--- a/ansible/create_ec2.yml
+++ b/ansible/create_ec2.yml
@@ -15,19 +15,18 @@
 
 - name: Put ssh keys on host
   hosts: "{{initiative_name}}"
-  remote_user: fedora
+  remote_user: "{{user}}"
 
   tasks:
     - name: Add public keys
       authorized_key:
-        user: fedora
+        user: "{{user}}"
         state: present
         key: "{{ lookup('file', 'secrets/{{item}}.pub') }}"
       with_items:
-        - pingou
         - mobrien
-        - wwoods
-        - asaleh
+        - zlopez
+        - arrfab
 
     - name: Add hostname
       hostname:
diff --git a/ansible/host_vars/all.yml b/ansible/host_vars/all.yml
index 19dfca1..c3c9ed6 100644
--- a/ansible/host_vars/all.yml
+++ b/ansible/host_vars/all.yml
@@ -1 +1,2 @@
 hosted_zone_address: arc.fedorainfracloud.org
+user: fedora
diff --git a/ansible/host_vars/mailman.yml b/ansible/host_vars/mailman.yml
new file mode 100644
index 0000000..edabc61
--- /dev/null
+++ b/ansible/host_vars/mailman.yml
@@ -0,0 +1,13 @@
+ami_id: ami-059f1cc52e6c85908 # CentOS Stream 8 x86_64
+ssh_key_name: 'mobrien'
+instance_name: "arc-mailman-test"
+disk_size: 100
+subnet_id: subnet-0b2147c4b9a942cd3
+security_group_name: "arc-mailman"
+vpc_id: vpc-0fe7ead908f270a09
+aws_region: us-east-1
+open_ports: [22, 80, 443, 25]
+instance_type: t3.xlarge
+initiative_name: mailman
+dns_name: mailman
+user: centos
diff --git a/ansible/inventory b/ansible/inventory
index bfbd50b..57b79e7 100644
--- a/ansible/inventory
+++ b/ansible/inventory
@@ -8,3 +8,5 @@ datanommer-timescale ansible_host=54.146.95.101
 datanommer-adam ansible_host=54.90.63.232
 [pdc]
 pdc ansible_host=100.27.3.145
+[mailman]
+mailman ansible_host=18.209.248.21
diff --git a/ansible/secrets/arrfab.pub b/ansible/secrets/arrfab.pub
new file mode 100644
index 0000000..9763bf1
--- /dev/null
+++ b/ansible/secrets/arrfab.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDRL1TUUwizrKopU5AOvJR6jCBAIA41Jr5nAZBZT3gQQAzEETgxeDJXGfiG9vZnfNMZuVoiomgxl+u8HaiyKV8CiXOiE/Afj+6qsdmbUlAkOCs+rAHoFiaSmkKP8gC7yMeBAO22FRDH/P+OAHOwFxvcaeOKb86xHPlRePOMABRWZBpdUNYUOE2ZD6jn2ywnhxAr2BLOmFKbIJsMirvQS3v4qbjyzmcyje4qnw9Ypen79VGz/FukEc8tJKhrD5dvncNEcdA0WJ/4fjHv30fpeAkil3ChSkH5u0d8DESoBba21f6SySYlAwJmZVUM3Orb4hgMkP+JXIvL/UcZMyC7pEmFwMGXcsQigInwLj3RMZ6CKbZ6VTtcYEGZ4h7uD8YJNwGsdDcWYFOnyIZmsY1KrQ4oIBv3WBo29VcdzoyZaatnieQFa5mc+mO7WWdGHp/rd1r0OdhjbgbgjViTGaiVN+YDXWth7GBgvEVQrWZRmYGOmbKyJQgv25lFpQvRLw5WSPP3uEoXVLk3KpoPUckMd2i5N8HutaF16psP0MaAx3NxoRFPHI/+ko5LY3pNcIQtAwmIRbmvdit7KZkF3SBwxZ5bET/XdlviOkT9HtGDhNoEZ6ESIK4RyLIlHbXsDWFu2nkGNlTcv4EJxFHrsoaPW323sdsjhSgeB8Ip0587Tp5imQ== arrfab@geonosis.home.arrfab.net
diff --git a/ansible/secrets/zlopez.pub b/ansible/secrets/zlopez.pub
new file mode 100644
index 0000000..211c4d8
--- /dev/null
+++ b/ansible/secrets/zlopez.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFCCIARvUAwi4cF1EzQwQ+sRqdHsLozpchfFrAwhsPa9c4wsI94J0H3kB1xC+grqYv7yva2awo5laC5GPFCPJQuGq9UKYmuXf2eS7Tz6jP9JMLdufcIF4OE6zk9xVPAJ9m1fwPjfe6yj0jm3NVVIqSGDtIroK9M9Cq2f2iYrU+vmnimSB9A9o5Ks0NzmGbq0yFDvR420iz5yw4fWwzaTfToaLJ73RCQ6QZlhvjd9+ztB0ZJZJg5N7r1DSMqdQ16ukQpkspDyXLhVi5vFR9PwWn04NE83KFUEGBf7m45gqIniclk5lwciTra7Q6xP0TB9HuKHkNhsT7m8+tBync4LIR zlopez@localhost.localdomain