diff --git a/group_vars/all/vault_mailman3.yml b/group_vars/all/vault_mailman3.yml
index 53d68b5db8fe9d5f785c986bf18529b59d9fc374..dd4a58d2436b78a6a2046b79fe27a233b79e0654 100644
--- a/group_vars/all/vault_mailman3.yml
+++ b/group_vars/all/vault_mailman3.yml
@@ -1,23 +1,26 @@
 $ANSIBLE_VAULT;1.1;AES256
-34386532346634376634376461353464396132666530366431613130613931366634643438633735
-3462663739613064623538306432623132373833613538330a626166323436663430633861323036
-65626161336564643539313335363962646164633161393532376263336135323631653232616235
-3066353432336636340a626631643830313261656163373137626332633036376435396433616133
-37363462653066333133386439396637396233653232653736383061663531336536633863363635
-62373338326638363132393730643231376639313863366334613931633239323362303730303737
-35303562626635336165643736633061383235636333353762373061323664383763363736353939
-62346533666635326439326365383433383433633562663964316431346366393065323635393465
-35636330303630376566336635633361356336336331383863316532316234363861613338343534
-33653264363930373030383166653966633237356461633561393635383433663236643362303062
-64356233363034623137613964343735303538353430393363373736323136653561643762666134
-36323633356437333238353064303863353262666564633531353066323762306662363130323032
-65396632373631343332313238313837373032386639343135343262376237663261626435653236
-34313030646138393838366163633234656339303162613331626265663035303439306538626533
-31303331356538373365333436306337333936376361346439336363646230303331396637666334
-30343330373730373631336630653064343439336666636535666638393765306231366530613236
-33643862303537333930653932396139623139313938336166613266386661313365336639363731
-39303533316431363539386633313937386566353431363733633833333563663636396431653634
-33643030616136303165643861363434303333366365346361663333626661363061396437393062
-63653431316262626464626665643733656335316235613661663134616161393765646639386662
-63643430376432643730613236646636613261373139323362633461343765353139366638313061
-3736616530353539366437343865613934303431633739333162
+34383835323639306337626539636433613539636466653630383234333063623930666137646438
+6631373661313934656531363265363061313132633031650a326434306636396139663436623133
+38303738636465343430396461353533336165353033356430613036623136353137316338363364
+6563386438653733610a636566326462346364323362666639373430626663353935393763343638
+34393436616131376639653238326266336161393130386232373836303831646133303133313639
+65666136303433636632663261363930626161623938353033623761663264643831353063616432
+61373963636164663832666532313833656133363434323831323364643561616134616536646538
+30363632366661333936663139666166303737316166383738653038343034396265313466643532
+64646532393239613631653336633361346664343561643734316336363632383935653534323263
+38616463366235366636633839663464393562316138343534666430643266663439363838353239
+65643030666564343661343466646333313566333561646662623731656666353166626566333637
+31656432613439366661343834636239356139663263303965653430336662396431643966303739
+37316166663132363062323533646131623630666332653565303630613039666231323130386139
+34393639366537343463393133643832653133333065363839663333366333626132306636663136
+36316464623664303762316461386235643363353262323535383065346563613261623966313530
+37303466623834333537346265323766633934366332396436643962306637643262343463383963
+39393332633465333864346437383533633465343632323061623833393739646361383766656131
+31393066633364646637333765303266363438373330326334323666653262396137363036373734
+38663339326435383730366532363264386334376533653030343430633836376261346237646638
+37663864633832623237623335313938616562356366303638386531323035613534323130333439
+31613931636238373864303166623636643735383837343464323663633263313963626632633031
+64626535333231623461656661323264636333613430366637333631306663343438353763393537
+37663034336338376538333632623939643165613836656334323638653133333362393632653131
+38663937633065313531376134333238346163636162386665306332363635653934363761396339
+3366
diff --git a/roles/mailman3/tasks/main.yml b/roles/mailman3/tasks/main.yml
index 29e547e24a9bdea0f7cdfa8ac3b0ff0e53605b14..e68eb14576fbec8ad00cbb4a4df19b455de240a3 100644
--- a/roles/mailman3/tasks/main.yml
+++ b/roles/mailman3/tasks/main.yml
@@ -1,11 +1,12 @@
 ---
-- name: install mailman3, python-zipp, python-psycopg2, mailman-web and uwsgi-plugin-python
-  pacman: name=mailman3,python-zipp,python-psycopg2,mailman-web,uwsgi-plugin-python state=present
+- name: install mailman3, mailman3-hyperkitty, python-zipp, python-psycopg2, mailman-web and uwsgi-plugin-python
+  pacman: name=mailman3,mailman3-hyperkitty,python-zipp,python-psycopg2,mailman-web,uwsgi-plugin-python state=present
 
 - name: install {mailman,mailman-web} configuration
   template: src={{ item.src }} dest={{ item.dest }} owner=root group={{ item.group }} mode=0640
   loop:
     - {src: mailman.cfg.j2, dest: /etc/mailman.cfg, group: mailman}
+    - {src: mailman-hyperkitty.cfg.j2, dest: /etc/mailman-hyperkitty.cfg, group: mailman}
     - {src: settings.py.j2, dest: /etc/mailman3/settings.py, group: mailman-web}
     - {src: urls.py.j2, dest: /etc/mailman3/urls.py, group: mailman-web}
   notify:
diff --git a/roles/mailman3/templates/mailman.cfg.j2 b/roles/mailman3/templates/mailman.cfg.j2
index 128350ec68ce6dadfcbe148cea9d78d37d9923f1..4d222d5e32b6346f0f080ea6517dc75fb9900519 100644
--- a/roles/mailman3/templates/mailman.cfg.j2
+++ b/roles/mailman3/templates/mailman.cfg.j2
@@ -15,3 +15,8 @@ lmtp_host: {{ hostvars['mailman3.archlinux.org']['wireguard_address'] }}
 lmtp_port: 8024
 smtp_host: {{ hostvars['lists.archlinux.org']['wireguard_address'] }}
 smtp_port: 25
+
+[archiver.hyperkitty]
+class: mailman_hyperkitty.Archiver
+enable: yes
+configuration: /etc/mailman-hyperkitty.cfg
diff --git a/roles/mailman3/templates/nginx.d.conf.j2 b/roles/mailman3/templates/nginx.d.conf.j2
index 81df5eef110932bb18e1a1eb4ea523d2c7dbd759..e0576e8cb6db07405879e592210d04dfff57251e 100644
--- a/roles/mailman3/templates/nginx.d.conf.j2
+++ b/roles/mailman3/templates/nginx.d.conf.j2
@@ -1,7 +1,7 @@
 server {
     listen       80;
     listen       [::]:80;
-    server_name  {{ lists_domain }};
+    server_name  {{ lists_domain }} localhost;
 
     set_real_ip_from {{ hostvars['lists.archlinux.org']['wireguard_address'] }}/32;
     real_ip_header   X-Forwarded-For;
diff --git a/roles/mailman3/templates/settings.py.j2 b/roles/mailman3/templates/settings.py.j2
index 6db58dc13d5524f7cb340e4931f707e9b18ac1bd..ecfb326e620ddb44e2936d99a6446fd4c08635d3 100644
--- a/roles/mailman3/templates/settings.py.j2
+++ b/roles/mailman3/templates/settings.py.j2
@@ -36,6 +36,7 @@ SECRET_KEY = '{{ vault_mailman_web_secret_key }}'
 
 MAILMAN_REST_API_USER = '{{ vault_mailman_admin_user }}'
 MAILMAN_REST_API_PASS = '{{ vault_mailman_admin_pass }}'
+MAILMAN_ARCHIVER_KEY = '{{ vault_mailman_archiver_key }}'
 
 # https://docs.djangoproject.com/en/3.2/topics/email/#smtp-backend
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'