diff --git a/backups.yml b/backups.yml
index 8d6f248..69a8870 100644
--- a/backups.yml
+++ b/backups.yml
@@ -1,40 +1,38 @@
 ---
 - hosts:
   - olios.kde.org
   - mason.kde.org
   - cano.kde.org
   - shrek.kde.org
   - overwatch.kde.org
   - bluemchen.kde.org
   - fiesta.kde.org
   - recluse.kde.org
   - code.kde.org
   - stumptown.kde.org
 
-  - katze.kde.org
   - mimi.kde.org
 
   - gohma.kde.org
   - spring.kde.org
   - silk.kde.org
   - bugs.kde.org
 
   - saba.kde.org
   - postbox.kde.org
   - nellie.kde.org
   - racnoss.kde.org
   - elder.kde.org
   - orbi.kde.org
   - dalca.kde.org
   - ange.kde.org
   - pirate.kde.org
   - library.kde.org
-  - kater.kde.org
   - rosetta.kde.org
 
   vars_files:
     - vars/backups.yml
     - vars/backups-vault.yml
 
   roles:
     - kde-backup
diff --git a/production/host_vars/kater.kde.org.yml b/production/host_vars/kater.kde.org.yml
deleted file mode 100644
index f7cb7ee..0000000
--- a/production/host_vars/kater.kde.org.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-backup_directory: backups
-gohma_backup_user: katerbackup
-gohma_backup_home: BACKUP.kater.kde.org
diff --git a/production/host_vars/katze.kde.org.yml b/production/host_vars/katze.kde.org.yml
deleted file mode 100644
index 20d845b..0000000
--- a/production/host_vars/katze.kde.org.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-backup_directory: backups
-hetzner_backup_host: katze
diff --git a/production/hosts b/production/hosts
index 40d3cec..b58b14f 100644
--- a/production/hosts
+++ b/production/hosts
@@ -1,80 +1,74 @@
 #zivo.kde.org
 
 saba.kde.org
 postbox.kde.org
 
 #shrek.kde.org
 
 bluemchen.kde.org
 
 cano.kde.org
 olios.kde.org
 
 fiesta.kde.org
 
 recluse.kde.org
 code.kde.org
 
-kater.kde.org
-joy.kde.org
-
-katze.kde.org
-
 gohma.kde.org
 spring.kde.org
 silk.kde.org
 bugs.kde.org
 
 ange.kde.org
 lxr.kde.org
+joy.kde.org
 
 stumptown.kde.org
 
 dalca.kde.org
 dalca2.kde.org ansible_host=10.150.83.2 ansible_ssh_common_args='-o ProxyCommand="ssh -W %h:%p -q root@dalca.kde.org"'
 
 overwatch.kde.org
 library.kde.org
 rosetta.kde.org
 
 pirate.kde.org
 racnoss.kde.org
 nellie.kde.org
 mimi.kde.org
 
 orbi.kde.org
 
 letterbox.kde.org
 
 mason.kde.org
 elder.kde.org
 
 darwini.kde.org
 
 aranea.kde.org
 artonis.kde.org
 
 [anongit]
 mason.kde.org anongit_style=legacy
 elder.kde.org anongit_style=propagator
 
 
 [monitored]
 # Servers that are being monitored with Telegraf
 overwatch.kde.org
 bluemchen.kde.org
 rosetta.kde.org
 pirate.kde.org
 racnoss.kde.org
 mimi.kde.org
 nellie.kde.org
 gohma.kde.org
 elder.kde.org
-kater.kde.org
-katze.kde.org
 postbox.kde.org
 orbi.kde.org
 recluse.kde.org
 code.kde.org
 silk.kde.org
 darwini.kde.org
diff --git a/roles/kde-backup/templates/backup-kater.sh b/roles/kde-backup/templates/backup-kater.sh
deleted file mode 100755
index 3aca1b0..0000000
--- a/roles/kde-backup/templates/backup-kater.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-LOCATION=/root/{{backup_directory}}
-
-# Cleanup old backups
-find $LOCATION/ -name '*gz' -mtime +7 | xargs rm -f
-
-# Backup system config, package listing and cronjobs
-dpkg -l > $LOCATION/dpkg.`date +%w`
-tar -czf $LOCATION/etc.`date +%w`.tgz -C / etc/
-tar -czf $LOCATION/crontabs.`date +%w`.tgz -C / var/spool/cron/
-
-# Secure our backups
-chmod -R 700 $LOCATION
-
-# Transfer them to the backup server
-cd $LOCATION/..
-rsync --timeout=600 --delete -a backups -4 katerbackup@gohma.kde.org:
diff --git a/roles/kde-backup/templates/backup-katze.sh b/roles/kde-backup/templates/backup-katze.sh
deleted file mode 100755
index 71800ec..0000000
--- a/roles/kde-backup/templates/backup-katze.sh
+++ /dev/null
@@ -1,9 +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 backups to backup server
-lftp -f ~/bin/backup-options
diff --git a/vars/backups-vault.yml b/vars/backups-vault.yml
index 7f0bae4..6040aba 100644
--- a/vars/backups-vault.yml
+++ b/vars/backups-vault.yml
@@ -1,26 +1,19 @@
 $ANSIBLE_VAULT;1.1;AES256
-30666439356436636261613136643839303665666435343435313262623232393637373136353961
-3831343936313236393134366133303533623737626561360a656532393265623764613435656235
-33636130326465336236323838346438396531323562613639333562376661396261313434626666
-3231333962336564650a626133336133306263353737633032626235656134646261623264653464
-30386539383366663838313633656238366137396333653362663463303362353762316661656438
-31646130363065393632316335353261373330376135363732326330363666643035666430306561
-37316361343766336162363231366162393939333336396335376163643837303836323665383262
-36353934333939353134613062303139343936366235633838663733316637373362623535653263
-39623539316634353866393439323334343638663633646633316237313139393966353538383237
-62353236393664623264643035643932326138623165383533636137623035656561656663346164
-39623338363134386230323534356664353932353432326434356437376639373237306434386632
-35313733626339333363303165326230623030326364326531663439663461386435613730663738
-38646235363763623663613438376335373964306634646164346233393963343338663633303038
-38373034356633626538353338363734656237666262613661636161313836663633373636386165
-65393666396163333564646136353137363765663635316532323730323066643934663335333662
-36363262613664376461376431303938373638646462363561646335383436376231356362633966
-36383063633664353735653232663439303131363531323834363561373861353763326533666332
-35346363303433333466393434646461333638333265653064393436623865316135363532303439
-36613739343731326563656262326332376332343539386362306638643930393564376439373737
-31366364363164323432396234306636363838626130356463663136663563333335316266386138
-37356165363136616165303261306435666234663339343863343362666664623033346432363735
-37366263363062313932373330386333653366356464306436643135666330393033353135643066
-30613536303239663665333038666533626632373037303432353835613063656332633034353134
-62653061663661396364386537333239386633353564636563613165343434323639383033613332
-3634
+65396231333563363837356161303566613130623638386231386138643065653639383035643364
+6366623564346134663339656537313238656137383939350a643136613963646433346664333236
+37326562656335613639666237396462623538306235623835363261353162663663386462633339
+6232666631646131350a376662366338306165383966336435633436323632366139616339316430
+35616663653238366133333566386632303034386366316262346332323261376334623333303366
+31663533376432326139626665306365616662343834613237336564376336666633623833386637
+66393838333737323561376266313164613066316161393363663065646366336230613431336364
+31373562623664653839363635336466306633383734643631373765306636336332386137373333
+33356539343232323233383338313135636335386164623735386135313930333462396262336165
+63363638336332633636313036376263623064346434366166396465333766386266363361393765
+30396161363234626131303138356535626230643666336465356330363261633761646234643430
+64636463323133333935366239663939333662323030383036396338626337613564363231373639
+30363561356538623435613533646534346430356666303461613833333536653866393136336664
+37633336643863343238366531623133643061353135393533363738656463303135643462646633
+36333936383661333136316237333737326231396362383833343836653865616263343665623934
+37303439633763383465383463666164386135666266313861393731623833386262363062386539
+31663463323863333432326339373831613665633138383632653535326464313166386265383030
+3766643033356265616465303961616334346238383837393234