diff --git a/salt/sensoroni/files/sensoroni.json b/salt/sensoroni/files/sensoroni.json
index b9275239a..55b928ef0 100644
--- a/salt/sensoroni/files/sensoroni.json
+++ b/salt/sensoroni/files/sensoroni.json
@@ -1,5 +1,6 @@
 {% set URLBASE = salt['pillar.get']('global:url_base') -%}
 {% set DESCRIPTION = salt['pillar.get']('sensoroni:node_description') -%}
+{% set ADDRESS = salt['pillar.get']('sensoroni:node_address') -%}
 {% set SENSORONIKEY = salt['pillar.get']('global:sensoronikey', '') -%}
 {% set CHECKININTERVALMS = salt['pillar.get']('sensoroni:node_checkin_interval_ms', 10000) -%}
 {% set STENOENABLED = salt['pillar.get']('steno:enabled', False) -%}
@@ -9,6 +10,7 @@
   "agent": {
     "role": "{{ grains.role }}",
     "description": "{{ DESCRIPTION }}",
+    "address": "{{ ADDRESS }}",
     "pollIntervalMs": {{ CHECKININTERVALMS if CHECKININTERVALMS else 10000 }},
     "serverUrl": "https://{{ URLBASE }}/sensoroniagents",
     "verifyCert": false,
diff --git a/setup/so-functions b/setup/so-functions
index 816834fb8..4821605f7 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1167,7 +1167,8 @@ manager_global() {
 		"  imagerepo: '$IMAGEREPO'"\
 		"  pipeline: 'redis'"\
 		"sensoroni:"\
-		"  node_description: '$MAINIP'"\
+		"  node_address: '$MAINIP'"\
+		"  node_description: '$NODE_DESCRIPTION'"\
 		"  node_checkin_interval_ms: $NODE_CHECKIN_INTERVAL_MS"\
 		"strelka:"\
 		"  enabled: $STRELKA"\