diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d547566..17c6598 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,6 +14,8 @@ jobs:
     strategy:
       matrix:
         es-version:
+          - 'es:8.15.2'
+          - 'es:8.14.3'
           - 'es:8.13.4'
           - 'es:8.12.2'
           - 'es:8.11.4'
@@ -26,10 +28,13 @@ jobs:
           - 'es:8.4.3'
           - 'es:8.3.3'
           - 'es:8.2.3'
-          - 'es:7.17.21'
+          - 'es:7.17.24'
           - 'es:7.17.8'
           - 'es:7.14.2'
           - 'es:7.10.2'
+          - 'os:2.17.1'
+          - 'os:2.16.0'
+          - 'os:2.15.0'
           - 'os:2.14.0'
           - 'os:2.13.0'
           - 'os:2.12.0'
@@ -40,7 +45,7 @@ jobs:
           - 'os:2.7.0'
           - 'os:2.6.0'
     env:
-      mainJob: ${{ matrix.es-version == 'es:8.13.4' }}
+      mainJob: ${{ matrix.es-version == 'es:8.15.2' }}
     continue-on-error: true
 
     steps:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 149f8e3..7b50c86 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,6 +24,8 @@ jobs:
     strategy:
       matrix:
         es-version:
+          - 'es:8.15.2'
+          - 'es:8.14.3'
           - 'es:8.13.4'
           - 'es:8.12.2'
           - 'es:8.11.4'
@@ -36,10 +38,13 @@ jobs:
           - 'es:8.4.3'
           - 'es:8.3.3'
           - 'es:8.2.3'
-          - 'es:7.17.21'
+          - 'es:7.17.24'
           - 'es:7.17.8'
           - 'es:7.14.2'
           - 'es:7.10.2'
+          - 'os:2.17.1'
+          - 'os:2.16.0'
+          - 'os:2.15.0'
           - 'os:2.14.0'
           - 'os:2.13.0'
           - 'os:2.12.0'
@@ -50,7 +55,7 @@ jobs:
           - 'os:2.7.0'
           - 'os:2.6.0'
     env:
-      mainJob: ${{ matrix.es-version == 'es:8.13.4' }}
+      mainJob: ${{ matrix.es-version == 'es:8.15.2' }}
     steps:
     - uses: actions/checkout@v4
       with:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3db916..1d785cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+### Added
+
+- Sopport latest elasticsearch / opensearch
+  - es: 8.14.3, 8.15.2, 7.17.24
+  - os: 2.15.0, 2.16.0, 2.17.1
+
 ## [3.2.2] - 2024-07-02
 
 ### Fixed
diff --git a/gradle.properties b/gradle.properties
index 1f65ecd..96b2de6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,8 @@
-# elasticsearch versions: 8.13.4, 8.12.2, 8.11.4, 8.10.4, 8.9.2, 8.8.1, 8.6.2,
-#     8.5.3, 8.4.3, 8.2.3, 7.17.21, 7.14.2, 7.10.2
-# opensearch version: 2.14.0, 2.13.0, 2.12.0, 2.11.1, 2.10.0, 2.9.0, 2.8.0,
-#     2.7.0, 2.6.0
-engineVersion=es:8.13.4
+# elasticsearch versions: 8.15.2, 8.14.3, 8.13.4, 8.12.2, 8.11.4, 8.10.4, 8.9.2,
+#     8.8.1, 8.6.2, 8.5.3, 8.4.3, 8.2.3, 7.17.24, 7.14.2, 7.10.2
+# opensearch version: 2.17.1, 2.16.0, 2.15.0, 2.14.0, 2.13.0, 2.12.0, 2.11.1, 
+#     2.10.0, 2.9.0, 2.8.0, 2.7.0, 2.6.0
+engineVersion=es:8.15.2
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=350m \
   --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
   --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \