diff --git a/apache.yml b/apache.yml
index 3e0eb9d..b63d4ca 100644
--- a/apache.yml
+++ b/apache.yml
@@ -1,19 +1,18 @@
 - hosts:
-  #- bugs.kde.org
   - code.kde.org
   - library.kde.org
   - lxr.kde.org
   - mason.kde.org
   - mimi.kde.org
   - nellie.kde.org
   - olios.kde.org
   - orbi.kde.org
   - overwatch.kde.org
   - racnoss.kde.org
   - rosetta.kde.org
   - silk.kde.org
   - spring.kde.org
   - stumptown.kde.org
 
   roles:
   - apache
diff --git a/backups.yml b/backups.yml
index 26c00a8..f746184 100644
--- a/backups.yml
+++ b/backups.yml
@@ -1,39 +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
 
   - mimi.kde.org
 
   - gohma.kde.org
   - spring.kde.org
   - silk.kde.org
-  - bugs.kde.org
 
   - nellie.kde.org
   - racnoss.kde.org
   - orbi.kde.org
   - dalca.kde.org
   - ange.kde.org
   - pirate.kde.org
   - library.kde.org
   - rosetta.kde.org
   - letterbox.kde.org
   - thera.kde.org
   - mygalo.kde.org
   - komaci.kde.org
 
   vars_files:
     - vars/backups.yml
     - vars/backups-vault.yml
 
   roles:
     - kde-backup
diff --git a/production/host_vars/bugs.kde.org.yml b/production/host_vars/bugs.kde.org.yml
deleted file mode 100644
index bffad76..0000000
--- a/production/host_vars/bugs.kde.org.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-backup_directory: backup
-hetzner_backup_host: gohma
-backup_cron:
-  hour: 5
-  minute: 10
diff --git a/production/hosts b/production/hosts
index f610602..75ade33 100644
--- a/production/hosts
+++ b/production/hosts
@@ -1,83 +1,82 @@
 #zivo.kde.org
 
 #shrek.kde.org
 
 bluemchen.kde.org
 
 cano.kde.org
 olios.kde.org
 
 fiesta.kde.org
 
 recluse.kde.org
 code.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.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
 
 pirate.kde.org
 racnoss.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
 
 [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
 pirate.kde.org
 racnoss.kde.org
 mimi.kde.org
 gohma.kde.org
 orbi.kde.org
 recluse.kde.org
 code.kde.org
 silk.kde.org
 darwini.kde.org
 mason.kde.org
 ange.kde.org
 
 [monitoring-server]
 overwatch.kde.org
 #overwatch-test.kde.org
diff --git a/roles/kde-backup/templates/backup-bugs.sh b/roles/kde-backup/templates/backup-bugs.sh
deleted file mode 100755
index 8cdddb3..0000000
--- a/roles/kde-backup/templates/backup-bugs.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-LOCATION=/root/{{backup_directory}}
-
-# Cleanup old backups
-find $LOCATION -mtime +3 | xargs rm -f
-
-# Grab all the databases...
-for DATABASE in `mysqlshow | grep -v "information_schema" | grep -v "mysql" | grep -v "performance_schema" | grep -v "bugstest" | tail -n+4 | awk '{print $2}'`; do
-    mysqldump --opt --quick --single-transaction --skip-extended-insert  --events --create-options --set-charset $DATABASE >  $LOCATION/db.$DATABASE.`date +%w`.sql
-    xz -f $LOCATION/db.$DATABASE.`date +%w`.sql
-done
-
-# Backup the installed software
-tar -cJf $LOCATION/srv-bugs.`date +%w`.tar.xz -C / srv/
-
-# Backup all our home directories
-tar -cJf $LOCATION/homes.`date +%w`.tar.xz -C / home
-
-# Grab the system config, package listing and cronjobs
-dpkg -l > $LOCATION/dpkg.`date +%w`
-tar -czf $LOCATION/crontabs.`date +%w`.tgz -C / var/spool/cron/
-tar -czf $LOCATION/etc.`date +%w`.tar.gz -C / etc
-
-chmod -R 700 $LOCATION
-
-cd $LOCATION/..
-lftp -f ~/bin/backup-options