diff --git a/pillar/logstash/master.sls b/pillar/logstash/master.sls
new file mode 100644
index 000000000..3be98f6b9
--- /dev/null
+++ b/pillar/logstash/master.sls
@@ -0,0 +1,4 @@
+logstash:
+  pipelines:
+    master:
+      config: "/usr/share/logstash/pipelines/master/*.conf"
diff --git a/pillar/top.sls b/pillar/top.sls
index 852efe27c..8e8c22de3 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -20,6 +20,9 @@ base:
     - auth
     - minions.{{ grains.id }}
 
+  'G@role:so-master':
+    - logstash.master
+
   'G@role:so-eval':
     - static
     - firewall.*
diff --git a/salt/logstash/etc/logstash.yml b/salt/logstash/etc/logstash.yml
index 6b07199d1..88f3c527e 100644
--- a/salt/logstash/etc/logstash.yml
+++ b/salt/logstash/etc/logstash.yml
@@ -63,7 +63,7 @@
 #
 # path.config:
 # /etc/logstash/conf.d is mapped to /usr/share/logstash/pipeline in the Docker image
-{% if grains.role != 'so-mastersearch' and grains.role != 'so-heavynode' %}
+{% if grains.role != 'so-mastersearch' and grains.role != 'so-heavynode' and grains.role != 'so-master' %}
 path.config: /usr/share/logstash/pipeline.enabled/*.conf
 {% else %} 
 #path.config: /usr/share/logstash/pipeline.enabled/*.conf
diff --git a/salt/logstash/init.sls b/salt/logstash/init.sls
index 8d84bf962..4ac72af33 100644
--- a/salt/logstash/init.sls
+++ b/salt/logstash/init.sls
@@ -155,7 +155,7 @@ lscustsync:
 lsconfsync:
   file.managed:
     - name: /opt/so/conf/logstash/conf.enabled.txt
-{% if grains.role == 'so-mastersearch' %}
+{% if grains.role == 'so-mastersearch' or grains.role == 'so-heavynode' %}
     - source: salt://logstash/conf/conf.enabled.txt.so-master
 {% else %}
     - source: salt://logstash/conf/conf.enabled.txt.{{ nodetype }}