diff --git a/pillar/id/new-forum_infra_opensuse_org.sls b/pillar/id/new-forum_infra_opensuse_org.sls
index f0709d8..3e0771c 100644
--- a/pillar/id/new-forum_infra_opensuse_org.sls
+++ b/pillar/id/new-forum_infra_opensuse_org.sls
@@ -2,7 +2,7 @@ grains:
   city: nuremberg
   country: de
   hostusage:
-    - on vBulletin5
+    - vBulletin
   roles:
     - web_forum
   reboot_safe: yes
@@ -10,7 +10,7 @@ grains:
   virt_cluster: atreju
 
   aliases: []
-  description: Webserver running forums.opensuse.org on vBulletin5
+  description: Webserver running forums.opensuse.org on vBulletin
   documentation:
     - https://www.vbulletin.com/en/manual
   responsible:
diff --git a/salt/profile/vbulletin/tools.sls b/salt/profile/vbulletin/tools.sls
index a6199a5..de314ae 100644
--- a/salt/profile/vbulletin/tools.sls
+++ b/salt/profile/vbulletin/tools.sls
@@ -2,24 +2,24 @@
 
 {% set tools = salt['pillar.get']('vbulletin:tools', False) %}
 
-{% if tools %}
 /srv/www/vhosts/forums/htdocs/vb_test.php:
+{% if tools %}
   file.managed:
     - source: salt://profile/vbulletin/files/vb_test.php
 {% else %}
   file.absent
 {% endif %}
 
-{% if tools %}
 /srv/www/vhosts/forums/htdocs/info.php:
+{% if tools %}
   file.managed:
     - contents: "<?php phpinfo(); ?>"
 {% else %}
   file.absent
 {% endif %}
 
-{% if tools %}
 /srv/www/vhosts/forums/db-tweak.sql:
+{% if tools %}
   file.managed:
     - source: salt://profile/vbulletin/files/db-tweak.sql
     - template: jinja