diff --git a/ingestion/src/metadata/ingestion/sink/elasticsearch_mapping/dashboard_search_index_mapping.py b/ingestion/src/metadata/ingestion/sink/elasticsearch_mapping/dashboard_search_index_mapping.py
index 3beeb311694..927c77b1927 100644
--- a/ingestion/src/metadata/ingestion/sink/elasticsearch_mapping/dashboard_search_index_mapping.py
+++ b/ingestion/src/metadata/ingestion/sink/elasticsearch_mapping/dashboard_search_index_mapping.py
@@ -100,8 +100,13 @@ DASHBOARD_ELASTICSEARCH_INDEX_MAPPING = textwrap.dedent(
             "type": "text"
           },
           "name": {
-            "type": "text",
-            "analyzer": "om_analyzer"
+            "type": "keyword",
+            "fields": {
+              "keyword": {
+                "type": "keyword",
+                "ignore_above": 256
+              }
+            }
           },
           "fullyQualifiedName": {
             "type": "text"
diff --git a/ingestion/src/metadata/ingestion/sink/elasticsearch_mapping/mlmodel_search_index_mapping.py b/ingestion/src/metadata/ingestion/sink/elasticsearch_mapping/mlmodel_search_index_mapping.py
index 685cd5468dc..efb9a202424 100644
--- a/ingestion/src/metadata/ingestion/sink/elasticsearch_mapping/mlmodel_search_index_mapping.py
+++ b/ingestion/src/metadata/ingestion/sink/elasticsearch_mapping/mlmodel_search_index_mapping.py
@@ -89,8 +89,13 @@ MLMODEL_ELASTICSEARCH_INDEX_MAPPING = textwrap.dedent(
       "mlFeatures": {
         "properties": {
           "name": {
-            "type": "text",
-             "analyzer": "om_analyzer"
+            "type": "keyword",
+            "fields": {
+              "keyword": {
+                "type": "keyword",
+                "ignore_above": 256
+              }
+            }
           },
           "dataType": {
             "type": "text"
@@ -117,8 +122,13 @@ MLMODEL_ELASTICSEARCH_INDEX_MAPPING = textwrap.dedent(
       "mlHyperParameters": {
         "properties": {
           "name": {
-            "type": "text",
-             "analyzer": "simple"
+            "type": "keyword",
+            "fields": {
+              "keyword": {
+                "type": "keyword",
+                "ignore_above": 256
+              }
+            }
           },
           "value": {
             "type": "text"
diff --git a/ingestion/src/metadata/ingestion/sink/elasticsearch_mapping/pipeline_search_index_mapping.py b/ingestion/src/metadata/ingestion/sink/elasticsearch_mapping/pipeline_search_index_mapping.py
index 9a9025588ee..7ed422340ee 100644
--- a/ingestion/src/metadata/ingestion/sink/elasticsearch_mapping/pipeline_search_index_mapping.py
+++ b/ingestion/src/metadata/ingestion/sink/elasticsearch_mapping/pipeline_search_index_mapping.py
@@ -88,8 +88,13 @@ PIPELINE_ELASTICSEARCH_INDEX_MAPPING = textwrap.dedent(
       "tasks": {
         "properties": {
           "name": {
-            "type": "text",
-            "analyzer": "om_analyzer"
+            "type": "keyword",
+            "fields": {
+              "keyword": {
+                "type": "keyword",
+                "ignore_above": 256
+              }
+            }
           },
           "displayName": {
             "type": "text",
diff --git a/ingestion/src/metadata/ingestion/sink/elasticsearch_mapping/table_search_index_mapping.py b/ingestion/src/metadata/ingestion/sink/elasticsearch_mapping/table_search_index_mapping.py
index 87e5bad5389..f8574de2322 100644
--- a/ingestion/src/metadata/ingestion/sink/elasticsearch_mapping/table_search_index_mapping.py
+++ b/ingestion/src/metadata/ingestion/sink/elasticsearch_mapping/table_search_index_mapping.py
@@ -88,8 +88,13 @@ TABLE_ELASTICSEARCH_INDEX_MAPPING = textwrap.dedent(
       "columns": {
         "properties": {
           "name": {
-            "type": "text",
-            "analyzer": "om_analyzer"
+            "type": "keyword",
+            "fields": {
+              "keyword": {
+                "type": "keyword",
+                "ignore_above": 256
+              }
+            }
           },
           "dataType": {
             "type": "text"
diff --git a/openmetadata-service/src/main/resources/elasticsearch/dashboard_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/dashboard_index_mapping.json
index 56075973f8a..eaa2806d991 100644
--- a/openmetadata-service/src/main/resources/elasticsearch/dashboard_index_mapping.json
+++ b/openmetadata-service/src/main/resources/elasticsearch/dashboard_index_mapping.json
@@ -84,8 +84,13 @@
             "type": "text"
           },
           "name": {
-            "type": "text",
-            "analyzer": "om_analyzer"
+            "type": "keyword",
+            "fields": {
+              "keyword": {
+                "type": "keyword",
+                "ignore_above": 256
+              }
+            }
           },
           "fullyQualifiedName": {
             "type": "text"
diff --git a/openmetadata-service/src/main/resources/elasticsearch/mlmodel_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/mlmodel_index_mapping.json
index e1af191addc..f0bee27220b 100644
--- a/openmetadata-service/src/main/resources/elasticsearch/mlmodel_index_mapping.json
+++ b/openmetadata-service/src/main/resources/elasticsearch/mlmodel_index_mapping.json
@@ -72,8 +72,13 @@
       "mlFeatures": {
         "properties": {
           "name": {
-            "type": "text",
-            "analyzer": "om_analyzer"
+            "type": "keyword",
+            "fields": {
+              "keyword": {
+                "type": "keyword",
+                "ignore_above": 256
+              }
+            }
           },
           "dataType": {
             "type": "text"
diff --git a/openmetadata-service/src/main/resources/elasticsearch/pipeline_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/pipeline_index_mapping.json
index edd98d622fe..049b0974dd0 100644
--- a/openmetadata-service/src/main/resources/elasticsearch/pipeline_index_mapping.json
+++ b/openmetadata-service/src/main/resources/elasticsearch/pipeline_index_mapping.json
@@ -72,8 +72,13 @@
       "tasks": {
         "properties": {
           "name": {
-            "type": "text",
-            "analyzer": "om_analyzer"
+            "type": "keyword",
+            "fields": {
+              "keyword": {
+                "type": "keyword",
+                "ignore_above": 256
+              }
+            }
           },
           "displayName": {
             "type": "text",
diff --git a/openmetadata-service/src/main/resources/elasticsearch/table_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/table_index_mapping.json
index a7eb6e734e0..e62eb672d8a 100644
--- a/openmetadata-service/src/main/resources/elasticsearch/table_index_mapping.json
+++ b/openmetadata-service/src/main/resources/elasticsearch/table_index_mapping.json
@@ -71,8 +71,13 @@
       "columns": {
         "properties": {
           "name": {
-            "type": "text",
-            "analyzer": "om_analyzer"
+            "type": "keyword",
+            "fields": {
+              "keyword": {
+                "type": "keyword",
+                "ignore_above": 256
+              }
+            }
           },
           "dataType": {
             "type": "text"