diff --git a/salt/logstash/conf/conf.enabled.txt.master b/salt/logstash/conf/conf.enabled.txt.so-master
similarity index 100%
rename from salt/logstash/conf/conf.enabled.txt.master
rename to salt/logstash/conf/conf.enabled.txt.so-master
diff --git a/salt/logstash/init.sls b/salt/logstash/init.sls
index f23c944e2..59d4560a1 100644
--- a/salt/logstash/init.sls
+++ b/salt/logstash/init.sls
@@ -28,7 +28,7 @@
 
   {% if grains['role'] == 'so-master' %}
 
-    {% set nodetype = master %}
+    {% set nodetype = salt['grains.get']('role', '')  %}
 
   {% else %}
 
diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls
index 5476815e8..3e06912bb 100644
--- a/salt/ssl/init.sls
+++ b/salt/ssl/init.sls
@@ -4,7 +4,7 @@
 
 /usr/local/share/ca-certificates/intca.crt:
   x509.pem_managed:
-    - text: {{ salt['mine.get']('master', 'x509.get_pem_entries')['ca']['/etc/pki/ca.crt']|replace('\n', '') }}
+    - text: {{ salt['mine.get']('master', 'x509.get_pem_entries')['master']['/etc/pki/ca.crt']|replace('\n', '') }}
 
 # Request a cert and drop it where it needs to go to be distributed
 /etc/pki/filebeat.crt: