diff --git a/salt/logstash/files/dynamic/9997_output_helix.conf b/salt/logstash/files/dynamic/9997_output_helix.conf
index c71b7d241..a6aefbf53 100644
--- a/salt/logstash/files/dynamic/9997_output_helix.conf
+++ b/salt/logstash/files/dynamic/9997_output_helix.conf
@@ -1,10 +1,5 @@
-{%- if salt['grains.get']('role') == 'so-master' %}
-{% set master = salt['pillar.get']('static:masterip', '') %}
-{%- set nodetype = 'master' %}
-{%- else %}
-{%- set nodetype = salt['pillar.get']('node:node_type', 'storage') %}
-{% set master = salt['pillar.get']('static:masterip', '') %}
-{%- endif %}
+{% set helix_api_key = salt['pillar.get']('fireeye:helix:api_key', '') %}
+
 filter {
   if "fe_clone" in [type] {
     grok {
@@ -105,7 +100,7 @@ output {
       url => "https://helix-integrations.cloud.aws.apps.fireeye.com/api/upload?source=test&format=json"
       http_method => post
       http_compression => true
-      headers => ["Authorization", "{{ HELIXAPIKEY }}"]
+      headers => ["Authorization", "{{ helix_api_key }}"]
       format => json_batch
     }
   }