diff --git a/salt/sensoroni/files/sensoroni.json b/salt/sensoroni/files/sensoroni.json
index 72f599940..04f2abf93 100644
--- a/salt/sensoroni/files/sensoroni.json
+++ b/salt/sensoroni/files/sensoroni.json
@@ -13,6 +13,12 @@
 {%-   set STENODEFAULT = False %}
 {%- endif %}
 {%- set STENOENABLED = salt['pillar.get']('steno:enabled', STENODEFAULT) %}
+{%- if ROLE in ['eval', 'standalone', 'import', 'manager', 'managersearch'] %}
+{%-   set ANALYZEDEFAULT = True %}
+{%- else %}
+{%-   set ANALYZEDEFAULT = False %}
+{%- endif %}
+{%- set ANALYZEENABLED = salt['pillar.get']('sensoroni:analyze_enabled', ANALYZEDEFAULT) %}
 {
   "logFilename": "/opt/sensoroni/logs/sensoroni.log",
   "logLevel":"info",
@@ -26,10 +32,12 @@
     "serverUrl": "https://{{ URLBASE }}/sensoroniagents",
     "verifyCert": false,
     "modules": {
+{%- if ANALYZEENABLED %} 
       "analyze": {
         "timeoutMs": {{ ANALYZE_TIMEOUT_MS }},
         "parallelLimit": {{ ANALYZE_PARALLEL_LIMIT }}
       },
+{%- endif %}
       "importer": {},
       "statickeyauth": {
         "apiKey": "{{ SENSORONIKEY }}"
diff --git a/salt/sensoroni/init.sls b/salt/sensoroni/init.sls
index b71589f0f..74e5dcf95 100644
--- a/salt/sensoroni/init.sls
+++ b/salt/sensoroni/init.sls
@@ -25,6 +25,13 @@ analyzersdir:
     - group: 939
     - makedirs: True
 
+sitepackagesdir:
+  file.directory:
+    - name: /opt/so/conf/sensoroni/site-packages
+    - user: 939
+    - group: 939
+    - makedirs: True
+
 sensoronilog:
   file.directory:
     - name: /opt/so/log/sensoroni
@@ -41,6 +48,15 @@ analyzerscripts:
     - template: jinja
     - source: salt://sensoroni/files/analyzers
 
+sitepackages:
+  file.recurse:
+    - name: /opt/so/conf/sensoroni/site-packages
+    - user: 939
+    - group: 939
+    - file_mode: 755
+    - template: jinja
+    - source: salt://sensoroni/files/site-packages
+
 so-sensoroni:
   docker_container.running:
     - image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-soc:{{ VERSION }}
@@ -52,6 +68,7 @@ so-sensoroni:
       - /nsm/pcapout:/nsm/pcapout:rw
       - /opt/so/conf/sensoroni/sensoroni.json:/opt/sensoroni/sensoroni.json:ro
       - /opt/so/conf/sensoroni/analyzers:/opt/sensoroni/analyzers:ro
+      - /opt/so/conf/sensoroni/site-packages:/opt/sensoroni/site-packages:rw
       - /opt/so/log/sensoroni:/opt/sensoroni/logs:rw
     - watch:
       - file: /opt/so/conf/sensoroni/sensoroni.json