diff --git a/salt/logstash/files/dynamic/9000_output_bro.conf b/salt/logstash/files/dynamic/9000_output_bro.conf
index b96bea628..25cbe13ce 100644
--- a/salt/logstash/files/dynamic/9000_output_bro.conf
+++ b/salt/logstash/files/dynamic/9000_output_bro.conf
@@ -1,3 +1,4 @@
+{%- if grains['role'] != 'so-master' %}
 {%- set ES = salt['pillar.get']('mainip'. '') %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
@@ -24,3 +25,4 @@ output {
     }
   }
 }
+{%- endif %}
diff --git a/salt/logstash/files/dynamic/9001_output_switch.conf b/salt/logstash/files/dynamic/9001_output_switch.conf
index 2261b6651..13d60fe49 100644
--- a/salt/logstash/files/dynamic/9001_output_switch.conf
+++ b/salt/logstash/files/dynamic/9001_output_switch.conf
@@ -1,3 +1,4 @@
+{%- if grains['role'] != 'so-master' %}
 {%- set ES = salt['pillar.get']('mainip'. '') %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
@@ -21,3 +22,4 @@ output {
     }
   }
 }
+{%- endif %}
diff --git a/salt/logstash/files/dynamic/9002_output_import.conf b/salt/logstash/files/dynamic/9002_output_import.conf
index c86c1a47c..d4f2c1ab2 100644
--- a/salt/logstash/files/dynamic/9002_output_import.conf
+++ b/salt/logstash/files/dynamic/9002_output_import.conf
@@ -1,3 +1,4 @@
+{%- if grains['role'] != 'so-master' %}
 {%- set ES = salt['pillar.get']('mainip'. '') %}
 # Updated by: Doug Burks
 # Last Update: 5/16/2017
@@ -21,3 +22,4 @@ output {
     }
   }
 }
+{%- endif %}
diff --git a/salt/logstash/files/dynamic/9004_output_flow.conf b/salt/logstash/files/dynamic/9004_output_flow.conf
index be117ff40..abf05f52e 100644
--- a/salt/logstash/files/dynamic/9004_output_flow.conf
+++ b/salt/logstash/files/dynamic/9004_output_flow.conf
@@ -1,3 +1,4 @@
+{%- if grains['role'] != 'so-master' %}
 {%- set ES = salt['pillar.get']('mainip'. '') %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
@@ -21,3 +22,4 @@ output {
     }
   }
 }
+{%- endif %}
diff --git a/salt/logstash/files/dynamic/9026_output_dhcp.conf b/salt/logstash/files/dynamic/9026_output_dhcp.conf
index c0ee0dfb5..ee61722eb 100644
--- a/salt/logstash/files/dynamic/9026_output_dhcp.conf
+++ b/salt/logstash/files/dynamic/9026_output_dhcp.conf
@@ -1,3 +1,4 @@
+{%- if grains['role'] != 'so-master' %}
 {%- set ES = salt['pillar.get']('mainip'. '') %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
@@ -20,3 +21,4 @@ output {
     }
   }
 }
+{%- endif %}
diff --git a/salt/logstash/files/dynamic/9029_output_esxi.conf b/salt/logstash/files/dynamic/9029_output_esxi.conf
index f0c72429b..cd7e5849f 100644
--- a/salt/logstash/files/dynamic/9029_output_esxi.conf
+++ b/salt/logstash/files/dynamic/9029_output_esxi.conf
@@ -1,3 +1,4 @@
+{%- if grains['role'] != 'so-master' %}
 {%- set ES = salt['pillar.get']('mainip'. '') %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
@@ -19,3 +20,4 @@ output {
     }
   }
 }
+{%- endif %}
diff --git a/salt/logstash/files/dynamic/9030_output_greensql.conf b/salt/logstash/files/dynamic/9030_output_greensql.conf
index 646f7fd0b..4c9ce1090 100644
--- a/salt/logstash/files/dynamic/9030_output_greensql.conf
+++ b/salt/logstash/files/dynamic/9030_output_greensql.conf
@@ -1,3 +1,4 @@
+{%- if grains['role'] != 'so-master' %}
 {%- set ES = salt['pillar.get']('mainip'. '') %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
@@ -19,3 +20,4 @@ output {
     }
   }
 }
+{%- endif %}
diff --git a/salt/logstash/files/dynamic/9031_output_iis.conf b/salt/logstash/files/dynamic/9031_output_iis.conf
index ffb774183..236545cba 100644
--- a/salt/logstash/files/dynamic/9031_output_iis.conf
+++ b/salt/logstash/files/dynamic/9031_output_iis.conf
@@ -1,3 +1,4 @@
+{%- if grains['role'] != 'so-master' %}
 {%- set ES = salt['pillar.get']('mainip'. '') %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
@@ -20,3 +21,4 @@ output {
     }
   }
 }
+{%- endif %}
diff --git a/salt/logstash/files/dynamic/9032_output_mcafee.conf b/salt/logstash/files/dynamic/9032_output_mcafee.conf
index 018bf0664..1299eefaa 100644
--- a/salt/logstash/files/dynamic/9032_output_mcafee.conf
+++ b/salt/logstash/files/dynamic/9032_output_mcafee.conf
@@ -1,3 +1,4 @@
+{%- if grains['role'] != 'so-master' %}
 {%- set ES = salt['pillar.get']('mainip'. '') %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
@@ -20,3 +21,4 @@ output {
     }
   }
 }
