diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchClient.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchClient.java
index f24d68fe3ae..d52260f5b16 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchClient.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchClient.java
@@ -21,6 +21,7 @@ import static org.openmetadata.service.search.EntityBuilderConstant.SCHEMA_FIELD
 import static org.openmetadata.service.search.EntityBuilderConstant.UNIFIED;
 import static org.openmetadata.service.search.UpdateSearchEventsConstant.SENDING_REQUEST_TO_ELASTIC_SEARCH;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import es.org.elasticsearch.action.ActionListener;
 import es.org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
 import es.org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
@@ -232,7 +233,8 @@ public class ElasticSearchClient implements SearchClient {
   public void updateIndex(IndexMapping indexMapping, String indexMappingContent) {
     try {
       PutMappingRequest request = new PutMappingRequest(indexMapping.getIndexName());
-      request.source(indexMappingContent, XContentType.JSON);
+      JsonNode readProperties = JsonUtils.readTree(indexMappingContent).get("mappings");
+      request.source(JsonUtils.getMap(readProperties));
       AcknowledgedResponse putMappingResponse = client.indices().putMapping(request, RequestOptions.DEFAULT);
       LOG.debug("{} Updated {}", indexMapping.getIndexMappingFile(), putMappingResponse.isAcknowledged());
     } catch (Exception e) {
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchClient.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchClient.java
index 8d27536f97f..c439ffa1e0d 100644
--- a/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchClient.java
+++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchClient.java
@@ -21,6 +21,7 @@ import static org.openmetadata.service.search.EntityBuilderConstant.SCHEMA_FIELD
 import static org.openmetadata.service.search.EntityBuilderConstant.UNIFIED;
 import static org.openmetadata.service.search.UpdateSearchEventsConstant.SENDING_REQUEST_TO_ELASTIC_SEARCH;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import java.io.IOException;
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -225,7 +226,8 @@ public class OpenSearchClient implements SearchClient {
   public void updateIndex(IndexMapping indexMapping, String indexMappingContent) {
     try {
       PutMappingRequest request = new PutMappingRequest(indexMapping.getIndexName());
-      request.source(indexMappingContent, XContentType.JSON);
+      JsonNode readProperties = JsonUtils.readTree(indexMappingContent).get("mappings");
+      request.source(JsonUtils.getMap(readProperties));
       AcknowledgedResponse putMappingResponse = client.indices().putMapping(request, RequestOptions.DEFAULT);
       LOG.debug("{} Updated {}", indexMapping.getIndexMappingFile(), putMappingResponse.isAcknowledged());
     } catch (Exception e) {
diff --git a/openmetadata-shaded-deps/elasticsearch-dep/src/main/java/elasticsearch/ElasticSearchNoop.java b/openmetadata-shaded-deps/elasticsearch-dep/src/main/java/elasticsearch/ElasticSearchNoop.java
index 273ede34a14..a94138835a8 100644
--- a/openmetadata-shaded-deps/elasticsearch-dep/src/main/java/elasticsearch/ElasticSearchNoop.java
+++ b/openmetadata-shaded-deps/elasticsearch-dep/src/main/java/elasticsearch/ElasticSearchNoop.java
@@ -1,4 +1,3 @@
 package elasticsearch;
 
-public class ElasticSearchNoop {
-}
+public class ElasticSearchNoop {}
diff --git a/openmetadata-shaded-deps/opensearch-dep/src/main/java/opensearch/OpenSearchNoop.java b/openmetadata-shaded-deps/opensearch-dep/src/main/java/opensearch/OpenSearchNoop.java
index dfcf0f6b778..d7b78146158 100644
--- a/openmetadata-shaded-deps/opensearch-dep/src/main/java/opensearch/OpenSearchNoop.java
+++ b/openmetadata-shaded-deps/opensearch-dep/src/main/java/opensearch/OpenSearchNoop.java
@@ -1,4 +1,3 @@
 package opensearch;
 
-public class OpenSearchNoop {
-}
+public class OpenSearchNoop {}