diff --git a/salt/logstash/files/logstash.yml b/salt/logstash/files/logstash.yml
index 6e582f30c..aa7e7acc7 100644
--- a/salt/logstash/files/logstash.yml
+++ b/salt/logstash/files/logstash.yml
@@ -1,6 +1,6 @@
+path.config: /usr/share/logstash/pipeline
 http.host: 0.0.0.0
-#queue.type: persisted
-#queue.max_bytes: 1gb
+queue.type: persisted
+queue.max_bytes: 1gb
 pipeline.workers: 1
 path.logs: /var/log/logstash
-path.settings: /usr/share/logstash/settings
diff --git a/salt/logstash/files/pipeline.yml b/salt/logstash/files/pipeline.yml
deleted file mode 100644
index 71ed6136c..000000000
--- a/salt/logstash/files/pipeline.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-{%- set freq = salt['pillar.get']('master:freq', '0') %}
-{%- set domainstats = salt['pillar.get']('master:domainstats', '0') %}
-- pipeline.id: sodefault
-  path.config: "/usr/share/logstash/pipeline"
-- pipeline.id: custom
-  path.config: "/usr/share/logstash/custom"
-{%- if freq == '1' %}
-- pipeline.id: freq
-  path.config: "/usr/share/logstash/freq"
-{%- if domainstats == '1' %}
-- pipeline.id: domainstats
-  path.config: "/usr/share/logstash/domainstats"
-{%- endif %}
diff --git a/salt/logstash/files/custom/Drop.Your.Custom.Parsers.Here.conf b/salt/logstash/files/pipeline/Drop.Your.Custom.Parsers.Here.conf
similarity index 100%
rename from salt/logstash/files/custom/Drop.Your.Custom.Parsers.Here.conf
rename to salt/logstash/files/pipeline/Drop.Your.Custom.Parsers.Here.conf
diff --git a/salt/logstash/init.sls b/salt/logstash/init.sls
index 5bb571029..65c1a4f2b 100644
--- a/salt/logstash/init.sls
+++ b/salt/logstash/init.sls
@@ -42,7 +42,7 @@ logstash:
 # Create a directory for people to drop their own custom parsers into
 lscustdir:
   file.directory:
-    - name: /opt/so/conf/logstash/custom
+    - name: /opt/so/conf/logstash/pipeline
     - user: 931
     - group: 939
     - makedirs: True
@@ -102,7 +102,7 @@ so-logstash:
       - /opt/so/conf/logstash/logstash.yml:/usr/share/logstash/config/logstash.yml:ro
       - /opt/so/conf/logstash/logstash-template.json:/logstash-template.json:ro
       - /opt/so/conf/logstash/beats-template.json:/beats-template.json:ro
-      - /opt/so/conf/logstash/custom:/usr/share/logstash/custom:ro
+      - /opt/so/conf/logstash/pipeline:/usr/share/logstash/pipeline:rw
       - /opt/so/rules:/etc/nsm/rules:ro
       - /nsm/import:/nsm/import:ro
       - /nsm/logstash:/usr/share/logstash/data:rw