diff --git a/production/host_vars/code.kde.org/vars.yml b/production/host_vars/code.kde.org/vars.yml
index f979fdf..b32d1b7 100644
--- a/production/host_vars/code.kde.org/vars.yml
+++ b/production/host_vars/code.kde.org/vars.yml
@@ -1,16 +1,15 @@
 ---
 backup_directory: backups
 hetzner_backup_host: recluse
 backup_apt_dependencies: [borgbackup]
-backup_borg_passphrase: "{{vault_backup_borg_passphrase}}"
 backup_cron:
   hour: 0
   minute: 40
 backup_logs_cron:
   hour: "*"
   minute: "*/30"
 
 # The common Apache configuration grants access to /srv/www,
 # however Phabricator is under /srv/phabricator, so we need
 # a wider grant for this server alone.
 apache_root_www: /srv/
diff --git a/production/host_vars/code.kde.org/vault.yml b/production/host_vars/code.kde.org/vault.yml
deleted file mode 100644
index 01cec6e..0000000
--- a/production/host_vars/code.kde.org/vault.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-36316162316435333032323337653739303061623564613963366166326433663066346466666632
-3866376433656662353139646364313830343461313933390a613939646265303864613163336664
-34303137356136363532313135386535323538366637643031376664383565393361363636336634
-3861323933626336650a353638636466393034396466656461363736346430306437663162376430
-32636430663133656136396634623035613064313032666535333566643036383062633334633836
-62633231663734373131656331646461386530616261613561646662326162363932303436623066
-653032386661623034623630393733663534
diff --git a/production/host_vars/edulis.kde.org/vars.yml b/production/host_vars/edulis.kde.org/vars.yml
index 0c8309b..e02b88c 100644
--- a/production/host_vars/edulis.kde.org/vars.yml
+++ b/production/host_vars/edulis.kde.org/vars.yml
@@ -1,10 +1,9 @@
 ---
 backup_directory: backups
 hetzner_backup_host: nephilia
 backup_apt_dependencies: [borgbackup]
-backup_borg_passphrase: "{{vault_backup_borg_passphrase}}"
 backup_cron:
   hour: 1
   minute: 30
 
 allowed_ssh_users_extra: [kcoyle]
diff --git a/production/host_vars/edulis.kde.org/vault.yml b/production/host_vars/edulis.kde.org/vault.yml
deleted file mode 100644
index 294d16c..0000000
--- a/production/host_vars/edulis.kde.org/vault.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-63336238383039353136613462656339313766353339306263353131383736363037383830626338
-3163616466326138643136646664353032316364323231350a663562393131396335303134616565
-37633664326663303630353731633539626238633933346236646462353731313036336565623032
-6634343637333737340a646532616535396430626464386334393933636135333564613565626336
-65316131326265643432366232386261623938633537653230346339323736373662376262343532
-38633038373466396162366663633639333863343930363930323765346435303062343434393634
-303835616164356162653231356664396133
diff --git a/production/host_vars/komaci.kde.org/vars.yml b/production/host_vars/komaci.kde.org/vars.yml
index 9ae023d..01272f7 100644
--- a/production/host_vars/komaci.kde.org/vars.yml
+++ b/production/host_vars/komaci.kde.org/vars.yml
@@ -1,8 +1,7 @@
 ---
 backup_directory: backups
 hetzner_backup_host: nephilia
 backup_apt_dependencies: [borgbackup]
-backup_borg_passphrase: "{{vault_backup_borg_passphrase}}"
 backup_cron:
   hour: 5
   minute: 10
diff --git a/production/host_vars/komaci.kde.org/vault.yml b/production/host_vars/komaci.kde.org/vault.yml
deleted file mode 100644
index 0a25cb1..0000000
--- a/production/host_vars/komaci.kde.org/vault.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-65666161336639656434346132636335643863343164333666396663656365363163353238343435
-6537323231356462636433623032323938303034633631630a643538393732346637336233633564
-66333066663936666631396431373034616136303065386565343332646561626134643239633835
-3436393861353166660a323437656134653132663932323639313966623333333735323737316164
-36353134636530623863613862383263343734623238306330303866666630636439313336613035
-31306536653532646432316563373366353862336131383039653733646364643639366330326437
-646466383363366462366332656464396563
diff --git a/production/host_vars/letterbox.kde.org/vars.yml b/production/host_vars/letterbox.kde.org/vars.yml
index 986cdd0..e450077 100644
--- a/production/host_vars/letterbox.kde.org/vars.yml
+++ b/production/host_vars/letterbox.kde.org/vars.yml
@@ -1,5 +1,4 @@
 ---
 gohma_backup_user: letterboxbackup
 gohma_backup_home: BACKUP.letterbox.kde.org
 backup_apt_dependencies: [borgbackup]
-backup_borg_passphrase: "{{vault_backup_borg_passphrase}}"
diff --git a/production/host_vars/letterbox.kde.org/vault.yml b/production/host_vars/letterbox.kde.org/vault.yml
deleted file mode 100644
index 9685aa6..0000000
--- a/production/host_vars/letterbox.kde.org/vault.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-31653965656163303764306663306632313036303563666133366639323263333131323265323737
-3832303066393339303138323938386465323032303632350a366233306239356431343663666631
-37326134666661316161616166626235623962383630333937353930343234373931313462313663
-3435646632313166630a376438373662643537633236346332646561633535656339383132376365
-66646239396463316333643830373032653634386435356535333763313331663965303963633066
-62626361316530303239636638363064616135643761633432383163666237376332616638363766
-323330383332653863613133626633313065
diff --git a/production/host_vars/overwatch.kde.org/vars.yml b/production/host_vars/overwatch.kde.org/vars.yml
index c57782e..d62733e 100644
--- a/production/host_vars/overwatch.kde.org/vars.yml
+++ b/production/host_vars/overwatch.kde.org/vars.yml
@@ -1,6 +1,5 @@
 ---
 gohma_backup_user: overwatchbackup
 gohma_backup_home: BACKUP.overwatch.kde.org
 backup_apt_dependencies: [borgbackup]
-backup_borg_passphrase: "{{vault_backup_borg_passphrase}}"
 grafana_hostname: status.kde.org
diff --git a/production/host_vars/overwatch.kde.org/vault.yml b/production/host_vars/overwatch.kde.org/vault.yml
deleted file mode 100644
index 9696edd..0000000
--- a/production/host_vars/overwatch.kde.org/vault.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-30343630643030616435643266333866393332396234343963633033326263343737376331373839
-3739326637643262333565633338356233303935383832320a383430616263326363376133663437
-35386632386631666364346632656562366437376635363932613637346330326365643338373064
-3638363463653830640a346539336630326435353230653966356633363464323032356663336462
-37343463393539326633666461383761636533356461653836623164633635396466393762633065
-33633462303839393032313036306466656433303866346637326636376437353662613036393965
-303862313731393237313333613035663061
diff --git a/production/host_vars/spring.kde.org/vars.yml b/production/host_vars/spring.kde.org/vars.yml
index 0cc1b9c..2481ff0 100644
--- a/production/host_vars/spring.kde.org/vars.yml
+++ b/production/host_vars/spring.kde.org/vars.yml
@@ -1,6 +1,5 @@
 ---
 backup_directory: backups
 hetzner_backup_host: pirate
 # Borg used to backup NextCloud
 backup_apt_dependencies: [borgbackup]
-backup_borg_passphrase: "{{vault_backup_borg_passphrase}}"
diff --git a/production/host_vars/spring.kde.org/vault.yml b/production/host_vars/spring.kde.org/vault.yml
deleted file mode 100644
index 0a390dc..0000000
--- a/production/host_vars/spring.kde.org/vault.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-33376339653138313238336637343337323564643839323464623366363865343531336632393063
-3363623333396530383132376462633136656437383732390a303931306630396230363130613433
-34653364323261613835633761336633386539366161653765656539343932633236353433353133
-3535346133346263380a653032356565363562376262646434616135613066643064356232353533
-37393338383539383130666265313337653134363262313434336562393433306166383733636362
-31343732363839633632616335373239643438666531623762386132353335363132656264616562
-303061376132303432323237323262393664
diff --git a/vars/backups-vault.yml b/vars/backups-vault.yml
index 2ba0bcd..13fd480 100644
--- a/vars/backups-vault.yml
+++ b/vars/backups-vault.yml
@@ -1,19 +1,22 @@
 $ANSIBLE_VAULT;1.1;AES256
-38323339356662666434643035333835386438316237646534373234363734653531613734646462
-3838646261343565346330643036356533323832653035340a653537333731393834366132666136
-34333862646662623663316561643430366635316364396563666664363631363730383237616565
-3534373934393939340a363537653965643934396138326663303735366664666137396565646238
-34326531363433333764653832323265333965373964326330333538343130656165613961626661
-61383133626161376135316464623936363166643561346532333866356263643730613437613862
-34663835643638393937623137323565633366613633366137646462346630653830313266333832
-31626235363565396362323464626434393161313735623832376465333437633133623964326138
-62653431643832643666316337656331313431366435366437343062373330356132386631336435
-30396364616666616533333364623263306162306165316632316433363164356361343762626661
-33356238383462343434633165316139383130303732353065373730346266333537333437343965
-37653362653636663566626133613437393539613463623166666435646661633632336432396337
-39363466323930373831646435653664326462313065626663386133303264366638656262333762
-66373832636339316139653365393731343165653263643265336261663835623966326664613364
-32633935396435346137626636353336633438396664623936316337633664376436653431353239
-36363761616134386234373231623030366534626338396162346337633363303530306263626333
-63363261643265376161303532653135366135393364353134313339666334343036376532663437
-6535663734346363313738376361356134346333316164363565
+32303433373766663464333866656233393337383562623461386536613934373132616339303633
+3735616638653330383562383937363736616363626539360a616661616130613230633661663139
+34616538646564313534303430353662353165306637316536353737653635613139343965666563
+3435373331313734660a313136393330313033313533636338353464333035333433366637633332
+35373637626264393436336336313730396434313762333439663231316630633836366465656332
+62346133373765306134363831383663306238646265623161356636383734396366343833393830
+63306238336139393262643766643138666638613238656530653061373032393239626537626432
+31303965623331353262363865353739633432396638613061333561653161626631636565363634
+35393263646636303334316436353530353936306662623661383664616431303838623234656133
+35323639336634383035326633623839323036313432666165633735323763346637303336383662
+33626137343739396431366463656534373839623032303232303839626564336466633434666461
+31356165356261376137616361396339333738306635363831353233663239653236663036323538
+62313365626161353364306132363963666463616166376262643934646436653339633137623362
+61663834626561303465373561353831663539346439396234323836666237633737356537636537
+66633837636330313835656438656664616135376164653439306237376537653061373832666363
+32666433626161393635313266393338343163366364633635663330356633363965323838353462
+65346262653733633133393138356135366431663966316161616131313161646363393263636630
+64623963353862316365313631663365363438333739636638643938306235623132353265646435
+30343333333564643463333939373038346433633431653039306231313166633232333162396335
+61313361373635623434643763363430663466366238353334663536393931326530396433386637
+6139
diff --git a/vars/backups.yml b/vars/backups.yml
index 56c7ed0..1c24324 100644
--- a/vars/backups.yml
+++ b/vars/backups.yml
@@ -1,8 +1,10 @@
 ---
 # this dictionary has the form:
 # host1:
 #   username: u12345
 #   password: Qw3RtYuIoP
 # host2:
 #   ...
 hetzner_backup_creds: "{{vault_hetzner_backup_creds}}"
+
+backup_borg_passphrase: "{{vault_backup_borg_passphrase}}"