diff --git a/.vscode/cspell.json b/.vscode/cspell.json
index d2ae60b99a8f..4cdfe4d9c615 100644
--- a/.vscode/cspell.json
+++ b/.vscode/cspell.json
@@ -173,6 +173,7 @@
     "AsyncIterable",
     "asyncio",
     "avroencoder",
+    "Avs",
     "azcmagent",
     "azsdk",
     "azurecr",
diff --git a/sdk/eventgrid/azure-eventgrid/CHANGELOG.md b/sdk/eventgrid/azure-eventgrid/CHANGELOG.md
index 55222dd8dc78..6687a07b14f2 100644
--- a/sdk/eventgrid/azure-eventgrid/CHANGELOG.md
+++ b/sdk/eventgrid/azure-eventgrid/CHANGELOG.md
@@ -1,15 +1,11 @@
 # Release History
 
-## 4.16.1 (Unreleased)
+## 4.17.0 (2024-02-08)
 This version and all future versions will require Python 3.8+.
 
 ### Features Added
 
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
+- Added new enums values to `SystemEventNames` related to Azure Storage and Azure VMware Solution.
 
 ## 4.16.0 (2023-11-08)
 
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_event_mappings.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_event_mappings.py
index 91874ac9c910..516fdb358ce7 100644
--- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_event_mappings.py
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_event_mappings.py
@@ -204,6 +204,30 @@ class SystemEventNames(str, Enum, metaclass=CaseInsensitiveEnumMeta):
 
     AppConfigurationSnapshotModifiedEventName = 'Microsoft.AppConfiguration.SnapshotModified'
 
+    AvsClusterCreatedEventName = 'Microsoft.AVS.ClusterCreated'
+
+    AvsClusterDeletedEventName = 'Microsoft.AVS.ClusterDeleted'
+
+    AvsClusterFailedEventName = 'Microsoft.AVS.ClusterFailed'
+
+    AvsClusterUpdatedEventName = 'Microsoft.AVS.ClusterUpdated'
+
+    AvsClusterUpdatingEventName = 'Microsoft.AVS.ClusterUpdating'
+
+    AvsPrivateCloudFailedEventName = 'Microsoft.AVS.PrivateCloudFailed'
+
+    AvsPrivateCloudUpdatedEventName = 'Microsoft.AVS.PrivateCloudUpdated'
+
+    AvsPrivateCloudUpdatingEventName = 'Microsoft.AVS.PrivateCloudUpdating'
+
+    AvsScriptExecutionCancelledEventName = 'Microsoft.AVS.ScriptExecutionCancelled'
+
+    AvsScriptExecutionFailedEventName = 'Microsoft.AVS.ScriptExecutionFailed'
+
+    AvsScriptExecutionFinishedEventName = 'Microsoft.AVS.ScriptExecutionFinished'
+
+    AvsScriptExecutionStartedEventName = 'Microsoft.AVS.ScriptExecutionStarted'
+
     ContainerRegistryChartDeletedEventName = 'Microsoft.ContainerRegistry.ChartDeleted'
 
     ContainerRegistryChartPushedEventName = 'Microsoft.ContainerRegistry.ChartPushed'
@@ -420,6 +444,10 @@ class SystemEventNames(str, Enum, metaclass=CaseInsensitiveEnumMeta):
 
     StorageLifecyclePolicyCompletedEventName = 'Microsoft.Storage.LifecyclePolicyCompleted'
 
+    StorageTaskAssignmentCompletedEventName = 'Microsoft.Storage.StorageTaskAssignmentCompleted'
+
+    StorageTaskAssignmentQueuedEventName = 'Microsoft.Storage.StorageTaskAssignmentQueued'
+
     StorageTaskCompletedEventName = 'Microsoft.Storage.StorageTaskCompleted'
 
     StorageTaskQueuedEventName = 'Microsoft.Storage.StorageTaskQueued'
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_version.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_version.py
index 355d99b1b185..5928f81b078e 100644
--- a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_version.py
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/_version.py
@@ -9,4 +9,4 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "4.16.1"
+VERSION = "4.17.0"
diff --git a/sdk/eventgrid/azure-eventgrid/swagger/_constants.py b/sdk/eventgrid/azure-eventgrid/swagger/_constants.py
index a74d6a613a18..6e8ac5a857f9 100644
--- a/sdk/eventgrid/azure-eventgrid/swagger/_constants.py
+++ b/sdk/eventgrid/azure-eventgrid/swagger/_constants.py
@@ -2,7 +2,7 @@
 ####These files are used to extract the enums - update this list as necessary
 #############################################################################
 files = [
-
+    "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/eventgrid/data-plane/Microsoft.AVS/stable/2018-01-01/PrivateCloud.json",
     "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json",
     "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/eventgrid/data-plane/Microsoft.ApiManagement/stable/2018-01-01/APIManagement.json",
     "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/eventgrid/data-plane/Microsoft.AppConfiguration/stable/2018-01-01/AppConfiguration.json",
@@ -65,4 +65,5 @@
 
 EXCEPTIONS = ['ContainerRegistryArtifactEventData', 'ContainerRegistryEventData', 'ContainerServiceClusterSupportEventData', 'ContainerServiceNodePoolRollingEventData',
               'EventGridMQTTClientEventData', 'AppConfigurationSnapshotEventData', 'HealthResourcesResourceEventData', 'AcsRouterJobEventData', 'AcsRouterWorkerEventData', 'AcsRouterEventData',
+              'AvsClusterEventData', 'AvsPrivateCloudEventData', 'AvsScriptExecutionEventData',
               ]