diff --git a/gateway-test-utils/configs/sp_sim_config.test.toml b/gateway-test-utils/configs/sp_sim_config.test.toml
index 6abe513de38..4f370a167c8 100644
--- a/gateway-test-utils/configs/sp_sim_config.test.toml
+++ b/gateway-test-utils/configs/sp_sim_config.test.toml
@@ -21,7 +21,7 @@ description = "FAKE temperature sensor 1"
 capabilities = 0x2
 presence = "Present"
 sensors = [
-    {name = "Southwest", kind = "Temperature", sensor_id = 0, last_data.value = 41.7890625, last_data.timestamp = 1234 },
+    {name = "Southwest", kind = "Temperature", last_data.value = 41.7890625, last_data.timestamp = 1234 },
 ]
 
 [[simulated_sps.sidecar.components]]
@@ -31,7 +31,7 @@ description = "FAKE temperature sensor 2"
 capabilities = 0x2
 presence = "Failed"
 sensors = [
-    { name = "South", kind = "Temperature", sensor_id = 1, last_error.value = "DeviceError", last_error.timestamp = 1234 },
+    { name = "South", kind = "Temperature", last_error.value = "DeviceError", last_error.timestamp = 1234 },
 ]
 
 [[simulated_sps.sidecar]]
@@ -63,7 +63,7 @@ description = "FAKE temperature sensor"
 capabilities = 0x2
 presence = "Failed"
 sensors = [
-    { name = "Southwest", kind = "Temperature", sensor_id = 0, last_error.value = "DeviceError", last_error.timestamp = 1234 },
+    { name = "Southwest", kind = "Temperature", last_error.value = "DeviceError", last_error.timestamp = 1234 },
 ]
 [[simulated_sps.gimlet.components]]
 id = "dev-1"
@@ -72,7 +72,7 @@ description = "FAKE temperature sensor"
 capabilities = 0x2
 presence = "Present"
 sensors = [
-    { name = "South", kind = "Temperature", sensor_id = 1, last_data.value = 42.5625, last_data.timestamp = 1234 },
+    { name = "South", kind = "Temperature", last_data.value = 42.5625, last_data.timestamp = 1234 },
 ]
 
 [[simulated_sps.gimlet.components]]
@@ -82,7 +82,7 @@ description = "FAKE Southeast temperature sensor"
 capabilities = 0x2
 presence = "Present"
 sensors = [
-    { name = "Southeast", kind = "Temperature", sensor_id = 2, last_data.value = 41.570313, last_data.timestamp = 1234 },
+    { name = "Southeast", kind = "Temperature", last_data.value = 41.570313, last_data.timestamp = 1234 },
 ]
 
 [[simulated_sps.gimlet.components]]
@@ -99,10 +99,10 @@ description = "FAKE U.2 Sharkfin A hot swap controller"
 capabilities = 0x2
 presence = "Present"
 sensors = [
-    { name = "V12_U2A_A0", kind = "Current", sensor_id = 3, last_data.value = 0.45898438, last_data.timestamp = 1234 },
-    { name = "V3P3_U2A_A0", kind = "Current", sensor_id = 4, last_data.value = 0.024414063, last_data.timestamp = 1234 },
-    { name = "V12_U2A_A0", kind = "Voltage", sensor_id = 5, last_data.value = 12.03125, last_data.timestamp = 1234 },
-    { name = "V3P3_U2A_A0", kind = "Voltage", sensor_id = 6, last_data.value = 3.328125, last_data.timestamp = 1234 },
+    { name = "V12_U2A_A0", kind = "Current", last_data.value = 0.45898438, last_data.timestamp = 1234 },
+    { name = "V3P3_U2A_A0", kind = "Current", last_data.value = 0.024414063, last_data.timestamp = 1234 },
+    { name = "V12_U2A_A0", kind = "Voltage", last_data.value = 12.03125, last_data.timestamp = 1234 },
+    { name = "V3P3_U2A_A0", kind = "Voltage", last_data.value = 3.328125, last_data.timestamp = 1234 },
 ]
 
 [[simulated_sps.gimlet.components]]
@@ -112,7 +112,7 @@ description = "FAKE U.2 A NVMe Basic Management Command"
 capabilities = 0x2
 presence = "Present"
 sensors = [
-    { name = "U2_N0", kind = "Temperature", sensor_id = 7, last_data.value = 56.0, last_data.timestamp = 1234 },
+    { name = "U2_N0", kind = "Temperature", last_data.value = 56.0, last_data.timestamp = 1234 },
 ]
 [[simulated_sps.gimlet.components]]
 id = "dev-39"
@@ -121,7 +121,7 @@ description = "FAKE T6 temperature sensor"
 capabilities = 0x2
 presence = "Present"
 sensors = [
-    { name = "t6", kind = "Temperature", sensor_id = 9, last_data.value = 70.625, last_data.timestamp = 1234 },
+    { name = "t6", kind = "Temperature", last_data.value = 70.625, last_data.timestamp = 1234 },
 ]
 [[simulated_sps.gimlet.components]]
 id = "dev-53"
@@ -130,12 +130,12 @@ description = "FAKE Fan controller"
 capabilities = 0x2
 presence = "Present"
 sensors = [
-    { name = "Southeast", kind = "Speed", sensor_id = 10, last_data.value = 2607.0, last_data.timestamp = 1234 },
-    { name = "Northeast", kind = "Speed", sensor_id = 11, last_data.value = 2476.0, last_data.timestamp = 1234 },
-    { name = "South", kind = "Speed", sensor_id = 12, last_data.value = 2553.0, last_data.timestamp = 1234 },
-    { name = "North", kind = "Speed", sensor_id = 13, last_data.value = 2265.0, last_data.timestamp = 1234 },
-    { name = "Southwest", kind = "Speed", sensor_id = 14, last_data.value = 2649.0, last_data.timestamp = 1234 },
-    { name = "Northwest", kind = "Speed", sensor_id = 15, last_data.value = 2275.0, last_data.timestamp = 1234 },
+    { name = "Southeast", kind = "Speed", last_data.value = 2607.0, last_data.timestamp = 1234 },
+    { name = "Northeast", kind = "Speed", last_data.value = 2476.0, last_data.timestamp = 1234 },
+    { name = "South", kind = "Speed", last_data.value = 2553.0, last_data.timestamp = 1234 },
+    { name = "North", kind = "Speed", last_data.value = 2265.0, last_data.timestamp = 1234 },
+    { name = "Southwest", kind = "Speed", last_data.value = 2649.0, last_data.timestamp = 1234 },
+    { name = "Northwest", kind = "Speed", last_data.value = 2275.0, last_data.timestamp = 1234 },
 ]
 
 
@@ -162,7 +162,7 @@ description = "FAKE temperature sensor"
 capabilities = 0x2
 presence = "Present"
 sensors = [
-    { name = "Southwest", kind = "Temperature", sensor_id = 0, last_data.value = 41.3629, last_data.timestamp = 1234 },
+    { name = "Southwest", kind = "Temperature", last_data.value = 41.3629, last_data.timestamp = 1234 },
 ]
 [[simulated_sps.gimlet.components]]
 id = "dev-1"
@@ -171,7 +171,7 @@ description = "FAKE temperature sensor"
 capabilities = 0x2
 presence = "Present"
 sensors = [
-    { name = "South", kind = "Temperature", sensor_id = 1, last_data.value = 42.5625, last_data.timestamp = 1234 },
+    { name = "South", kind = "Temperature", last_data.value = 42.5625, last_data.timestamp = 1234 },
 ]
 
 [[simulated_sps.gimlet.components]]
@@ -181,7 +181,7 @@ description = "FAKE Southeast temperature sensor"
 capabilities = 0x2
 presence = "Present"
 sensors = [
-    { name = "Southeast", kind = "Temperature", sensor_id = 2, last_data.value = 41.570313, last_data.timestamp = 1234 },
+    { name = "Southeast", kind = "Temperature", last_data.value = 41.570313, last_data.timestamp = 1234 },
 ]
 
 [[simulated_sps.gimlet.components]]
@@ -198,10 +198,10 @@ description = "FAKE U.2 Sharkfin A hot swap controller"
 capabilities = 0x2
 presence = "Present"
 sensors = [
-    { name = "V12_U2A_A0", kind = "Current", sensor_id = 3, last_data.value = 0.41893438, last_data.timestamp = 1234 },
-    { name = "V3P3_U2A_A0", kind = "Current", sensor_id = 4, last_data.value = 0.025614603, last_data.timestamp = 1234 },
-    { name = "V12_U2A_A0", kind = "Voltage", sensor_id = 5, last_data.value = 12.02914, last_data.timestamp = 1234 },
-    { name = "V3P3_U2A_A0", kind = "Voltage", sensor_id = 6, last_data.value = 3.2618, last_data.timestamp = 1234 },
+    { name = "V12_U2A_A0", kind = "Current", last_data.value = 0.41893438, last_data.timestamp = 1234 },
+    { name = "V3P3_U2A_A0", kind = "Current", last_data.value = 0.025614603, last_data.timestamp = 1234 },
+    { name = "V12_U2A_A0", kind = "Voltage", last_data.value = 12.02914, last_data.timestamp = 1234 },
+    { name = "V3P3_U2A_A0", kind = "Voltage", last_data.value = 3.2618, last_data.timestamp = 1234 },
 ]
 
 [[simulated_sps.gimlet.components]]
@@ -211,7 +211,7 @@ description = "FAKE U.2 A NVMe Basic Management Command"
 capabilities = 0x2
 presence = "Present"
 sensors = [
-    { name = "U2_N0", kind = "Temperature", sensor_id = 7, last_data.value = 56.0, last_data.timestamp = 1234 },
+    { name = "U2_N0", kind = "Temperature", last_data.value = 56.0, last_data.timestamp = 1234 },
 ]
 [[simulated_sps.gimlet.components]]
 id = "dev-39"
@@ -220,7 +220,7 @@ description = "FAKE T6 temperature sensor"
 capabilities = 0x2
 presence = "Present"
 sensors = [
-    { name = "t6", kind = "Temperature", sensor_id = 9, last_data.value = 70.625, last_data.timestamp = 1234 },
+    { name = "t6", kind = "Temperature", last_data.value = 70.625, last_data.timestamp = 1234 },
 ]
 [[simulated_sps.gimlet.components]]
 id = "dev-53"
@@ -229,12 +229,12 @@ description = "FAKE Fan controller"
 capabilities = 0x2
 presence = "Present"
 sensors = [
-    { name = "Southeast", kind = "Speed", sensor_id = 10, last_data.value = 2510.0, last_data.timestamp = 1234 },
-    { name = "Northeast", kind = "Speed", sensor_id = 11, last_data.value = 2390.0, last_data.timestamp = 1234 },
-    { name = "South", kind = "Speed", sensor_id = 12, last_data.value = 2467.0, last_data.timestamp = 1234 },
-    { name = "North", kind = "Speed", sensor_id = 13, last_data.value = 2195.0, last_data.timestamp = 1234 },
-    { name = "Southwest", kind = "Speed", sensor_id = 14, last_data.value = 2680.0, last_data.timestamp = 1234 },
-    { name = "Northwest", kind = "Speed", sensor_id = 15, last_data.value = 2212.0, last_data.timestamp = 1234 },
+    { name = "Southeast", kind = "Speed", last_data.value = 2510.0, last_data.timestamp = 1234 },
+    { name = "Northeast", kind = "Speed", last_data.value = 2390.0, last_data.timestamp = 1234 },
+    { name = "South", kind = "Speed", last_data.value = 2467.0, last_data.timestamp = 1234 },
+    { name = "North", kind = "Speed", last_data.value = 2195.0, last_data.timestamp = 1234 },
+    { name = "Southwest", kind = "Speed", last_data.value = 2680.0, last_data.timestamp = 1234 },
+    { name = "Northwest", kind = "Speed", last_data.value = 2212.0, last_data.timestamp = 1234 },
 ]