+{%- endif %}
diff --git a/salt/logstash/files/dynamic/9033_output_snort.conf b/salt/logstash/files/dynamic/9033_output_snort.conf
index 850481c74..6a48d364e 100644
--- a/salt/logstash/files/dynamic/9033_output_snort.conf
+++ b/salt/logstash/files/dynamic/9033_output_snort.conf
@@ -1,3 +1,4 @@
+{%- if grains['role'] != 'so-master' %}
 {%- set ES = salt['pillar.get']('mainip'. '') %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
@@ -23,3 +24,4 @@ output {
     }
   }
 }
+{%- endif %}
diff --git a/salt/logstash/files/dynamic/9034_output_syslog.conf b/salt/logstash/files/dynamic/9034_output_syslog.conf
index d58635aa7..75f78654a 100644
--- a/salt/logstash/files/dynamic/9034_output_syslog.conf
+++ b/salt/logstash/files/dynamic/9034_output_syslog.conf
@@ -1,3 +1,4 @@
+{%- if grains['role'] != 'so-master' %}
 {%- set ES = salt['pillar.get']('mainip'. '') %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
@@ -22,3 +23,4 @@ output {
     }
   }
 }
+{%- endif %}
diff --git a/salt/logstash/files/dynamic/9200_output_firewall.conf b/salt/logstash/files/dynamic/9200_output_firewall.conf
index 84406b0a9..a19bd361c 100644
--- a/salt/logstash/files/dynamic/9200_output_firewall.conf
+++ b/salt/logstash/files/dynamic/9200_output_firewall.conf
@@ -1,3 +1,4 @@
+{%- if grains['role'] != 'so-master' %}
 {%- set ES = salt['pillar.get']('mainip'. '') %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
@@ -23,3 +24,4 @@ output {
     }
   }
 }
+{%- endif %}
diff --git a/salt/logstash/files/dynamic/9300_output_windows.conf b/salt/logstash/files/dynamic/9300_output_windows.conf
index 78f2ac237..bd07a330f 100644
--- a/salt/logstash/files/dynamic/9300_output_windows.conf
+++ b/salt/logstash/files/dynamic/9300_output_windows.conf
@@ -1,3 +1,4 @@
+{%- if grains['role'] != 'so-master' %}
 {%- set ES = salt['pillar.get']('mainip'. '') %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
@@ -21,3 +22,4 @@ output {
     }
   }
 }
+{%- endif %}
diff --git a/salt/logstash/files/dynamic/9301_output_dns_windows.conf b/salt/logstash/files/dynamic/9301_output_dns_windows.conf
index 835b0c1e2..636982c7c 100644
--- a/salt/logstash/files/dynamic/9301_output_dns_windows.conf
+++ b/salt/logstash/files/dynamic/9301_output_dns_windows.conf
@@ -1,3 +1,4 @@
+{%- if grains['role'] != 'so-master' %}
 {%- set ES = salt['pillar.get']('mainip'. '') %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
@@ -21,3 +22,4 @@ output {
     }
   }
 }
+{%- endif %}
diff --git a/salt/logstash/files/dynamic/9400_output_suricata.conf b/salt/logstash/files/dynamic/9400_output_suricata.conf
index 13efcf9cf..fe1c6e125 100644
--- a/salt/logstash/files/dynamic/9400_output_suricata.conf
+++ b/salt/logstash/files/dynamic/9400_output_suricata.conf
@@ -1,3 +1,4 @@
+{%- if grains['role'] != 'so-master' %}
 {%- set ES = salt['pillar.get']('mainip'. '') %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
@@ -21,3 +22,4 @@ output {
     }
   }
 }
+{%- endif %}
diff --git a/salt/logstash/files/dynamic/9500_output_beats.conf b/salt/logstash/files/dynamic/9500_output_beats.conf
index 003ea9460..7ad3deffa 100644
--- a/salt/logstash/files/dynamic/9500_output_beats.conf
+++ b/salt/logstash/files/dynamic/9500_output_beats.conf
@@ -1,3 +1,4 @@
+{%- if grains['role'] != 'so-master' %}
 {%- set ES = salt['pillar.get']('mainip'. '') %}
 # Author: Wes Lambert
 # Last Update: 12/11/2017
@@ -19,3 +20,4 @@ output {
     }
   }
 }
+{%- endif %}
diff --git a/salt/logstash/files/dynamic/9998_output_test_data.conf b/salt/logstash/files/dynamic/9998_output_test_data.conf
index 031302bf3..9ad073ba3 100644
--- a/salt/logstash/files/dynamic/9998_output_test_data.conf
+++ b/salt/logstash/files/dynamic/9998_output_test_data.conf
@@ -1,3 +1,4 @@
+{%- if grains['role'] != 'so-master' %}
 {%- set ES = salt['pillar.get']('mainip'. '') %}
 # Author: Justin Henderson
 #         SANS Instructor and author of SANS SEC555: SIEM and Tactical Analytics
@@ -20,3 +21,4 @@ output {
     }
   }
 }
+{%- endif %}