diff --git a/README.md b/README.md
index fe178b7..f8f51ba 100644
--- a/README.md
+++ b/README.md
@@ -91,7 +91,7 @@ Optionally, edit the `opensearch-analysis-vietnamese/pom.xml` to change the vers
 ...
 <groupId>org.opensearch</groupId>
 <artifactId>opensearch-analysis-vietnamese</artifactId>
-<version>1.3.2</version>
+<version>2.9.0</version>
 ...
  ```
 
@@ -104,13 +104,13 @@ mvn package
 ### Step 3: Installation the plugin on OpenSearch
 
 ```sh
-bin/opensearch-plugin install file://target/releases/opensearch-analysis-vietnamese-1.3.2.zip
+bin/opensearch-plugin install file://target/releases/opensearch-analysis-vietnamese-2.9.0.zip
 ```
 
 ## Compatible Versions
 | Vietnamese Analysis Plugin | OpenSearch |
 | -------------------------- |------------|
-| master                     | 1.3.2      |
+| master                     | 2.9.0      |
 
 ## Thanks to
 - [JetBrains](https://www.jetbrains.com) has provided a free license for [IntelliJ IDEA](https://www.jetbrains.com/idea).
diff --git a/pom.xml b/pom.xml
index fc94b1f..d56e511 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opensearch</groupId>
     <artifactId>opensearch-analysis-vietnamese</artifactId>
-    <version>1.3.2</version>
+    <version>2.9.0</version>
     <packaging>jar</packaging>
     <name>opensearch-analysis-vietnamese</name>
     <url>https://github.com/duydo/opensearch-analysis-vietnamese/</url>
diff --git a/src/test/java/org/opensearch/index/analysis/VietnameseAnalysisIntegrationTests.java b/src/test/java/org/opensearch/index/analysis/VietnameseAnalysisIntegrationTests.java
index d6d189d..290effc 100644
--- a/src/test/java/org/opensearch/index/analysis/VietnameseAnalysisIntegrationTests.java
+++ b/src/test/java/org/opensearch/index/analysis/VietnameseAnalysisIntegrationTests.java
@@ -5,7 +5,7 @@
 import org.opensearch.action.admin.cluster.node.info.PluginsAndModules;
 import org.opensearch.action.admin.indices.analyze.AnalyzeAction;
 import org.opensearch.action.search.SearchResponse;
-import org.opensearch.common.xcontent.XContentBuilder;
+import org.opensearch.core.xcontent.XContentBuilder;
 import org.opensearch.index.query.QueryBuilders;
 import org.opensearch.plugin.analysis.vi.AnalysisVietnamesePlugin;
 import org.opensearch.plugins.Plugin;
@@ -71,7 +71,7 @@ public void testVietnameseAnalyzerInMapping() throws ExecutionException, Interru
                         .endObject()
                     .endObject()
                 .endObject();
-        client().admin().indices().preparePutMapping("test").setType("_doc").setSource(mapping).get();
+        client().admin().indices().preparePutMapping("test").setSource(mapping).get();
         final XContentBuilder source = jsonBuilder()
                 .startObject()
                     .field("foo", "công nghệ thông tin Việt Nam")
diff --git a/src/test/java/org/opensearch/index/analysis/VietnameseAnalysisTests.java b/src/test/java/org/opensearch/index/analysis/VietnameseAnalysisTests.java
index 209c84c..50b60ff 100644
--- a/src/test/java/org/opensearch/index/analysis/VietnameseAnalysisTests.java
+++ b/src/test/java/org/opensearch/index/analysis/VietnameseAnalysisTests.java
@@ -15,7 +15,7 @@
 import java.io.IOException;
 import java.io.StringReader;
 
-import static org.apache.lucene.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;
+import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;