diff --git a/backups.yml b/backups.yml
index 8211a59..e44761e 100644
--- a/backups.yml
+++ b/backups.yml
@@ -1,35 +1,33 @@
 ---
 - hosts:
   - olios.kde.org
   - mason.kde.org
   - cano.kde.org
   - overwatch.kde.org
   - bluemchen.kde.org
   - fiesta.kde.org
   - recluse.kde.org
   - code.kde.org
   - stumptown.kde.org
 
   - mimi.kde.org
 
-  - gohma.kde.org
-
   - orbi.kde.org
   - dalca.kde.org
   - ange.kde.org
   - library.kde.org
   - rosetta.kde.org
   - letterbox.kde.org
   - thera.kde.org
   - mygalo.kde.org
   - komaci.kde.org
   - edulis.kde.org
   - platna.kde.org
   - milonia.kde.org
 
   vars_files:
     - vars/backups.yml
     - vars/backups-vault.yml
 
   roles:
     - kde-backup
diff --git a/production/host_vars/gohma.kde.org.yml b/production/host_vars/gohma.kde.org.yml
deleted file mode 100644
index 45f7e88..0000000
--- a/production/host_vars/gohma.kde.org.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-backup_directory: backups
-hetzner_backup_host: gohma
-# backup-gohma.sh script doesn't use borg, but gohma needs borg installed
-# to let other machines do borg backups *to* it.
-backup_apt_dependencies: [borgbackup]
diff --git a/production/hosts b/production/hosts
index 3b9dfba..c81ca39 100644
--- a/production/hosts
+++ b/production/hosts
@@ -1,82 +1,79 @@
 #zivo.kde.org
 
 bluemchen.kde.org
 
 cano.kde.org
 olios.kde.org
 
 fiesta.kde.org
 
 recluse.kde.org
 code.kde.org
 
-gohma.kde.org
-
 ange.kde.org
 lxr.kde.org
 joy.kde.org
 
 stumptown.kde.org
 
 dalca.kde.org
 dalca2.kde.org ansible_host=10.150.44.2 ansible_ssh_common_args='-o ProxyCommand="ssh -W %h:%p -q root@dalca.kde.org"'
 
 overwatch.kde.org
 #overwatch-test.kde.org
 
 library.kde.org
 rosetta.kde.org
 
 mimi.kde.org
 
 orbi.kde.org
 
 letterbox.kde.org
 
 mason.kde.org
 thera.kde.org
 mygalo.kde.org
 
 darwini.kde.org
 
 aranea.kde.org
 artonis.kde.org
 
 anepsion.kde.org
 charlotte.kde.org
 eresida.kde.org
 
 nephilia.kde.org
 komaci.kde.org
 edulis.kde.org
 
 micrea.kde.org
 milonia.kde.org
 platna.kde.org
 
 [anongit]
 mason.kde.org anongit_style=legacy
 
 
 [monitored]
 # Servers that are being monitored with Telegraf
 overwatch.kde.org
 #overwatch-test.kde.org
 bluemchen.kde.org
 rosetta.kde.org
 mimi.kde.org
-gohma.kde.org
 orbi.kde.org
 recluse.kde.org
 code.kde.org
 darwini.kde.org
 mason.kde.org
 ange.kde.org
 thera.kde.org
 mygalo.kde.org
 anepsion.kde.org
 micrea.kde.org
 
 [monitoring-server]
 overwatch.kde.org
 #overwatch-test.kde.org
diff --git a/roles/kde-backup/templates/backup-gohma.sh b/roles/kde-backup/templates/backup-gohma.sh
deleted file mode 100755
index cd23e25..0000000
--- a/roles/kde-backup/templates/backup-gohma.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-LOCATION=/root/{{backup_directory}}
-
-# Backup configuration and list of installed packages
-tar -czf $LOCATION/etc.`date +%w`.tgz -C / etc/
-tar -czf $LOCATION/crontabs.`date +%w`.tgz -C / var/spool/cron/
-dpkg -l > $LOCATION/dpkg.`date +%w`
-
-# Transfer to the backup server
-lftp -f ~/bin/backup-options
-
diff --git a/vars/backups-vault.yml b/vars/backups-vault.yml
index 97895bf..5930280 100644
--- a/vars/backups-vault.yml
+++ b/vars/backups-vault.yml
@@ -1,35 +1,30 @@
 $ANSIBLE_VAULT;1.1;AES256
-39363065623665326563396662643830663561313238356163626161313333633261373861663930
-3730323836363534336430316661343534323836663265640a386461336461636337346634646465
-30363863666563623234353065623937383838373464313535646639386435303837376131363161
-3733376464363239300a323933396264646535313163613632663537656130373962396135323532
-34386661646164396562623438376433386365333836646561376439643933613536663230646239
-65663432643462363730363431623430316566356563626137373335356564386466383866663939
-63363162633163626664393734363966663161306262666337376561623061653662656364633437
-39383933616233663032363139346661623233623731383630343831623938643665613931373636
-66666539613539346539613965306132613630323230646662613931643135396333643138353431
-34626130663462666363383136663363633762613263623130336233623538376261626238343566
-38663462363262393666336361366331633830373164316336353062363161333936316365656330
-64376338633066616266303262306433623861373334386637323265333666313636316530323566
-66346562663132663536323866663938613632333332613037363463313534636138336334336261
-39376630323931356530616136373935643437383138396665303336666466616237643962323865
-34393561306332323530383737616464313763616135346636663537373437343634643465303732
-65653635313035383032643166633537363531626436323466646266353937623863343935393561
-36633665616539316539346466626236643562363634666332656566363432363465333363343363
-32373131353364383764363564633161626630393138326164343838666231363063393232646334
-35396538323863313032346165396131656238383432623961636163356136323665663730313862
-34396566616565346330343261373461643933333461393632613466306666626332303532633462
-31376166393962363837323538663864326363656530636265653434313665626166303439336337
-37633835383835643530346130656232656530336364663566353065633162326630373932643562
-36313530323830356561653762373535336532353334656136333331363739643733616666623164
-61363834653133376564653539303661653964663664303664333237356138646663313337633332
-32356433653639346466353865336433376134633735343063383538623039613262643733663430
-30323265363764363161353266633561326564326338316466386238373931356339643537656537
-32336437393964653839643138613737653331363661376137376366653736343335386665303532
-66633738646664323734373034303833663934663961343335323739393363376234656261663438
-39383839386437656138316465346136363462346534616265633961353931373530346137316634
-32336639653334663735646461323463376533326530323364626230343132653536386532313463
-39633163336536333738333265626132353661326266353263363362656261663534333163633264
-61613463303161656234356636316234363630356239653831383030333335633438366635653632
-39663661376135346561316635306531363337383165366163313961663266303339383665353563
-3739396630393436663936613664306364656162383935363366
+30316161333431633438663837346131306537643931646137656432346366316133613239386633
+3363636139383933383866643136613361303363396135620a636336393266376161633463366361
+39343766666563666163633233396261623766313765613063323165623630663438313036626164
+3062633061663635320a313961656230383766653235346332326531373962303061616233653932
+34333435643634393334366433633834373733316562326232366136666264663861313130363066
+61386161623262633537393938333963643332633930393031363331623464623062323030343638
+36663539373332613638643164313239383136626230386262666131303534646362316130616531
+38336337383838343935313034623961356363383565323166653961613235303431373034396661
+35393466343032376634396562326564353131383962636233363434343431646463623662623935
+32323830303032336465333466313133633435363666616131306639323931363532383162393031
+34333438353430393636363538653035366464353835653534646136336333323262386539633666
+32336266373235633334376461613162306337383863353364386238353431623639633963366163
+39306235656663326130363736616331646538346535373235343339333631353735363732326236
+65323033323663343536326161616431643663393839326665316533343362303032633439643262
+30326163373230356364633366333138386562303361363664653062613734356634663132653939
+30646535393165386638353261326664363336393032326437623230363136313831343363313336
+66383333663163613366386632656163373235383564613735363465646133396336373930643338
+64393135326166623237383934366138323432363037326231393137643232373139316564653336
+36386661356266643834376530363038353533323438333435353664656336393664646339376566
+64343130336538623532366163313064373131656164306539666166303939656363336264633461
+61386663653365313136656261653239643634336565386438646361373938643966316333656131
+31343166303436643961323338613739313037643334643839653033306237663462336564623834
+34393666323664626464626462306264653636666264303737306664623231633036313164656364
+38666635653438363631396530376536653664373139306337666661343230313235633132316532
+39343666373231323763363235643066386137653362643465333138623537616536623661313834
+33383734313638323963656237343364616136386562656562306639646164666565363130663036
+62326365373736626562353230306464376335353566383333636231366264346334616233653662
+63323264346334656261663961343938623761303932386434383063346264343138346139366237
+37366634303338313738666364333366366538326330356237366138633463323033