diff --git a/ingestion/tests/cli_e2e/base/test_cli.py b/ingestion/tests/cli_e2e/base/test_cli.py
index 84ccc4ce30c..7513b2b0263 100644
--- a/ingestion/tests/cli_e2e/base/test_cli.py
+++ b/ingestion/tests/cli_e2e/base/test_cli.py
@@ -66,11 +66,10 @@ class CliBase(ABC):
     def build_config_file(
         self, test_type: E2EType = E2EType.INGEST, extra_args: dict = None
     ) -> None:
-        with open(self.config_file_path, encoding=UTF_8) as config_file:
-            config_yaml = yaml.safe_load(config_file)
-            config_yaml = self.build_yaml(config_yaml, test_type, extra_args)
-            with open(self.test_file_path, "w", encoding=UTF_8) as test_file:
-                yaml.dump(config_yaml, test_file)
+        config_yaml = load_config_file(Path(self.config_file_path))
+        config_yaml = self.build_yaml(config_yaml, test_type, extra_args)
+        with open(self.test_file_path, "w", encoding=UTF_8) as test_file:
+            yaml.dump(config_yaml, test_file)
 
     def retrieve_statuses(self, result):
         source_status: Status = self.extract_source_status(result)
diff --git a/openmetadata-spec/src/main/resources/json/schema/api/createEventPublisherJob.json b/openmetadata-spec/src/main/resources/json/schema/api/createEventPublisherJob.json
index ae953f19c79..10eadd2d210 100644
--- a/openmetadata-spec/src/main/resources/json/schema/api/createEventPublisherJob.json
+++ b/openmetadata-spec/src/main/resources/json/schema/api/createEventPublisherJob.json
@@ -11,9 +11,11 @@
       "type": "string"
     },
     "publisherType": {
+      "description": "Publisher Type",
       "$ref": "../system/eventPublisherJob.json#/definitions/publisherType"
     },
     "runMode": {
+      "description": "This schema publisher run modes.",
       "$ref": "../system/eventPublisherJob.json#/definitions/runMode"
     },
     "entities": {
diff --git a/openmetadata-spec/src/main/resources/json/schema/api/voteRequest.json b/openmetadata-spec/src/main/resources/json/schema/api/voteRequest.json
index 40ab29823d0..e5c6b4ae6fd 100644
--- a/openmetadata-spec/src/main/resources/json/schema/api/voteRequest.json
+++ b/openmetadata-spec/src/main/resources/json/schema/api/voteRequest.json
@@ -7,6 +7,7 @@
   "javaType": "org.openmetadata.schema.api.VoteRequest",
   "properties": {
     "updatedVoteType": {
+      "description": "The updated vote type",
       "$ref": "../type/votes.json#/definitions/voteType"
     }
   },
diff --git a/scripts/datamodel_generation.py b/scripts/datamodel_generation.py
index 085d3231d16..ab1a847002e 100644
--- a/scripts/datamodel_generation.py
+++ b/scripts/datamodel_generation.py
@@ -38,7 +38,7 @@ UNICODE_REGEX_REPLACEMENT_FILE_PATHS = [
     f"{ingestion_path}src/metadata/generated/schema/type/basic.py",
 ]
 
-args = f"--custom-template-dir {directory_root}/ingestion/codegen_custom_templates --input {directory_root}openmetadata-spec/src/main/resources/json/schema --output-model-type pydantic_v2.BaseModel --use-annotated --base-class metadata.ingestion.models.custom_pydantic.BaseModel --input-file-type jsonschema --output {ingestion_path}src/metadata/generated/schema --set-default-enum-member".split(" ")
+args = f"--input {directory_root}openmetadata-spec/src/main/resources/json/schema --output-model-type pydantic_v2.BaseModel --use-annotated --base-class metadata.ingestion.models.custom_pydantic.BaseModel --input-file-type jsonschema --output {ingestion_path}src/metadata/generated/schema --set-default-enum-member".split(" ")
 
 main(args)
 
@@ -85,7 +85,6 @@ for file_path in UNSUPPORTED_REGEX_PATTERN_FILE_PATHS:
 # Supporting timezone aware datetime is too complex for the profiler
 DATETIME_AWARE_FILE_PATHS = [
     f"{ingestion_path}src/metadata/generated/schema/type/basic.py",
-    # f"{ingestion_path}src/metadata/generated/schema/entity/data/table.py",
 ]
 
 for file_path in DATETIME_AWARE_FILE_PATHS: