diff --git a/salt/logstash/etc/logstash.yml b/salt/logstash/etc/logstash.yml
index fc1df3d47..8f8dcec81 100644
--- a/salt/logstash/etc/logstash.yml
+++ b/salt/logstash/etc/logstash.yml
@@ -217,13 +217,8 @@ path.logs: /var/log/logstash
 #
 # Where to find custom plugins
 # path.plugins: []
-{% if grains['role'] == 'so-master' %}
-{% set pipeline_workers = salt['pillar.get']('master:ls_pipeline_workers', '1') %}
-{% set pipeline_batch = salt['pillar.get']('master:ls_pipeline_batch_size', '125') %}
-{% else %}
-{% set pipeline_workers = salt['pillar.get']('node:ls_pipeline_workers', '1') %}
-{% set pipeline_batch = salt['pillar.get']('node:ls_pipeline_batch_size', '125') %}
-{% endif %}
+{% set pipeline_workers = salt['pillar.get']('logstash_settings:ls_pipeline_workers', '1') %}
+{% set pipeline_batch = salt['pillar.get']('logstash_settings:ls_pipeline_batch_size', '125') %}
 
 pipeline.workers: {{ pipeline_workers }}
 pipeline.batch.size: {{ pipeline_batch }}