diff --git a/salt/pcap/files/sensoroni.json b/salt/pcap/files/sensoroni.json
index e57a56d44..d35cfb067 100644
--- a/salt/pcap/files/sensoroni.json
+++ b/salt/pcap/files/sensoroni.json
@@ -1,10 +1,10 @@
-{%- set MASTERIP = salt['pillar.get']('static:masterip', '') -%}
+{%- set MASTER = grains['master'] -%}
 {%- set SENSORONIKEY = salt['pillar.get']('static:sensoronikey', '') -%}
 {
   "logFilename": "log/sensoroni.log",
   "agent": {
     "pollIntervalMs": 10000,
-    "serverUrl": "https://{{ MASTERIP }}/sensoroniagents",
+    "serverUrl": "https://{{ MASTER }}/sensoroniagents",
     "modules": {
       "statickeyauth": {
         "apiKey": "{{ SENSORONIKEY }}"
diff --git a/salt/pcap/init.sls b/salt/pcap/init.sls
index 3aede1607..7467cabcd 100644
--- a/salt/pcap/init.sls
+++ b/salt/pcap/init.sls
@@ -116,3 +116,5 @@ so-steno:
       - /nsm/pcapout:/nsm/pcapout:rw
       - /opt/so/log/stenographer:/var/log/stenographer:rw
       - /opt/so/conf/steno/sensoroni.json:/opt/sensoroni/sensoroni.json:ro
+    - watch:
+      - /opt/so/conf/steno/sensoroni.json