diff --git a/docs/ssh-hostkeys.txt b/docs/ssh-hostkeys.txt
index 6a45f5684d7a8bc45bbc7ce4ea61fe5166c98f98..f9d5527b20201f66bf3acac789b8e5e8ecca7da2 100644
--- a/docs/ssh-hostkeys.txt
+++ b/docs/ssh-hostkeys.txt
@@ -142,15 +142,15 @@
 3072 MD5:50:c8:93:43:05:d5:73:a4:84:b1:07:66:a7:20:a5:79 root@archlinux-packer (RSA)
 
 # lists.archlinux.org
-1024 SHA256:az7ZHreYtkvFBgA1goSjry0/e62JKhk4NRXXgT/+VFg root@archlinux-packer (DSA)
-256 SHA256:vt22ZCpoWg0/L5uFfNsbrZ5EkdBnOh5G3jENuBpQeGo root@archlinux-packer (ECDSA)
-256 SHA256:E0ivN9XqSi7U9GIPQ3JUvw6CP6uiS68M5No0DA/BFfI root@archlinux-packer (ED25519)
-3072 SHA256:5YZCzd1C0bVsaye5l/lNiqsn1/IdOGjTmHqwyjV8lc0 root@archlinux-packer (RSA)
-
-1024 MD5:74:6b:bd:62:a9:52:52:e9:f7:78:fe:44:8a:fa:4f:d2 root@archlinux-packer (DSA)
-256 MD5:ed:60:7c:e3:d6:4d:5a:f5:b9:cd:9e:30:4a:6a:64:c0 root@archlinux-packer (ECDSA)
-256 MD5:a7:2e:f4:3a:3e:34:84:ca:6f:73:05:0e:2e:da:60:d0 root@archlinux-packer (ED25519)
-3072 MD5:ae:ad:58:b8:0a:12:a7:d1:86:f0:c6:ba:fa:9e:ea:9f root@archlinux-packer (RSA)
+1024 SHA256:/o3BhNZ6MdfHXrqDzVxP5OgKcTmo1/e2v80Xb+Q2ypc root@archlinux-packer (DSA)
+256 SHA256:Xe+YrG+IfhtQkNft+SB7UsTQCIgbqNnqMl/Pqs6uzBE root@archlinux-packer (ECDSA)
+256 SHA256:fAKD+26rDZ74MOMWZI8L3k2c7RzTYd69+iwKp4zhw8c root@archlinux-packer (ED25519)
+3072 SHA256:NyspEiVRnuRtL854ErcdybtjoBia+miQkpuToYZEl78 root@archlinux-packer (RSA)
+
+1024 MD5:fb:bb:0e:a8:0c:5c:41:5a:b1:d9:61:4d:e5:c3:bf:b1 root@archlinux-packer (DSA)
+256 MD5:56:43:80:27:a7:4e:4c:1f:a4:14:dd:d1:eb:37:13:a9 root@archlinux-packer (ECDSA)
+256 MD5:3c:91:d8:b0:4b:5c:36:40:79:27:8a:c7:24:d6:26:af root@archlinux-packer (ED25519)
+3072 MD5:88:99:f2:47:b1:e3:3c:99:52:67:d5:d5:55:b0:af:2c root@archlinux-packer (RSA)
 
 # luna.archlinux.org
 1024 SHA256:9Nqu9y1LhT3L3Kd6J9CSyuOc1AdGWo0eLsPxoc5bpaw root@alderaan (DSA)
diff --git a/docs/ssh-known_hosts.txt b/docs/ssh-known_hosts.txt
index 40f964d9444f20d1f8e091585fddccd3291d0178..26c9e47447f4a8df8ee0f76996d8c47b818adba8 100644
--- a/docs/ssh-known_hosts.txt
+++ b/docs/ssh-known_hosts.txt
@@ -64,9 +64,9 @@ homedir.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPxEHvFCXujU6s4eW0U79o
 homedir.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDuQbGoCSIPisaZeqtJhM369ugQWc8pHE8404AZu0yUgDxMl6AP5BUfdynlR6VGt4edSaEyp9BkT15YaKh5vph/9MUtZ2zbQ7WPRuvfLNG+RI458q4CYdykVMmTs1DEeAxaVMIAL3225pqh7QMcME0edX9f4PLLkQk8+AAAy24rvgwxLE0BnSLB3zp7wCJw5rm2iZAcqsKkIZw2FJKMlRuEovdvgc7A0FfkSc8muvvHET1FK/Uqv5i9R2Xk3NPFkt/bzcwOVBXCeqUrjLmD0UhRWX8J8GMmrEVPVQLBT6mn/OtlXpOiDcr9HkSLS1mqo59N9wyI4tCKjYQZMEWU36PYjXlDzqOGmdAR6Ly8vDo3BC+ByQqLf/ixkoFD/I5inGejPnAv9eXuiP8o0KoPDOALD8gqwqCoPjElE9ZVObp+NJbuQeXRZt70VKxZEWrUKxKxHM3RoYvgd3h/GHaYEGWdbvTMTVK+xnrczL+Eme4Y81zA8KTwY5qbyc5QCHvksKM=
 
 # lists.archlinux.org
-lists.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMaKy4TZsOKC5tAJvfEXdIeLU+TMVHiwlJAWxSl9MKikkyf1Qmh0NAMFv0tYd+sJSwwaW+AqEuVnsO+JponGIqc=
-lists.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIWh0NnauWbG40MJHmMisPPGrMkY+jumTBajLllb9CBQ
-lists.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC9A62LNNGbjqdpEBbinEHJMH/RhjcDIH0SU5BbJB/WONNkhcNWZ6h6AnyEhOhspHLNBxFroQf3voQ8Pfu6gBf9YeWe60j2aSMQBwnWIug8TB+HuPrOWTWdjEudagZjdZ3jdVRX2Fjt8/C2QL2JfRFZWEpWKOa79qaBOTF3qbvNUJi8iggC4zSAwJMmJ2JwCnFBz69sqFWKTgPCE/SzRZodHAiDuO7XSCn+zPaG7re8P6YZz3eQSizcJMUs+t9L17ipqgUVDwUj9+1+q6YSxxNE4t43xYcUEQMIn48XzAQo1ZBhkzPGkV2ezttDkpAJgdKI0ssOoG2EA+1zLF7rKgBufLP3Fi03X7r77ppFrtKyBcxFYoChs0Twz0lV8JM0qcKWXldmu0s2+1o5PFzx+qfsa+EQiczydgZg0Lg2hOhx8jfGI8HQCbYqw4CirItVYF80/HA9jxt8ZQiKsJCYiZ4/4J/pd0eQlpmyy73Zf49CMwxty2HzNMFmRTx7ksqrbu8=
+lists.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKBHMlX50Jr2HiVJ/qDSH3mAjobpbBrGvBRXTKB/xXFBiVXCbJQCQ9HKXQZunLALaIm+jAgpskbXqLQMEpWzST8=
+lists.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOVKwNsXUXpgNhlwPVlBRNlpvOt0U9deANS/n//nxbe1
+lists.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuKQnkGRdXyu74f92lzJcQMMDjTzVXkne/mLHiMYKQWlboIBIry3FkzyUGDLbNlZOe4PNR43D9FI0/1EjAuVV72HVQ9sidCbJR/azw3+JF8zwU1HDMOhtCNaWYNqk0DHDvHuWhL6N0duFASf+ZTKRB5Rgk3+p0FisKMCep2vJy5kHY0829INk6ORgPxYzCHCZOLEfZX0aydwscTnubKq1t9blWUdqKSm5Xq5+NEJNPKlo6TgdcBihkdAyaGnZ9KWrXycV6j0UaT/VJNuumZ9KlsvI7Xi/TVDWcLcsU/UqeEvnzUi3oRrvkADzIcoFa5/QrSRQJppKAUgjuhOuk+Px38IIvRdrwDxDoChei+qU8S2O24PP7Cu4oYZ/ecGb8wJleEWVVaYrD5JTEugg0iTe2t0LJiP6rTC1faxErZ9wru18nGNWYR2b+b1MfBzppAoikZUoqygKYYLAerHj3B9wFmw2RJG8JFZ95lMukJmDG8kCYz7eq753PYAAmpFZbdZU=
 
 # luna.archlinux.org
 luna.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOZAVWmj2k+dHTfyum7FyIivGcVUkDFHaXmPNxDwF7l8TvkAN8VDQJHEEGJhALMYtNsQ+kt0gksSh4HZqj9n5hI=
diff --git a/host_vars/lists.archlinux.org b/host_vars/lists.archlinux.org
new file mode 100644
index 0000000000000000000000000000000000000000..c162214f42b7163cfa681b52347443df3fb6fc3e
--- /dev/null
+++ b/host_vars/lists.archlinux.org
@@ -0,0 +1,3 @@
+---
+filesystem: btrfs
+ipv4_address: 95.217.236.249
diff --git a/hosts b/hosts
index 771bbb395562b2017bbd2e7f4769c34bf5b135d7..01531b0f09f30df2b1c5d25b91a0f2936f703941 100644
--- a/hosts
+++ b/hosts
@@ -46,6 +46,7 @@ wiki.archlinux.org
 patchwork.archlinux.org
 security.archlinux.org
 md.archlinux.org
+lists.archlinux.org ansible_ssh_host=95.217.236.249
 
 [borg_hosts]
 prio.ch-s012.rsync.net
@@ -144,6 +145,7 @@ runner1.archlinux.org
 md.archlinux.org
 man.archlinux.org
 dashboards.archlinux.org
+lists.archlinux.org ansible_ssh_host=95.217.236.249
 
 [kape_servers]
 asia.mirror.pkgbuild.com
diff --git a/playbooks/lists.archlinux.org.yml b/playbooks/lists.archlinux.org.yml
new file mode 100644
index 0000000000000000000000000000000000000000..9829a8c3a326b4d3d02ae34acd729deca4d1d3b0
--- /dev/null
+++ b/playbooks/lists.archlinux.org.yml
@@ -0,0 +1,16 @@
+- name: setup mailman server
+  hosts: lists.archlinux.org
+  remote_user: root
+  roles:
+    - { role: common }
+    - { role: firewalld }
+    - { role: tools }
+    - { role: sshd }
+    - { role: root_ssh }
+    - { role: hardening }
+    - { role: borg_client, tags: ["borg"], when: "'borg_clients' in group_names" }
+    - { role: prometheus_exporters }
+    - { role: promtail }
+    - { role: fail2ban }
+    - { role: rspamd, rspamd_dkim_domain: lists.archlinux.org, rspamd_dkim_use_esld: false, tags: ["mail"] }
+    - { role: unbound, unbound_port: 5353, tags: ["mail"] }
diff --git a/roles/mta_sts/defaults/main.yml b/roles/mta_sts/defaults/main.yml
index 23f424313599968c084725558ebcf60149bb1821..1a8aa4ac95e0ac5a36f991c4855990da97b6757c 100644
--- a/roles/mta_sts/defaults/main.yml
+++ b/roles/mta_sts/defaults/main.yml
@@ -7,5 +7,6 @@ mta_sts:
       - master-key.archlinux.org
   - mx:
       - luna.archlinux.org
+      - lists.archlinux.org
     domains:
       - lists.archlinux.org
diff --git a/roles/rspamd/files/lists.archlinux.org.dkim-ed25519.key b/roles/rspamd/files/lists.archlinux.org.dkim-ed25519.key
new file mode 100644
index 0000000000000000000000000000000000000000..5827291b0921c55d7d86751576baaeb224357149
--- /dev/null
+++ b/roles/rspamd/files/lists.archlinux.org.dkim-ed25519.key
@@ -0,0 +1,10 @@
+$ANSIBLE_VAULT;1.1;AES256
+32643030336361333038616163383438386231643663316431643636363464303539353638376335
+3163626433353836356262333164346466383331613566640a613037623732353665613536316666
+30306166616463643363616437366535363039376536323335336539333061366430356138613336
+3762623135336466320a343866353630353264643964613737653866306634303938313633653530
+62373336653566346333383139376334623562613166333537366230376566643832393937633537
+61303262343864316232306666316562356663326264383634646639373865386262613165363839
+39313531373034646339356139303261376466633965666439396133333164663031646135616534
+62666533613364363537646166656531653964373333313432616338386338633366343862623936
+3263
diff --git a/roles/rspamd/files/lists.archlinux.org.dkim-rsa.key b/roles/rspamd/files/lists.archlinux.org.dkim-rsa.key
new file mode 100644
index 0000000000000000000000000000000000000000..dcae3c7ae5bd08d3325b230ce79771f1412b36fd
--- /dev/null
+++ b/roles/rspamd/files/lists.archlinux.org.dkim-rsa.key
@@ -0,0 +1,169 @@
+$ANSIBLE_VAULT;1.1;AES256
+35313134333837626139363833656361626361623239616539396131313434663662363330306234
+3063313365333233626662303865396236633235393432350a396236663430343362353933333062
+32303633653561303634653636363664333933636631373563303863356663663133313661633630
+6365326439343132340a633763303830326263393566623463356665386562363934643065616434
+66353334383738643063336638353439656263343330316339613364326162373763373265373161
+37623835383737326639613564396535633165663730313762316135363832656331376234376133
+37363663383139626665353965616538343039323235336234616531303536393335613630633139
+36646361376532636634313062366465393766636264663333613032316533626561656465623864
+39633131636234633266616139313664336566623863663130633831643965346538623665646432
+32326561636265353639326236323138396562333237346366383638346337366161356335633238
+66303338613035343863383934373231356534393632643032306663323532646334326134643236
+32336665613834303935343330393239613565333564633464616364366636373337346464393136
+64366237623933633134643031336164366435623934656436343661373964366136366138323132
+62366465356232386566653338613465373766383030313935363263643138366438343130643439
+65376437646266396165353937316434303238356537636632316638383539613666636634396436
+62636461626263616164616330666633663537666262313430633731316462626361343037323638
+36326534396364633330623934353932646564306561306633636566353062396332386537306361
+37643766336133373836346334303935303030626138656436363036356530343935366434396432
+39333237623434623363333261316362303632373466313538666139613132383331306165356436
+62663561326232633563323462653066383063613938316337633338653764313134343634643465
+35653535653666383666396637666364363631373362373262666661383164636535616365666564
+39353864383766653231633035356531316436353939316265386431393463666432336331653739
+37363066396661636331343134333462306231343366326539363733633031393532336430346239
+61303866393731333237373031346565366236616135373435396234366136333236636263313832
+66366130623435333665303030336231326166303132386461623732663761393361303338386334
+64626439343263653432646339303565356438336132393436666363316430646164343632366539
+36353937656638666264343930373133366336313364363339666161363534633139643539366164
+34393430656262396461343232303239306666313862363236666436383331623839343534313863
+65646437316165623830356464363931386631353033373465613961616132376238616530323566
+64366638356531316431313931636336613537616336326539353039323130356430623761386536
+64343732643835613832343165646230323865616365636235316537666335363230666632313363
+38623032366437653866383166373964363962386231353166653262393638313430616164323765
+65316665353162303663653863343962656661643739666564343130653131636337653437623363
+61633465346638663732336336373535313031303635613763376661656464373033623233343437
+34656564306463356433633366323339326465303734656633383663303561646231363864663165
+63623130363935613837353036306537333531326133626134643461666566616365633963396366
+65313561326231626330613637356166376330353461393866376466616635343235373461626635
+36643636623538303863636366306665653034633637356266393236333839356461663164663066
+65646539643863613762383966356262656234353733656661343762353237363934643739393434
+63303561376135366666666630333338363831343133326137323432306666353466613232656334
+39623066343535333665646130363462646539313038656230313461373535383862356131613033
+62373338373066306137613531383338303330636365363932333238346639663961613364633739
+37353133396364386232373861313236316130313038623233623238366230626266373461613736
+36643139363237626339656633373763366335663264613832373565663335353033633339393465
+31353932636133636134663437323664623237333561366434653565326338363236653262363366
+37333738663531373231613532626433326232343062373061326631373864643763643138306238
+66636465373335383061663263316462326130336438613462636461313466663838616565663235
+30613730383766353365336661616234376435376336663861306439343965343537643461353364
+32653135646130323534383938383466653934616437366566366639646161663230386662636332
+61313461373564313464623864316365373764643661663163373262383563613432613037653537
+37323930323730623562343233656139376431366661643231373463396136643463663738383063
+64663862316161343632316132643065393437626639326335303764393835646162633736656461
+35633865616365363135316132643635316633643866383834333032353933656565303362366362
+39383739363937373438636531366138663363326264623036653632616336386132386533363466
+37343461383532373766616337363163646632383662316538326631333530356166383437316435
+63643131376564636336313766666463363039646361666265633562343131336661326135346265
+32363863396665616264393738323137316636623932376533343263373362386661666562616362
+38396632656132626635366562333130353662373433303539333836363338616161373366613663
+33653031393532323364363163353065653731306234626265656535656231633961663434353864
+30613932383263383164376164353464663135613931626665386437353865376133386333353535
+61396362333731393633616165313934376561326235663937643838633362663831316261656338
+37646230316561323934316465343263303564623330613733396263313463626138303535613262
+65643332616232376337656138313662616130653566646265666438303538343830356664376637
+37646230363666316235346539326662636638643365353665613666623261333961323564316535
+63373533323730326266336635623232363565323530653834393766373935356430666365616531
+61323331316130633664343261653765303731336234636137373333373737356430353365316566
+35626535643964633839636634343233313461356163633261656362376331306238383736623631
+62333236383163346130303565653538393932346661363563653462393262336662333233373861
+66623536333835616162393462363462386562633034373334653962623137613562633638646437
+61316230383538343839333931646264306134313266656536623537383930613561656536393238
+38303731366638393936633565383530623561313061376666333139643663646462656463376137
+62323138663035373331386166323638356534313937616338646331376635346566343230326563
+62396162343962626637373938643962653430613062356537303966656132653662626331613333
+36626332383435326236663166353133633133346364663866663564366630356234623862373866
+35376337343066623465323562303262623164306133616133323232313939373337326230313630
+33613366666632373366663836623339386531623863393336376333393937386434303430343230
+34393037343032393034396132323531323066373265316332366232643863653531396561383664
+65383137383832613332626264363562363134306362643732316430663734323331313538353938
+34313036353332313832313435666139396332623434616230346361323532323536363862303033
+36316361323465333838653663646435643164396365653561333130393636366438303961303032
+66316463366463313736383834626532313266633466323030306261336332396564303964366266
+30636366333032616566336433373637373330383637303865353066636539303934616461653431
+31363031613863353534653366633133626230646136353036663436643239626335343138313634
+33613762323439393137366262393230616636373735623432616537363663356566323164313336
+35323036663765353562636335666337616333633865643637396632663531363432306239383931
+35303364333035306336623038626330353834626162346434623131313638343462346335623032
+64623165333466623134326438343735663330633933646239393065663762623139383338393563
+61303766376463663365643461663265383433363232623438323132356432396662626465653535
+33346330646133393436396236363163336533656632376139633232613832633938623937376534
+35336264323064333939383365346537613566373539653862323139303161653362353235366638
+30633832353433386630303836346636326662376365626435366633306263666437393431303634
+65333039323331343237383131363363633364623330653666663766643963363562393564363632
+62356332653730343532363461393831396636373263353830653864653638363065313065393533
+34636336303830636666356464393164636363653866323733323265306133613165323136366136
+30356336316363633439303064316132343333653966616530666636333066323261613836663261
+39373235656636643931393636623261306237626166666135396231653935356434653066323563
+63396665333232633339373964623035303762363132636334666337326631653661626431316665
+34643831346161643963396463353663313632666663303232383630376430323138363161636236
+64363962333337336530613730643934653438626533386265653236613162613438306430303164
+35623737393131623661616638323266653462303866613636383536333434613638393432636364
+30326636616266643062643135653238623061653561396439316636363037383761653138353166
+64313331663236396532326139383564326430633236366638646637623736336332636464393738
+39346162313839616133336166356165346231346538346530666362663733323964646438303137
+30306638396264333034313132346137653433376638313830313261343534613136643234336435
+64393236373365663963646566643366306563333665306538663162343262653865366130633538
+61383163646166633835376435623939666338366463313363326638306430353639663332373665
+66653536636464653032656433356137333734393363303962343562646636636532303562663834
+63623430623163373865663339393361616530373162356365613264336631333866313661366630
+38343731353335316632323463646431633566383532356638383435323133393030633462623863
+61316633366365343833383238356636626164393630613463643838386537653039333435353139
+65633436326266393961326163353630666237313962346362353063303465353332376663346238
+35333766356331643261643661383763336334396131396365656563643031316565326636393639
+33373864346363393331373535363935363033656165613762333761613165383863316264353361
+32373035373264646433666563306661336534363462376638633937336664326335393864643565
+30626533316436313237373661636636396134643864616364633065363238643061643064633633
+62363335356536356566303935323038383332376433323536643761353966633032343361643335
+63323432643833643635346165326534643936623862303837363736323133653464623963343730
+65383564653566393865346662626435633466323032326236353433356131653034336634333663
+32393831623139386431343466643731383166343230336266353563656630333730616563356565
+31613436303434373134633133633538646138393563653938306436653262386432663537613432
+63663333353735383638666637656438303564363838303932656632333935353531373662323936
+62303864626334323464323865636464613566303930613537643732633537623734373930626537
+32386434663566623465636564666139663031303439383666356236346531343832333235386533
+63313062656161636464616131393736313534363138303562616436373134356238623232356163
+65353130633461656464316238346363376438313966366538323034653835363734663835633830
+38623962303266386131373364363366346565303237643932363031653466656531343834393639
+32616233343637383733613235333939313130333765643762616230626533663437663136356233
+65353031616432303137363166336438333934633434633034363931613532636531643039643539
+64343835333533393236343237373466313662643336363833643830656466376562643434353132
+63663736356632333563623532323761333830316166313162613361363430373238666566376661
+34623836306231666564303634333936303534313539613939613831636438653266323262613731
+63333361616536353733353664356164633735383536383163316337333539393461643933383334
+37636664303833363634626164373937643231343833373031383264373231626535306365363164
+61316338306265343631636663613138373063353837313136363331313537343065613530323137
+31303961366333323836656561323136633139643233623530323263333561353362313833373666
+61326634653035383234373032303834383165373562653761613431343335386236323831326466
+38616539386538336535653637663932353338383231656634613238616436666565353231336437
+33633838386230366162643331623265373037313530353165623638626433383765643731643338
+39356564316135653032303736646135636531393339313239616263633838643730363765656465
+63326163316661663632666136316436356239316266373966346266326431393335333961383137
+37396537373139396665396438336165383832353332396632343134313564336231313035643536
+65373436663634316534383337356435626162366137643837396337636530373730623535363434
+64363332386430613530383131653635363233663732306331393439376666356363326438343366
+65313030383235386563626536653162393737633537343862323833363565663136643830343562
+37353066636531303530303866316262666339616635306363333934303561363761316431363734
+34343936376264666661373066316163356239373763663836383930656265383361653931386538
+35613266666130303835383335383034316438346630303736316438313830663864643261333033
+36616330623361643331616335373437616561326165346333353836623337383738643963626662
+30636234323938393461656138646234323062396364366433373062356536323566353035386664
+30366533663331633465356563313766646134343164353230626663396233343265643231393531
+65333962653339666638653832613835323936396532393562326530633039663337306239306234
+30336262663630663262353233653063396333336430663637623361373336303532656332346530
+34396463333263636137636639363236353864646134316265333761636566343161656335316535
+61393266313366343637626466653436303063636634623236353430663734306337383634663734
+39356435623565656131646164323366653961613438383961336562313033373261313765613964
+34613336663561643835653534633838373830636336313562386138363434636239323030616464
+63333738616537366235323334633738643062613130386339323031653038363166616261663861
+34373963386436376239373739653866363530383633633031376631396334396661613063326233
+33656438343732393332313763336534393465353333323631313339313965393165303965393338
+39353639356232386563663331633439396361306239343633323538356639346663656261306538
+38623834306365653937393735623030366666643264323632643064386135646365353635666533
+64386464323264393161373461333834323263366536633830323733353664373065353833616632
+33326133643938663962626635363839306136633165306538356233666533313865363864643766
+34613634666531323566663032336662616232346137383163343330633665666338316438393834
+35636662613664373434663961643662343439303133363966303730666333383636373638613634
+64396338666233316330393934333536616539656630393064646130366265356236326530653463
+63353131333666626239653833363935306238393962303138356466626436343664326538346364
+63613532333538633338
diff --git a/tf-stage1/archlinux.tf b/tf-stage1/archlinux.tf
index dc3135711b63901f7633d1257b67720303fbcc64..5b3f8748f55f9735e986ef4d3c59621732d162ad 100644
--- a/tf-stage1/archlinux.tf
+++ b/tf-stage1/archlinux.tf
@@ -167,9 +167,12 @@ locals {
   # Example:
   # "_github-challenge-archlinux" = { ttl = 600, value = "824af4446e" }
   archlinux_org_txt = {
-    "luna._domainkey.lists"           = { ttl = 600, value = "v=DKIM1; k=rsa; s=email; \" \"p=MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvXrAPvtdX8Jrk4zmyk8w9T2zdAJGe7z0+4XHWWiuzH8Zse6S7oXiS9CVaPOsu0TZqHqhuclASU7qh0NXFwWyi2xRPyJOqH2Clu7vHS3j5F4TjURFOp4/EbA0iQu4rbItl4AU11z2pGSEj5SykUsrH+jjdqzNqAG9d4lNvkTs6RRzPF3KhhY+XljaeysEyDSS4ap4E0DYcduSIX\" \"oD1exFv4SEbXThD9PC1u81w4xusnmwmfHtR7aazeqPDP+S+FqDRy2woCaQb/VMbqMYVuWTVKJ2RxFyTKredOOV2c5kzih7GViwoetll/rTqO4aVbeir9K4f6YZg85dSQtVwEat7LV+zBnQwp3ivWkrIk8VEdSsCSaJlgattBiPHsfFFv1xw4qi3h+UvfCGgz35dtlnzd/noGhNARg0Z+kaMSTjy75V1mKx5sCH0o8nAX2XU8akJfLz58Vg\" \"kTx/sfealtwNA0gTy1t1jV8q0OF5RA0IeMRgCzeH2USOZI98W+EAUsGG5653Vzmp3FJRWp1tWJwRJ0M/aZ3ka/G1iTx3rNNcadVk+4q3gz3KnlAlun+m58y8pNWKjYuxmu9xkDRwM/33rv98j0R8HZO7HFL+1vjKkxSEuzmnTQ2O9F76/OsQoDPZ1Z6nJRvK8ts8PQr4ASKohby62+1F1M8U2Xn7u84dYLUCAwEAAQ==" }
-    "dkim-ed25519._domainkey"         = { ttl = 600, value = "v=DKIM1; k=ed25519; p=XOHB7b7V1puX+FryNIhsjXHYIFqk+q6JRu4XQ7Jc8MQ=" }
-    "dkim-rsa._domainkey"             = { ttl = 600, value = "v=DKIM1; k=rsa; \" \"p=MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA1GjGrEczq7iHZbvT7wa4ltJz2jwSndUGdRHgfEPnGBeevOXEAlEFr4zsdkfZEaNaQLIhZNpvKAt/A+kkyalkj4u9AnxqeNsNmZflFl6TKgvh0tWNEP3+XNxfdQ7zfml4WggL/YdAjXngg42oZEUsnS/6iozOFn7bNvzqBx5PFJ21pgyuR8DWyLaeOt+p55dVed7DCKnKi11Xjiu7k\" \"H68W8rose7g8Fv9fecBatEE4jwloOXsjh+tH0iab1NSSSpIq6EdgcPrpmrllN3/n2J/kCGK6ztISB6vR7xWgvgHSMjmEL0GPWzohGPrw2UQhZhrNV8dJpiLRYmfK+rXaKF0Kqag/F0e4C4jCKFX7NYFcYXYRlN5QlDFjZvUmOILlgnZ8w/SdZUKzpLObGuwnANLG+WSOjw42p9mXVGN6AfOQPu8OjRjS1MyhcdDIbUvZiQjbmiVJ5frpYZ39BTg\" \"CIzYLJJ5932+3gnwROu1OeljWkpBkfHZXPzADus80l3Vxsk91XZVB36rN8tyuMownR/M4HNC7ZE/EBwOnn1mGH7bLd6pva8u5Qy8Y6LrDdYea5Kk7aZ2WJSSRTV+nkPvOEIx+DfsIWNfmkVWzmuVky96fRvwOCuh38w8zpmlqzhDuGSQrBaLFXwAC7LYQ6kPDHzrjQhs99ScR0ix6YclrmpimMcCAwEAAQ==" }
+    "luna._domainkey.lists"         = { ttl = 600, value = "v=DKIM1; k=rsa; s=email; \" \"p=MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAvXrAPvtdX8Jrk4zmyk8w9T2zdAJGe7z0+4XHWWiuzH8Zse6S7oXiS9CVaPOsu0TZqHqhuclASU7qh0NXFwWyi2xRPyJOqH2Clu7vHS3j5F4TjURFOp4/EbA0iQu4rbItl4AU11z2pGSEj5SykUsrH+jjdqzNqAG9d4lNvkTs6RRzPF3KhhY+XljaeysEyDSS4ap4E0DYcduSIX\" \"oD1exFv4SEbXThD9PC1u81w4xusnmwmfHtR7aazeqPDP+S+FqDRy2woCaQb/VMbqMYVuWTVKJ2RxFyTKredOOV2c5kzih7GViwoetll/rTqO4aVbeir9K4f6YZg85dSQtVwEat7LV+zBnQwp3ivWkrIk8VEdSsCSaJlgattBiPHsfFFv1xw4qi3h+UvfCGgz35dtlnzd/noGhNARg0Z+kaMSTjy75V1mKx5sCH0o8nAX2XU8akJfLz58Vg\" \"kTx/sfealtwNA0gTy1t1jV8q0OF5RA0IeMRgCzeH2USOZI98W+EAUsGG5653Vzmp3FJRWp1tWJwRJ0M/aZ3ka/G1iTx3rNNcadVk+4q3gz3KnlAlun+m58y8pNWKjYuxmu9xkDRwM/33rv98j0R8HZO7HFL+1vjKkxSEuzmnTQ2O9F76/OsQoDPZ1Z6nJRvK8ts8PQr4ASKohby62+1F1M8U2Xn7u84dYLUCAwEAAQ==" }
+    "dkim-ed25519._domainkey.lists" = { ttl = 600, value = "v=DKIM1; k=ed25519;p=ongbdFgt5Vimg/VRRbbSVRU4lBCkcYNaPA4K3JS/DnY=" }
+    "dkim-rsa._domainkey.lists"     = { ttl = 600, value = "v=DKIM1; k=rsa; \" \"p=MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4M+y3ZeB9eI3GVgcrvMcI1SYOveH7P5TTRstaCHTlE/aRTiCzu5h6zKwwxEiK6NR5ugbHpBtfFnfnsl1eoaXVFBQfNdDNglHllJOZGVxTnyrFjRJUk9zN+PV/Haz73nAe1hOAENgV8NKnTok1ntaOYSH1AEj4yTswfQkuN23NPrQc1eyy3+hGC+lYpud3xAAl+oT4QE76PaLgk6Hz\" \"HOvZmAPGD3azJZRbobninZZXTAEvZFuPkfpWeUreDU9Hk9VX3zOmnqTN+YjIS5CdV6+Ghem3dCkmR9j3gOZBeBUYD7b+cinTYe/PZO2OG/LWCwN11EYyf1LSBGhBJCF9HPGiGIdhy5T62nKvwDQS0bj1HL+y6pXZdv2C7KgH+lAZ0idpOQ2TtV5e0tlVdryY4QXY9m7mSQ84WsoEdGDsetOhiTEKuqyGnDoYa0wYbM5477LL6EOzS0x3ZC/mbOg\" \"B+FSdzmLWCH/WjuzMNpw9WU+u4BucwVbYcnZ1vAxQQOEnA/Ku9drRHMFixBwodQuMA78j8ICCMJKlUiXmbbL7OFoXBArYJ7lgVs7mlaoEaqzDPCyqs1lJ9kOxdNoZj5zdxERcQhLm+Yo/948i6Js/nkWT0eAjNlHxZuCg3B4z7L4lRZpaGt+vHdcGUIeDKW34O0dWxPwIUmQA4CwmhUB0HWL9UcCAwEAAQ==" }
+    "dkim-ed25519._domainkey"       = { ttl = 600, value = "v=DKIM1; k=ed25519; p=XOHB7b7V1puX+FryNIhsjXHYIFqk+q6JRu4XQ7Jc8MQ=" }
+    "dkim-rsa._domainkey"           = { ttl = 600, value = "v=DKIM1; k=rsa; \" \"p=MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA1GjGrEczq7iHZbvT7wa4ltJz2jwSndUGdRHgfEPnGBeevOXEAlEFr4zsdkfZEaNaQLIhZNpvKAt/A+kkyalkj4u9AnxqeNsNmZflFl6TKgvh0tWNEP3+XNxfdQ7zfml4WggL/YdAjXngg42oZEUsnS/6iozOFn7bNvzqBx5PFJ21pgyuR8DWyLaeOt+p55dVed7DCKnKi11Xjiu7k\" \"H68W8rose7g8Fv9fecBatEE4jwloOXsjh+tH0iab1NSSSpIq6EdgcPrpmrllN3/n2J/kCGK6ztISB6vR7xWgvgHSMjmEL0GPWzohGPrw2UQhZhrNV8dJpiLRYmfK+rXaKF0Kqag/F0e4C4jCKFX7NYFcYXYRlN5QlDFjZvUmOILlgnZ8w/SdZUKzpLObGuwnANLG+WSOjw42p9mXVGN6AfOQPu8OjRjS1MyhcdDIbUvZiQjbmiVJ5frpYZ39BTg\" \"CIzYLJJ5932+3gnwROu1OeljWkpBkfHZXPzADus80l3Vxsk91XZVB36rN8tyuMownR/M4HNC7ZE/EBwOnn1mGH7bLd6pva8u5Qy8Y6LrDdYea5Kk7aZ2WJSSRTV+nkPvOEIx+DfsIWNfmkVWzmuVky96fRvwOCuh38w8zpmlqzhDuGSQrBaLFXwAC7LYQ6kPDHzrjQhs99ScR0ix6YclrmpimMcCAwEAAQ==" }
+
     "_dmarc"                          = { value = "v=DMARC1; p=none; rua=mailto:dmarc-reports@archlinux.org; ruf=mailto:dmarc-reports@archlinux.org;" }
     "_github-challenge-archlinux"     = { value = "824af4446e" }
     "_github-challenge-archlinux.www" = { value = "b53f311f86" }
@@ -185,7 +188,7 @@ locals {
     "mail"       = { value = "v=spf1 ip4:${hcloud_server.machine["mail.archlinux.org"].ipv4_address} ip6:${hcloud_server.machine["mail.archlinux.org"].ipv6_address} ~all", ttl = 600 }
     "aur"        = { value = "v=spf1 ip4:${hcloud_server.machine["mail.archlinux.org"].ipv4_address} ip6:${hcloud_server.machine["mail.archlinux.org"].ipv6_address} ~all", ttl = 600 }
     "master-key" = { value = "v=spf1 ip4:${hcloud_server.machine["mail.archlinux.org"].ipv4_address} ip6:${hcloud_server.machine["mail.archlinux.org"].ipv6_address} ~all", ttl = 600 }
-    lists        = { ttl = 600, value = "v=spf1 ip4:5.9.250.164 ip6:2a01:4f8:160:3033::2 ~all" }
+    lists        = { ttl = 600, value = "v=spf1 ip4:5.9.250.164 ip6:2a01:4f8:160:3033::2 ip4:${hcloud_server.machine["lists.archlinux.org"].ipv4_address} ip6:${hcloud_server.machine["lists.archlinux.org"].ipv6_address} ~all" }
     luna         = { ttl = 600, value = "v=spf1 ip4:5.9.250.164 ip6:2a01:4f8:160:3033::2 ~all" }
   }