diff --git a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/domains_operations.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/domains_operations.py
index 3ba9aa92b37d..38106c0b61c9 100644
--- a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/domains_operations.py
+++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/domains_operations.py
@@ -106,9 +106,7 @@ def get(
 
 
     def _create_or_update_initial(
-            self, resource_group_name, domain_name, location, tags=None, custom_headers=None, raw=False, **operation_config):
-        domain_info = models.Domain(location=location, tags=tags)
-
+            self, resource_group_name, domain_name, domain_info, custom_headers=None, raw=False, **operation_config):
         # Construct URL
         url = self.create_or_update.metadata['url']
         path_format_arguments = {
@@ -157,7 +155,7 @@ def _create_or_update_initial(
         return deserialized
 
     def create_or_update(
-            self, resource_group_name, domain_name, location, tags=None, custom_headers=None, raw=False, polling=True, **operation_config):
+            self, resource_group_name, domain_name, domain_info, custom_headers=None, raw=False, polling=True, **operation_config):
         """Create or update a domain.
 
         Asynchronously creates or updates a new domain with the specified
@@ -168,10 +166,8 @@ def create_or_update(
         :type resource_group_name: str
         :param domain_name: Name of the domain.
         :type domain_name: str
-        :param location: Location of the resource.
-        :type location: str
-        :param tags: Tags of the resource.
-        :type tags: dict[str, str]
+        :param domain_info: Domain information.
+        :type domain_info: ~azure.mgmt.eventgrid.models.Domain
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: The poller return type is ClientRawResponse, the
          direct response alongside the deserialized response
@@ -188,8 +184,7 @@ def create_or_update(
         raw_result = self._create_or_update_initial(
             resource_group_name=resource_group_name,
             domain_name=domain_name,
-            location=location,
-            tags=tags,
+            domain_info=domain_info,
             custom_headers=custom_headers,
             raw=True,
             **operation_config
diff --git a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/topics_operations.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/topics_operations.py
index cd872c8e9cd7..701ecfc0cb3c 100644
--- a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/topics_operations.py
+++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/topics_operations.py
@@ -106,9 +106,7 @@ def get(
 
 
     def _create_or_update_initial(
-            self, resource_group_name, topic_name, location, tags=None, custom_headers=None, raw=False, **operation_config):
-        topic_info = models.Topic(location=location, tags=tags)
-
+            self, resource_group_name, topic_name, topic_info, custom_headers=None, raw=False, **operation_config):
         # Construct URL
         url = self.create_or_update.metadata['url']
         path_format_arguments = {
@@ -157,7 +155,7 @@ def _create_or_update_initial(
         return deserialized
 
     def create_or_update(
-            self, resource_group_name, topic_name, location, tags=None, custom_headers=None, raw=False, polling=True, **operation_config):
+            self, resource_group_name, topic_name, topic_info, custom_headers=None, raw=False, polling=True, **operation_config):
         """Create a topic.
 
         Asynchronously creates a new topic with the specified parameters.
@@ -167,10 +165,8 @@ def create_or_update(
         :type resource_group_name: str
         :param topic_name: Name of the topic.
         :type topic_name: str
-        :param location: Location of the resource.
-        :type location: str
-        :param tags: Tags of the resource.
-        :type tags: dict[str, str]
+        :param topic_info: Topic information.
+        :type topic_info: ~azure.mgmt.eventgrid.models.Topic
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: The poller return type is ClientRawResponse, the
          direct response alongside the deserialized response
@@ -187,8 +183,7 @@ def create_or_update(
         raw_result = self._create_or_update_initial(
             resource_group_name=resource_group_name,
             topic_name=topic_name,
-            location=location,
-            tags=tags,
+            topic_info=topic_info,
             custom_headers=custom_headers,
             raw=True,
             **operation_config