diff --git a/salt/allowed_states.map.jinja b/salt/allowed_states.map.jinja
index 5746055eb..f887d9dfc 100644
--- a/salt/allowed_states.map.jinja
+++ b/salt/allowed_states.map.jinja
@@ -25,7 +25,6 @@
 {% set manager_states = [
     'salt.master',
     'ca.server',
-    'pcap.ca',
     'registry',
     'manager',
     'nginx',
diff --git a/salt/common/init.sls b/salt/common/init.sls
index eba18f651..14cf3d4e8 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -177,7 +177,7 @@ so-status_script:
     - source: salt://common/tools/sbin/so-status
     - mode: 755
 
-{% if GLOBALS.role in GLOBALS.sensor_roles %}
+{% if GLOBALS.is_sensor %}
 # Add sensor cleanup
 so-sensor-clean:
   cron.present:
diff --git a/salt/sensoroni/enabled.sls b/salt/sensoroni/enabled.sls
index f76288fec..67c79f5f8 100644
--- a/salt/sensoroni/enabled.sls
+++ b/salt/sensoroni/enabled.sls
@@ -8,7 +8,9 @@
 
 
 include:
+{% if GLOBALS.is_sensor or GLOBALS.role == 'so-import' %}
   - pcap.ca
+{% endif %}
   - sensoroni.config
   - sensoroni.sostatus
 
@@ -17,7 +19,9 @@ so-sensoroni:
     - image: {{ GLOBALS.registry_host }}:5000/{{ GLOBALS.image_repo }}/so-soc:{{ GLOBALS.so_version }}
     - network_mode: host
     - binds:
+      {% if GLOBALS.is_sensor or GLOBALS.role == 'so-import' %}
       - /opt/so/conf/steno/certs:/etc/stenographer/certs:rw
+      {% endif %}
       - /nsm/pcap:/nsm/pcap:rw
       - /nsm/import:/nsm/import:rw
       - /nsm/pcapout:/nsm/pcapout:rw