diff --git a/salt/logstash/files/dynamic/0006_input_beats.conf b/salt/logstash/files/dynamic/0006_input_beats.conf
index bdfa4eefc..46cb2e51f 100644
--- a/salt/logstash/files/dynamic/0006_input_beats.conf
+++ b/salt/logstash/files/dynamic/0006_input_beats.conf
@@ -11,18 +11,21 @@ input {
 filter {
   if "ids" in [tags] {
     mutate {
-      add_field => {"sensor_name" => "%{beat.name}"}
-      add_field => {"syslog-host_from" => "%{beat.hostname}"}
+      add_field => {"sensor_name" => "%{[beat][name]}"}
+      add_field => {"syslog-host_from" => "%{[beat][hostname]}"}
       remove_tag => ["beat"]
       rename => { "host" => "beat_host" }
-      remove_field => ["beat.name", "beat.hostname"]
+      remove_field => ["[beat][name]", "[beat][hostname]"]
     }
   }
 
   if "bro" in [tags] {
     mutate {
+      add_field => {"sensor_name" => "%{[beat][name]}"}
+      add_field => {"syslog-host_from" => "%{[beat][hostname]}"}
       remove_tag => ["beat"]
       rename => { "host" => "beat_host" }
+      remove_field => ["[beat][name]", "[beat][hostname]"]
     }
   }
 }