diff --git a/setup/so-functions b/setup/so-functions
index 3ff66be30..ad0587f31 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1042,6 +1042,9 @@ host_pillar() {
 	printf '%s\n'\
 		"host:"\
 		"  mainint: '$MNIC'"\
+		"sensoroni:"\
+		"  node_address: '$MAINIP'"\
+		"  node_description: '$NODE_DESCRIPTION'"\
 		"" > "$pillar_file"
 }
 
@@ -1205,8 +1208,6 @@ manager_global() {
 		"  imagerepo: '$IMAGEREPO'"\
 		"  pipeline: 'redis'"\
 		"sensoroni:"\
-		"  node_address: '$MAINIP'"\
-		"  node_description: '$NODE_DESCRIPTION'"\
 		"  node_checkin_interval_ms: $NODE_CHECKIN_INTERVAL_MS"\
 		"strelka:"\
 		"  enabled: $STRELKA"\