diff --git a/hosts b/hosts
index 53f196307dbcc6f9ec7dc615cf86e7b796dbc344..cc7507efd656cead733e21d49812360d6ef2e523 100644
--- a/hosts
+++ b/hosts
@@ -2,12 +2,6 @@
 secure-runner1.archlinux.org
 gemini.archlinux.org
 
-[rsync_net]
-zh1905.rsync.net
-
-[hetzner_storageboxes]
-u236610.your-storagebox.de
-
 [packet_net]
 runner2.archlinux.org
 repro1.pkgbuild.com
@@ -47,10 +41,6 @@ md.archlinux.org
 lists.archlinux.org
 gluebuddy.archlinux.org
 
-[borg_hosts]
-zh1905.rsync.net
-u236610.your-storagebox.de
-
 [public_html]
 homedir.archlinux.org
 
diff --git a/playbooks/all-hosts-basic.yml b/playbooks/all-hosts-basic.yml
index ebe5001d9361b2f9cd2879dca396e9e87156ea65..8aab197e74c582ca601b532647880d7f4329dd6f 100644
--- a/playbooks/all-hosts-basic.yml
+++ b/playbooks/all-hosts-basic.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: basic setup for all hosts
-  hosts: all,!hetzner_storageboxes,!rsync_net
+  hosts: all
   remote_user: root
   roles:
     - { role: common }
diff --git a/playbooks/tasks/sync-ssh-hostkeys.yml b/playbooks/tasks/sync-ssh-hostkeys.yml
index 2eaf2966fe9eb897083030ca2685fb852d77378b..90850c73bee2c9f88d90ca527b72f7267d467525 100644
--- a/playbooks/tasks/sync-ssh-hostkeys.yml
+++ b/playbooks/tasks/sync-ssh-hostkeys.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: fetch ssh hostkeys
-  hosts: all,!rsync_net,!hetzner_storageboxes
+  hosts: all
   tasks:
     - name: fetch hostkey checksums
       shell: "for type in sha256 md5; do for file in /etc/ssh/ssh_host_*.pub; do ssh-keygen -l -f $file -E $type; done; echo; done"
@@ -23,16 +23,16 @@
     - name: store hostkeys
       copy:
         dest: "{{ playbook_dir }}/../../docs/ssh-hostkeys.txt"
-        content: "{% for host in query('inventory_hostnames', 'all,!rsync_net,!hetzner_storageboxes,!localhost') | sort %}# {{ host }}\n{{ hostvars[host].ssh_hostkeys.stdout }}\n\n{% endfor %}"
+        content: "{% for host in query('inventory_hostnames', 'all,!localhost') | sort %}# {{ host }}\n{{ hostvars[host].ssh_hostkeys.stdout }}\n\n{% endfor %}"
         mode: preserve
 
     - name: store known_hosts
       blockinfile:
         path: "{{ playbook_dir }}/../../docs/ssh-known_hosts.txt"
-        block: "\n{% for host in query('inventory_hostnames', 'all,!rsync_net,!hetzner_storageboxes,!localhost') | sort %}# {{ host }}\n{{ hostvars[host].known_hosts.stdout }}\n\n{% endfor %}"
+        block: "\n{% for host in query('inventory_hostnames', 'all,!localhost') | sort %}# {{ host }}\n{{ hostvars[host].known_hosts.stdout }}\n\n{% endfor %}"
 
 - name: upload known_hosts to all nodes
-  hosts: all,!rsync_net,!hetzner_storageboxes
+  hosts: all
   tasks:
     - name: upload known_hosts
       copy: dest=/etc/ssh/ssh_known_hosts src="{{ playbook_dir }}/../../docs/ssh-known_hosts.txt" owner=root group=root mode=0644
diff --git a/playbooks/tasks/upgrade-servers.yml b/playbooks/tasks/upgrade-servers.yml
index 6f7edb5d3e92d02356d3d67fb8a732a944d20694..8b51b8532bf79ae1e0576cb808524a3acde1b0a6 100644
--- a/playbooks/tasks/upgrade-servers.yml
+++ b/playbooks/tasks/upgrade-servers.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: upgrade and reboot all hetzner servers
-  hosts: all,!kape_servers,!packet_net,!rsync_net,!hetzner_storageboxes
+  hosts: all,!kape_servers,!packet_net
   max_fail_percentage: 0
   serial: 20%
   gather_facts: false