diff --git a/CHANGELOG.md b/CHANGELOG.md
index cfda975b2..9fc1187df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### Dependencies
 - Bump `io.github.classgraph:classgraph` from 4.8.180 to 4.8.184 ([#1703](https://github.com/opensearch-project/opensearch-java/pull/1703), [#1759](https://github.com/opensearch-project/opensearch-java/pull/1759))
 - Bump `org.junit:junit-bom` from 5.13.3 to 6.0.2 ([#1704](https://github.com/opensearch-project/opensearch-java/pull/1704), [#1746](https://github.com/opensearch-project/opensearch-java/pull/1746), [#1780](https://github.com/opensearch-project/opensearch-java/pull/1780), [#1856](https://github.com/opensearch-project/opensearch-java/pull/1856))
-- Bump `org.opensearch.gradle:build-tools` from 3.2.0-SNAPSHOT to 3.6.0-SNAPSHOT ([#1714](https://github.com/opensearch-project/opensearch-java/pull/1714), [#1756](https://github.com/opensearch-project/opensearch-java/pull/1756), [#1841](https://github.com/opensearch-project/opensearch-java/pull/1841), [#1868](https://github.com/opensearch-project/opensearch-java/pull/1868))
+- Bump `org.opensearch.gradle:build-tools` from 3.2.0-SNAPSHOT to 3.6.0-SNAPSHOT ([#1714](https://github.com/opensearch-project/opensearch-java/pull/1714), [#1756](https://github.com/opensearch-project/opensearch-java/pull/1756), [#1841](https://github.com/opensearch-project/opensearch-java/pull/1841), [#1868](https://github.com/opensearch-project/opensearch-java/pull/1868), [#1869](https://github.com/opensearch-project/opensearch-java/pull/1869))
 - Bump `org.ajoberstar.grgit:grgit-gradle` from 5.3.2 to 5.3.3 ([#1723](https://github.com/opensearch-project/opensearch-java/pull/1723))
 - Bump `org.apache.httpcomponents.core5:httpcore5` from 5.3.4 to 5.4 ([#1726](https://github.com/opensearch-project/opensearch-java/pull/1726), [#1733](https://github.com/opensearch-project/opensearch-java/pull/1733), [#1815](https://github.com/opensearch-project/opensearch-java/pull/1815))
 - Bump `org.owasp.dependencycheck` from 12.1.3 to 12.2.0 ([#1735](https://github.com/opensearch-project/opensearch-java/pull/1735), [#1742](https://github.com/opensearch-project/opensearch-java/pull/1742), [#1754](https://github.com/opensearch-project/opensearch-java/pull/1754), [#1765](https://github.com/opensearch-project/opensearch-java/pull/1765), [#1796](https://github.com/opensearch-project/opensearch-java/pull/1796), [#1854](https://github.com/opensearch-project/opensearch-java/pull/1854))
diff --git a/java-codegen/build.gradle.kts b/java-codegen/build.gradle.kts
index 4131569b7..01ba04a54 100644
--- a/java-codegen/build.gradle.kts
+++ b/java-codegen/build.gradle.kts
@@ -24,7 +24,7 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        "classpath"(group = "org.opensearch.gradle", name = "build-tools", version = "3.5.0-SNAPSHOT")
+        "classpath"(group = "org.opensearch.gradle", name = "build-tools", version = "3.6.0-SNAPSHOT")
     }
 }