diff --git a/salt/filebeat/init.sls b/salt/filebeat/init.sls
index 1523f7a13..6fb65bd63 100644
--- a/salt/filebeat/init.sls
+++ b/salt/filebeat/init.sls
@@ -63,5 +63,4 @@ so-filebeat:
       - /opt/so/log/suricata:/suricata:ro
       - /opt/so/conf/filebeat/etc/pki/filebeat.crt:/usr/share/filebeat/filebeat.crt:ro
       - /opt/so/conf/filebeat/etc/pki/filebeat.key:/usr/share/filebeat/filebeat.key:ro
-      - /opt/so/conf/filebeat/etc/pki/filebeat.p8:/usr/share/filebeat/filebeat.p8:ro
       - /etc/ssl/certs/intca.crt:/usr/share/filebeat/intraca.crt:ro
diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls
index 4b12a75ac..c403154fb 100644
--- a/salt/ssl/init.sls
+++ b/salt/ssl/init.sls
@@ -16,7 +16,8 @@ m2cryptopkgs:
       - python-m2crypto
 {% endif %}
 
-{% if grains['role'] == 'so-master' %}
+{% if grains['role'] == 'so-master' or grains['role'] == 'so-eval' %}
+
 # Request a cert and drop it where it needs to go to be distributed
 /etc/pki/filebeat.crt:
   x509.certificate_managed: