-

diff --git a/beaver.sls b/beaver.sls
index 9dc1f8f..ad2b53d 100644
--- a/beaver.sls
+++ b/beaver.sls
@@ -17,7 +17,7 @@ beaver:
   format: json
   transport: tcp
   tcp_port: 5960
-  tcp_host: {% '-'.join(grains['host'].split('-')[:2]) + '-dbhead0001' %}
+  tcp_host: {{ salt['pillar.get']('beaver:logstash_server', '127.0.0.1') }}
 
   {% if 'head0001' in grains['host'] %}
   files:
@@ -43,7 +43,7 @@ beaver:
     /var/log/dpkg.log:
       type: dpkg
 
-    /var/log/auth.log
+    /var/log/auth.log:
       type: syslog
       tags:
         - auth
diff --git a/top.sls b/top.sls
index c9b3a83..d2715c7 100644
--- a/top.sls
+++ b/top.sls
@@ -6,6 +6,7 @@ base:
     - secrets
     - icinga
     - apt
+    - beaver
     - logstash
 
 dbaas_aw2_az1: