diff --git a/app/src/handlers/edge5-modbus.ts b/app/src/handlers/edge5-modbus.ts
index b2e26c5..368a1b0 100644
--- a/app/src/handlers/edge5-modbus.ts
+++ b/app/src/handlers/edge5-modbus.ts
@@ -5,7 +5,7 @@ export const TOPIC = 'data/edge5/modbus/v1'
 const EDGE = 'edge5'
 const REGISTER_COUNT = 125
 const postUrl =
-  process.env.EDGE5_MODBUS_POST_URL ?? 'https://greact.drll.cloud/api/ingest'
+  process.env.CLOUD_INGEST_URL ?? 'https://greact.drll.cloud/api/ingest'
 
 type Edge5ModbusMetric = {
   edge: string
@@ -38,7 +38,7 @@ function toMetrics(values: number[], timestamp: number): Edge5ModbusMetric[] {
   return values.map((value, index) => ({
     edge: EDGE,
     timestamp,
-    tag: `modbus.${index + 1}`,
+    tag: `${EDGE}.modbus.${index + 1}`,
     value,
   }))
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index cd3a704..f5634c5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,4 +21,4 @@ services:
       MQTT_URL: mqtt://mosquitto:1883
       HTTP_PORT: "80"
       WS_PORT: "9090"
-      EDGE5_MODBUS_POST_URL: ${EDGE5_MODBUS_POST_URL:-https://greact.drll.cloud/api/ingest}
+      CLOUD_INGEST_URL: ${CLOUD_INGEST_URL:-https://greact.drll.cloud/api/ingest}