diff --git a/client/java-armeria-xds/src/main/java/com/linecorp/centraldogma/client/armeria/xds/XdsCentralDogmaBuilder.java b/client/java-armeria-xds/src/main/java/com/linecorp/centraldogma/client/armeria/xds/XdsCentralDogmaBuilder.java
index edb201422d..93b5c9d97d 100644
--- a/client/java-armeria-xds/src/main/java/com/linecorp/centraldogma/client/armeria/xds/XdsCentralDogmaBuilder.java
+++ b/client/java-armeria-xds/src/main/java/com/linecorp/centraldogma/client/armeria/xds/XdsCentralDogmaBuilder.java
@@ -198,8 +198,7 @@ XdsCentralDogmaBuilder xdsBoostrapFactory(Function<Bootstrap, XdsBootstrap> xdsB
      */
     public CentralDogma build() {
         final XdsBootstrap xdsBootstrap = xdsBootstrap();
-        final String listenerName = this.listenerName;
-        final EndpointGroup endpointGroup = XdsEndpointGroup.of(xdsBootstrap.listenerRoot(listenerName));
+        final EndpointGroup endpointGroup = XdsEndpointGroup.of(listenerName, xdsBootstrap);
         final String scheme = "none+" + (isUseTls() ? "https" : "http");
         final ClientBuilder builder =
                 newClientBuilder(scheme, endpointGroup, cb -> cb.decorator(DecodingClient.newDecorator()), "/");
diff --git a/dependencies.toml b/dependencies.toml
index 5c935fb416..6e98092a25 100644
--- a/dependencies.toml
+++ b/dependencies.toml
@@ -3,30 +3,34 @@
 #     If its classes are exposed in Javadoc, update offline links as well.
 #
 [versions]
-armeria = "1.29.4"
-assertj = "3.26.0"
-awaitility = "4.2.1"
+armeria = "1.30.0"
+assertj = "3.26.3"
+awaitility = "4.2.2"
 bouncycastle = "1.78.1"
+# Don"t upgrade Caffeine to 3.x that requires Java 11.
 caffeine = "2.9.3"
 checkstyle = "10.3.3"
 controlplane = "1.0.45"
-curator = "5.6.0"
+# Ensure that we use the same ZooKeeper version as what Curator depends on.
+# See: https://github.com/apache/curator/blob/master/pom.xml
+#      (Switch to the right tag to find out the right version.)
+curator = "5.7.0"
 # Do not upgrade cron-utils until there's another CVE or Armeria's SLF4J and Logback are upgraded.
 cron-utils = "9.2.0"
 diffutils = "1.3.0"
 docker = "9.4.0"
 download = "5.6.0"
-dropwizard-metrics = "4.2.21"
+dropwizard-metrics = "4.2.26"
 eddsa = "0.3.0"
 findbugs = "3.0.2"
 futures-completable = "0.3.6"
-grpc-java = "1.64.0"
+grpc-java = "1.66.0"
 guava = "33.2.1-jre"
 guava-failureaccess = "1.0.1"
 hamcrest-library = "2.2"
 hibernate-validator6 = "6.2.5.Final"
 hibernate-validator8 = "8.0.1.Final"
-jackson = "2.17.1"
+jackson = "2.17.2"
 javassist = "3.30.2-GA"
 javax-annotation = "1.3.2"
 javax-inject = "1"
@@ -35,20 +39,23 @@ jcommander = "1.82"
 jetty-alpn-api = "1.1.3.v20160715"
 jetty-alpn-agent = "2.0.10"
 jgit = "5.13.3.202401111512-r"
-jgit6 = "6.9.0.202403050737-r"
+jgit6 = "6.10.0.202406032230-r"
 junit4 = "4.13.2"
-junit5 = "5.10.2"
+junit5 = "5.11.0"
 jsch = "0.1.55"
+# Don't update `json-path` version
 json-path = "2.2.0"
+# 3.0.0 requires java 17
 json-unit = "2.38.0"
 jmh-core = "1.37"
 jmh-gradle-plugin = "0.7.2"
 jxr = "0.2.1"
 logback12 = { strictly = "1.2.13" }
-logback15 = { strictly = "1.5.5" }
+logback15 = { strictly = "1.5.7" }
 logback = "1.2.13"
-micrometer = "1.13.0"
-mina-sshd = "2.12.1"
+micrometer = "1.13.3"
+mina-sshd = "2.13.2"
+# Don't uprade mockito to 5.x.x that requires Java 11
 mockito = "4.11.0"
 nexus-publish-plugin = "2.0.0"
 node-gradle-plugin = "7.0.2"
@@ -59,19 +66,23 @@ protobuf-gradle-plugin = "0.8.19"
 quartz = "2.3.2"
 reflections = "0.9.11"
 shadow-gradle-plugin = "7.1.2"
+# Don't update `shiro` version
 shiro = "1.3.2"
 slf4j1 = { strictly = "1.7.36" }
-slf4j2 = { strictly = "2.0.12" }
+slf4j2 = { strictly = "2.0.16" }
 # Ensure that we use the same Snappy version as what Curator depends on.
 # See: https://github.com/apache/curator/blob/master/pom.xml
-snappy = "1.1.10.4"
+snappy = "1.1.10.5"
 sphinx = "2.10.1"
 spring-boot2 = "2.7.18"
-spring-boot3 = "3.3.0"
+spring-boot3 = "3.3.2"
 spring-test-junit5 = "1.5.0"
-testcontainers = "1.19.8"
+testcontainers = "1.20.1"
 thrift09 = { strictly = "0.9.3-1" }
-zookeeper = "3.7.2"
+# Ensure that we use the same ZooKeeper version as what Curator depends on.
+# See: https://github.com/apache/curator/blob/master/pom.xml
+#      (Switch to the right tag to find out the right version.)
+zookeeper = "3.9.1"
 
 [boms]
 armeria = { module = "com.linecorp.armeria:armeria-bom", version.ref = "armeria" }
@@ -113,7 +124,6 @@ version.ref = "bouncycastle"
 module = "org.bouncycastle:bcprov-jdk18on"
 version.ref = "bouncycastle"
 
-# Don"t upgrade Caffeine to 3.x that requires Java 11.
 [libraries.caffeine]
 module = "com.github.ben-manes.caffeine:caffeine"
 version.ref = "caffeine"
@@ -128,9 +138,6 @@ module = "com.cronutils:cron-utils"
 version.ref = "cron-utils"
 relocations = { from = "com.cronutils", to = "com.linecorp.centraldogma.internal.shaded.cronutils" }
 
-# Ensure that we use the same ZooKeeper version as what Curator depends on.
-# See: https://github.com/apache/curator/blob/master/pom.xml
-#      (Switch to the right tag to find out the right version.)
 [libraries.curator-recipes]
 module = "org.apache.curator:curator-recipes"
 version.ref = "curator"
@@ -186,7 +193,6 @@ relocations = { from = "com.google.common", to = "com.linecorp.centraldogma.inte
 module = "org.hamcrest:hamcrest-library"
 version.ref = "hamcrest-library"
 
-# Need to wait for spring boot 3 before upgrading to 7.x.x
 [libraries.hibernate-validator6]
 module = "org.hibernate.validator:hibernate-validator"
 version.ref = "hibernate-validator6"
@@ -258,13 +264,11 @@ version.ref = "jmh-core"
 module = "com.jcraft:jsch"
 version.ref = "jsch"
 
-# Don't update `json-path` version
 [libraries.json-path]
 module = "com.jayway.jsonpath:json-path"
 version.ref = "json-path"
 relocations = { from = "com.jayway.jsonpath", to = "com.linecorp.centraldogma.internal.shaded.jsonpath" }
 
-# 3.0.0 requires java 17
 [libraries.json-unit]
 module = "net.javacrumbs.json-unit:json-unit"
 version.ref = "json-unit"
@@ -295,11 +299,11 @@ module = "org.junit.platform:junit-platform-launcher"
 [libraries.logback12]
 module = "ch.qos.logback:logback-classic"
 version.ref = "logback12"
-javadocs = "https://www.javadoc.io/doc/ch.qos.logback/logback-classic/1.2.12/"
+javadocs = "https://www.javadoc.io/doc/ch.qos.logback/logback-classic/1.2.13/"
 [libraries.logback15]
 module = "ch.qos.logback:logback-classic"
 version.ref = "logback15"
-javadocs = "https://www.javadoc.io/doc/ch.qos.logback/logback-classic/1.5.4/"
+javadocs = "https://www.javadoc.io/doc/ch.qos.logback/logback-classic/1.5.7/"
 
 [libraries.controlplane-api]
 module = "io.envoyproxy.controlplane:api"
@@ -361,7 +365,6 @@ exclusions = [
 module = "gradle.plugin.com.github.johnrengelman:shadow"
 version.ref = "shadow-gradle-plugin"
 
-# Don't update `shiro` version
 [libraries.shiro-core]
 module = "org.apache.shiro:shiro-core"
 version.ref = "shiro"
@@ -439,9 +442,6 @@ version.ref = "testcontainers"
 module = "org.apache.thrift:libthrift"
 version.ref = "thrift09"
 
-# Ensure that we use the same ZooKeeper version as what Curator depends on.
-# See: https://github.com/apache/curator/blob/master/pom.xml
-#      (Switch to the right tag to find out the right version.)
 [libraries.zookeeper]
 module = "org.apache.zookeeper:zookeeper"
 version.ref = "zookeeper"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d64cd49177..e6441136f3 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e7646dead0..66cd5a0e49 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew.bat b/gradlew.bat
index 93e3f59f13..25da30dbde 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail