diff --git a/specification/eventgrid/Azure.Messaging.EventGrid.SystemEvents/Microsoft.AVS/AVS.tsp b/specification/eventgrid/Azure.Messaging.EventGrid.SystemEvents/Microsoft.AVS/AVS.tsp
index deae256ada7b..b927d21690ed 100644
--- a/specification/eventgrid/Azure.Messaging.EventGrid.SystemEvents/Microsoft.AVS/AVS.tsp
+++ b/specification/eventgrid/Azure.Messaging.EventGrid.SystemEvents/Microsoft.AVS/AVS.tsp
@@ -65,13 +65,13 @@ model AvsScriptExecutionFailedEventData extends AvsScriptExecutionEventData {
 /** Schema of the Data property of an EventGridEvent for Microsoft.AVS/privateClouds events. */
 model AvsPrivateCloudEventData {
   /** Id of the operation that caused this event. */
-  operationId?: string;
+  operationId: string;
 }
 
 /** Schema of the Data property of an EventGridEvent for Microsoft.AVS/clusters events. */
 model AvsClusterEventData {
   /** Id of the operation that caused this event. */
-  operationId?: string;
+  operationId: string;
 
   /** Hosts added to the cluster in this event, if any. */
   addedHostNames?: string[];
@@ -86,10 +86,10 @@ model AvsClusterEventData {
 /** Schema of the Data property of an EventGridEvent for Microsoft.AVS/scriptExecutions events. */
 model AvsScriptExecutionEventData {
   /** Id of the operation that caused this event. */
-  operationId?: string;
+  operationId: string;
 
   /** Cmdlet referenced in the execution that caused this event. */
-  cmdletId?: string;
+  cmdletId: string;
 
   /** Stdout outputs from the execution, if any. */
   output?: string[];
diff --git a/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2018-01-01/GeneratedSystemEvents.json b/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2018-01-01/GeneratedSystemEvents.json
index 0cdd6a187ca5..48945635b761 100644
--- a/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2018-01-01/GeneratedSystemEvents.json
+++ b/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2018-01-01/GeneratedSystemEvents.json
@@ -3037,7 +3037,10 @@
             "type": "string"
           }
         }
-      }
+      },
+      "required": [
+        "operationId"
+      ]
     },
     "AvsClusterFailedEventData": {
       "type": "object",
@@ -3080,7 +3083,10 @@
           "type": "string",
           "description": "Id of the operation that caused this event."
         }
-      }
+      },
+      "required": [
+        "operationId"
+      ]
     },
     "AvsPrivateCloudFailedEventData": {
       "type": "object",
@@ -3143,7 +3149,11 @@
             "type": "string"
           }
         }
-      }
+      },
+      "required": [
+        "operationId",
+        "cmdletId"
+      ]
     },
     "AvsScriptExecutionFailedEventData": {
       "type": "object",
diff --git a/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2024-01-01/GeneratedSystemEvents.json b/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2024-01-01/GeneratedSystemEvents.json
index 6d1979e0180c..36bd7e604627 100644
--- a/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2024-01-01/GeneratedSystemEvents.json
+++ b/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2024-01-01/GeneratedSystemEvents.json
@@ -3101,7 +3101,10 @@
             "type": "string"
           }
         }
-      }
+      },
+      "required": [
+        "operationId"
+      ]
     },
     "AvsClusterFailedEventData": {
       "type": "object",
@@ -3144,7 +3147,10 @@
           "type": "string",
           "description": "Id of the operation that caused this event."
         }
-      }
+      },
+      "required": [
+        "operationId"
+      ]
     },
     "AvsPrivateCloudFailedEventData": {
       "type": "object",
@@ -3207,7 +3213,11 @@
             "type": "string"
           }
         }
-      }
+      },
+      "required": [
+        "operationId",
+        "cmdletId"
+      ]
     },
     "AvsScriptExecutionFailedEventData": {
       "type": "object",