diff --git a/hosts b/hosts
index fd4736ec3c5ca6fc936b04b53db50d66ced9701f..d7db9727eab3bda87465a3afe954e2df4a90e26e 100644
--- a/hosts
+++ b/hosts
@@ -105,13 +105,6 @@ europe.mirror.pkgbuild.com
 repro2.pkgbuild.com
 runner1.archlinux.org
 
-[dedicated_servers]
-build.archlinux.org
-gemini.archlinux.org
-runner1.archlinux.org
-runner2.archlinux.org
-secure-runner1.archlinux.org
-
 [hcloud]
 accounts.archlinux.org
 archlinux.org
diff --git a/roles/prometheus_exporters/tasks/main.yml b/roles/prometheus_exporters/tasks/main.yml
index 185e9c922dba293cd1327defc017a043a69217fd..247be3dc6598742c8902f2d64b518849378d44a6 100644
--- a/roles/prometheus_exporters/tasks/main.yml
+++ b/roles/prometheus_exporters/tasks/main.yml
@@ -7,7 +7,7 @@
 
 - name: Install smartmontools for dedicated servers
   pacman: name=smartmontools state=present
-  when: "'dedicated_servers' in group_names"
+  when: ansible_virtualization_role == "host"
 
 - name: Install prometheus-memcached-exporter
   pacman: name=prometheus-memcached-exporter state=present
@@ -90,15 +90,15 @@
 
 - name: Install smart textcollector service
   template: src=prometheus-smart-textcollector.service.j2 dest=/etc/systemd/system/prometheus-smart-textcollector.service owner=root group=root mode=644
-  when: "'dedicated_servers' in group_names"
+  when: ansible_virtualization_role == "host"
 
 - name: Install smart textcollector timer
   template: src=prometheus-smart-textcollector.timer.j2 dest=/etc/systemd/system/prometheus-smart-textcollector.timer owner=root group=root mode=644
-  when: "'dedicated_servers' in group_names"
+  when: ansible_virtualization_role == "host"
 
 - name: Enable and start prometheus smart textcollector timer
   systemd: name=prometheus-smart-textcollector.timer enabled=yes daemon_reload=yes state=started
-  when: "'dedicated_servers' in group_names"
+  when: ansible_virtualization_role == "host"
 
 - name: Install hetzner textcollector service
   template: src=prometheus-hetzner-textcollector.service.j2 dest=/etc/systemd/system/prometheus-hetzner-textcollector.service owner=root group=root mode=644