diff --git a/specification/iotoperations/IoTOperations.Management/examples/2024-08-15-preview/DataflowEndpoint_CreateOrUpdate_ADX.json b/specification/iotoperations/IoTOperations.Management/examples/2024-08-15-preview/DataflowEndpoint_CreateOrUpdate_ADX.json
index 529795f896d9..9cda761eb76c 100644
--- a/specification/iotoperations/IoTOperations.Management/examples/2024-08-15-preview/DataflowEndpoint_CreateOrUpdate_ADX.json
+++ b/specification/iotoperations/IoTOperations.Management/examples/2024-08-15-preview/DataflowEndpoint_CreateOrUpdate_ADX.json
@@ -18,9 +18,8 @@
           },
           "database": "example-database",
           "batching": {
-            "latencyMs": 1000,
-            "maxBytes": 1000,
-            "maxMessages": 1000
+            "latencySeconds": 9312,
+            "maxMessages": 9028
           }
         }
       },
@@ -43,9 +42,8 @@
             },
             "database": "example-database",
             "batching": {
-              "latencyMs": 1000,
-              "maxBytes": 1000,
-              "maxMessages": 1000
+              "latencySeconds": 9312,
+              "maxMessages": 9028
             }
           },
           "provisioningState": "Succeeded"
@@ -82,9 +80,8 @@
             },
             "database": "example-database",
             "batching": {
-              "latencyMs": 1000,
-              "maxBytes": 1000,
-              "maxMessages": 1000
+              "latencySeconds": 9312,
+              "maxMessages": 9028
             }
           },
           "provisioningState": "Succeeded"
diff --git a/specification/iotoperations/IoTOperations.Management/examples/2024-08-15-preview/DataflowEndpoint_CreateOrUpdate_MaximumSet_Gen.json b/specification/iotoperations/IoTOperations.Management/examples/2024-08-15-preview/DataflowEndpoint_CreateOrUpdate_MaximumSet_Gen.json
index bb552320a009..50b1282310a9 100644
--- a/specification/iotoperations/IoTOperations.Management/examples/2024-08-15-preview/DataflowEndpoint_CreateOrUpdate_MaximumSet_Gen.json
+++ b/specification/iotoperations/IoTOperations.Management/examples/2024-08-15-preview/DataflowEndpoint_CreateOrUpdate_MaximumSet_Gen.json
@@ -25,8 +25,8 @@
           "database": "yqcdpjsifm",
           "host": "<cluster>.<region>.kusto.windows.net",
           "batching": {
-            "latencySeconds": 1228,
-            "maxMessages": 171
+            "latencySeconds": 9312,
+            "maxMessages": 9028
           }
         },
         "dataLakeStorageSettings": {
@@ -46,8 +46,8 @@
           },
           "host": "<account>.blob.core.windows.net",
           "batching": {
-            "latencySeconds": 1228,
-            "maxMessages": 171
+            "latencySeconds": 9312,
+            "maxMessages": 9028
           }
         },
         "fabricOneLakeSettings": {
@@ -69,8 +69,8 @@
           "oneLakePathType": "Files",
           "host": "https://<host>.fabric.microsoft.com",
           "batching": {
-            "latencySeconds": 1228,
-            "maxMessages": 171
+            "latencySeconds": 9312,
+            "maxMessages": 9028
           }
         },
         "kafkaSettings": {
@@ -172,9 +172,8 @@
             "database": "yqcdpjsifm",
             "host": "<cluster>.<region>.kusto.windows.net",
             "batching": {
-              "latencyMs": 1000,
-              "maxBytes": 1000,
-              "maxMessages": 1000
+              "latencySeconds": 1228,
+              "maxMessages": 171
             }
           },
           "dataLakeStorageSettings": {
@@ -194,9 +193,8 @@
             },
             "host": "<account>.blob.core.windows.net",
             "batching": {
-              "latencyMs": 1000,
-              "maxBytes": 1000,
-              "maxMessages": 1000
+              "latencySeconds": 1228,
+              "maxMessages": 171
             }
           },
           "fabricOneLakeSettings": {
@@ -218,9 +216,8 @@
             "oneLakePathType": "Files",
             "host": "https://<host>.fabric.microsoft.com",
             "batching": {
-              "latencyMs": 1000,
-              "maxBytes": 1000,
-              "maxMessages": 1000
+              "latencySeconds": 1228,
+              "maxMessages": 171
             }
           },
           "kafkaSettings": {
@@ -336,9 +333,8 @@
             "database": "yqcdpjsifm",
             "host": "<cluster>.<region>.kusto.windows.net",
             "batching": {
-              "latencyMs": 1000,
-              "maxBytes": 1000,
-              "maxMessages": 1000
+              "latencySeconds": 1228,
+              "maxMessages": 171
             }
           },
           "dataLakeStorageSettings": {
@@ -358,9 +354,8 @@
             },
             "host": "<account>.blob.core.windows.net",
             "batching": {
-              "latencyMs": 1000,
-              "maxBytes": 1000,
-              "maxMessages": 1000
+              "latencySeconds": 1228,
+              "maxMessages": 171
             }
           },
           "fabricOneLakeSettings": {
@@ -382,9 +377,8 @@
             "oneLakePathType": "Files",
             "host": "https://<host>.fabric.microsoft.com",
             "batching": {
-              "latencyMs": 1000,
-              "maxBytes": 1000,
-              "maxMessages": 1000
+              "latencySeconds": 1228,
+              "maxMessages": 171
             }
           },
           "kafkaSettings": {
diff --git a/specification/iotoperations/IoTOperations.Management/examples/2024-08-15-preview/DataflowEndpoint_Get_MaximumSet_Gen.json b/specification/iotoperations/IoTOperations.Management/examples/2024-08-15-preview/DataflowEndpoint_Get_MaximumSet_Gen.json
index 71966ed52fe7..ddc1115956a3 100644
--- a/specification/iotoperations/IoTOperations.Management/examples/2024-08-15-preview/DataflowEndpoint_Get_MaximumSet_Gen.json
+++ b/specification/iotoperations/IoTOperations.Management/examples/2024-08-15-preview/DataflowEndpoint_Get_MaximumSet_Gen.json
@@ -28,9 +28,8 @@
             "database": "yqcdpjsifm",
             "host": "<cluster>.<region>.kusto.windows.net",
             "batching": {
-              "latencyMs": 1000,
-              "maxBytes": 1000,
-              "maxMessages": 1000
+              "latencySeconds": 1228,
+              "maxMessages": 171
             }
           },
           "dataLakeStorageSettings": {
@@ -50,9 +49,8 @@
             },
             "host": "<account>.blob.core.windows.net",
             "batching": {
-              "latencyMs": 1000,
-              "maxBytes": 1000,
-              "maxMessages": 1000
+              "latencySeconds": 1228,
+              "maxMessages": 171
             }
           },
           "fabricOneLakeSettings": {
@@ -74,9 +72,8 @@
             "oneLakePathType": "Files",
             "host": "https://<host>.fabric.microsoft.com",
             "batching": {
-              "latencyMs": 1000,
-              "maxBytes": 1000,
-              "maxMessages": 1000
+              "latencySeconds": 1228,
+              "maxMessages": 171
             }
           },
           "kafkaSettings": {
diff --git a/specification/iotoperations/IoTOperations.Management/models/base.tsp b/specification/iotoperations/IoTOperations.Management/models/base.tsp
index 5f4253dc5642..dd4beacde903 100644
--- a/specification/iotoperations/IoTOperations.Management/models/base.tsp
+++ b/specification/iotoperations/IoTOperations.Management/models/base.tsp
@@ -114,12 +114,7 @@ model BatchingConfiguration {
   @doc("Batching latency in seconds.")
   @minValue(0)
   @maxValue(65535)
-  latencyMs?: int32 = 60;
-
-  @doc("Maximum number of bytes in a batch.")
-  @minValue(0)
-  @maxValue(4294967295)
-  maxBytes?: int32 = 100000;
+  latencySeconds?: int32 = 60;
 
   @doc("Maximum number of messages in a batch.")
   @minValue(0)
diff --git a/specification/iotoperations/resource-manager/Microsoft.IoTOperations/preview/2024-08-15-preview/examples/DataflowEndpoint_CreateOrUpdate_ADX.json b/specification/iotoperations/resource-manager/Microsoft.IoTOperations/preview/2024-08-15-preview/examples/DataflowEndpoint_CreateOrUpdate_ADX.json
index 529795f896d9..9cda761eb76c 100644
--- a/specification/iotoperations/resource-manager/Microsoft.IoTOperations/preview/2024-08-15-preview/examples/DataflowEndpoint_CreateOrUpdate_ADX.json
+++ b/specification/iotoperations/resource-manager/Microsoft.IoTOperations/preview/2024-08-15-preview/examples/DataflowEndpoint_CreateOrUpdate_ADX.json
@@ -18,9 +18,8 @@
           },
           "database": "example-database",
           "batching": {
-            "latencyMs": 1000,
-            "maxBytes": 1000,
-            "maxMessages": 1000
+            "latencySeconds": 9312,
+            "maxMessages": 9028
           }
         }
       },
@@ -43,9 +42,8 @@
             },
             "database": "example-database",
             "batching": {
-              "latencyMs": 1000,
-              "maxBytes": 1000,
-              "maxMessages": 1000
+              "latencySeconds": 9312,
+              "maxMessages": 9028
             }
           },
           "provisioningState": "Succeeded"
@@ -82,9 +80,8 @@
             },
             "database": "example-database",
             "batching": {
-              "latencyMs": 1000,
-              "maxBytes": 1000,
-              "maxMessages": 1000
+              "latencySeconds": 9312,
+              "maxMessages": 9028
             }
           },
           "provisioningState": "Succeeded"
diff --git a/specification/iotoperations/resource-manager/Microsoft.IoTOperations/preview/2024-08-15-preview/examples/DataflowEndpoint_CreateOrUpdate_MaximumSet_Gen.json b/specification/iotoperations/resource-manager/Microsoft.IoTOperations/preview/2024-08-15-preview/examples/DataflowEndpoint_CreateOrUpdate_MaximumSet_Gen.json
index bb552320a009..50b1282310a9 100644
--- a/specification/iotoperations/resource-manager/Microsoft.IoTOperations/preview/2024-08-15-preview/examples/DataflowEndpoint_CreateOrUpdate_MaximumSet_Gen.json
+++ b/specification/iotoperations/resource-manager/Microsoft.IoTOperations/preview/2024-08-15-preview/examples/DataflowEndpoint_CreateOrUpdate_MaximumSet_Gen.json
@@ -25,8 +25,8 @@
           "database": "yqcdpjsifm",
           "host": "<cluster>.<region>.kusto.windows.net",
           "batching": {
-            "latencySeconds": 1228,
-            "maxMessages": 171
+            "latencySeconds": 9312,
+            "maxMessages": 9028
           }
         },
         "dataLakeStorageSettings": {
@@ -46,8 +46,8 @@
           },
           "host": "<account>.blob.core.windows.net",
           "batching": {
-            "latencySeconds": 1228,
-            "maxMessages": 171
+            "latencySeconds": 9312,
+            "maxMessages": 9028
           }
         },
         "fabricOneLakeSettings": {
@@ -69,8 +69,8 @@
           "oneLakePathType": "Files",
           "host": "https://<host>.fabric.microsoft.com",
           "batching": {
-            "latencySeconds": 1228,
-            "maxMessages": 171
+            "latencySeconds": 9312,
+            "maxMessages": 9028
           }
         },
         "kafkaSettings": {
@@ -172,9 +172,8 @@
             "database": "yqcdpjsifm",
             "host": "<cluster>.<region>.kusto.windows.net",
             "batching": {
-              "latencyMs": 1000,
-              "maxBytes": 1000,
-              "maxMessages": 1000
+              "latencySeconds": 1228,
+              "maxMessages": 171
             }
           },
           "dataLakeStorageSettings": {
@@ -194,9 +193,8 @@
             },
             "host": "<account>.blob.core.windows.net",
             "batching": {
-              "latencyMs": 1000,
-              "maxBytes": 1000,
-              "maxMessages": 1000
+              "latencySeconds": 1228,
+              "maxMessages": 171
             }
           },
           "fabricOneLakeSettings": {
@@ -218,9 +216,8 @@
             "oneLakePathType": "Files",
             "host": "https://<host>.fabric.microsoft.com",
             "batching": {
-              "latencyMs": 1000,
-              "maxBytes": 1000,
-              "maxMessages": 1000
+              "latencySeconds": 1228,
+              "maxMessages": 171
             }
           },
           "kafkaSettings": {
@@ -336,9 +333,8 @@
             "database": "yqcdpjsifm",
             "host": "<cluster>.<region>.kusto.windows.net",
             "batching": {
-              "latencyMs": 1000,
-              "maxBytes": 1000,
-              "maxMessages": 1000
+              "latencySeconds": 1228,
+              "maxMessages": 171
             }
           },
           "dataLakeStorageSettings": {
@@ -358,9 +354,8 @@
             },
             "host": "<account>.blob.core.windows.net",
             "batching": {
-              "latencyMs": 1000,
-              "maxBytes": 1000,
-              "maxMessages": 1000
+              "latencySeconds": 1228,
+              "maxMessages": 171
             }
           },
           "fabricOneLakeSettings": {
@@ -382,9 +377,8 @@
             "oneLakePathType": "Files",
             "host": "https://<host>.fabric.microsoft.com",
             "batching": {
-              "latencyMs": 1000,
-              "maxBytes": 1000,
-              "maxMessages": 1000
+              "latencySeconds": 1228,
+              "maxMessages": 171
             }
           },
           "kafkaSettings": {
diff --git a/specification/iotoperations/resource-manager/Microsoft.IoTOperations/preview/2024-08-15-preview/examples/DataflowEndpoint_Get_MaximumSet_Gen.json b/specification/iotoperations/resource-manager/Microsoft.IoTOperations/preview/2024-08-15-preview/examples/DataflowEndpoint_Get_MaximumSet_Gen.json
index 71966ed52fe7..ddc1115956a3 100644
--- a/specification/iotoperations/resource-manager/Microsoft.IoTOperations/preview/2024-08-15-preview/examples/DataflowEndpoint_Get_MaximumSet_Gen.json
+++ b/specification/iotoperations/resource-manager/Microsoft.IoTOperations/preview/2024-08-15-preview/examples/DataflowEndpoint_Get_MaximumSet_Gen.json
@@ -28,9 +28,8 @@
             "database": "yqcdpjsifm",
             "host": "<cluster>.<region>.kusto.windows.net",
             "batching": {
-              "latencyMs": 1000,
-              "maxBytes": 1000,
-              "maxMessages": 1000
+              "latencySeconds": 1228,
+              "maxMessages": 171
             }
           },
           "dataLakeStorageSettings": {
@@ -50,9 +49,8 @@
             },
             "host": "<account>.blob.core.windows.net",
             "batching": {
-              "latencyMs": 1000,
-              "maxBytes": 1000,
-              "maxMessages": 1000
+              "latencySeconds": 1228,
+              "maxMessages": 171
             }
           },
           "fabricOneLakeSettings": {
@@ -74,9 +72,8 @@
             "oneLakePathType": "Files",
             "host": "https://<host>.fabric.microsoft.com",
             "batching": {
-              "latencyMs": 1000,
-              "maxBytes": 1000,
-              "maxMessages": 1000
+              "latencySeconds": 1228,
+              "maxMessages": 171
             }
           },
           "kafkaSettings": {
diff --git a/specification/iotoperations/resource-manager/Microsoft.IoTOperations/preview/2024-08-15-preview/iotoperations.json b/specification/iotoperations/resource-manager/Microsoft.IoTOperations/preview/2024-08-15-preview/iotoperations.json
index c82e10e8a817..755d46b43cc7 100644
--- a/specification/iotoperations/resource-manager/Microsoft.IoTOperations/preview/2024-08-15-preview/iotoperations.json
+++ b/specification/iotoperations/resource-manager/Microsoft.IoTOperations/preview/2024-08-15-preview/iotoperations.json
@@ -2767,7 +2767,7 @@
       "type": "object",
       "description": "Batching configuration",
       "properties": {
-        "latencyMs": {
+        "latencySeconds": {
           "type": "integer",
           "format": "int32",
           "description": "Batching latency in seconds.",
@@ -2775,14 +2775,6 @@
           "minimum": 0,
           "maximum": 65535
         },
-        "maxBytes": {
-          "type": "integer",
-          "format": "int32",
-          "description": "Maximum number of bytes in a batch.",
-          "default": 100000,
-          "minimum": 0,
-          "maximum": 4294967295
-        },
         "maxMessages": {
           "type": "integer",
           "format": "int32",