diff --git a/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/EtcdClientUtils.java b/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/EtcdClientUtils.java
similarity index 97%
rename from metadata-drivers/etcd/src/main/java/io/etcd/jetcd/EtcdClientUtils.java
rename to metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/EtcdClientUtils.java
index f696e19cc3f..4c74cc9c4f1 100644
--- a/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/EtcdClientUtils.java
+++ b/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/EtcdClientUtils.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package io.etcd.jetcd;
+package io.etcd.jetcd.impl;
 
 import java.lang.reflect.Field;
 
diff --git a/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/EtcdConnectionManager.java b/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/EtcdConnectionManager.java
similarity index 97%
rename from metadata-drivers/etcd/src/main/java/io/etcd/jetcd/EtcdConnectionManager.java
rename to metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/EtcdConnectionManager.java
index 52b5199f430..db090135c90 100644
--- a/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/EtcdConnectionManager.java
+++ b/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/EtcdConnectionManager.java
@@ -16,8 +16,9 @@
  * limitations under the License.
  */
 
-package io.etcd.jetcd;
+package io.etcd.jetcd.impl;
 
+import io.etcd.jetcd.Client;
 import io.etcd.jetcd.api.WatchGrpc;
 import lombok.extern.slf4j.Slf4j;
 
diff --git a/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/package-info.java b/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/package-info.java
similarity index 96%
rename from metadata-drivers/etcd/src/main/java/io/etcd/jetcd/package-info.java
rename to metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/package-info.java
index 77ce69ff430..7cc4a43579a 100644
--- a/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/package-info.java
+++ b/metadata-drivers/etcd/src/main/java/io/etcd/jetcd/impl/package-info.java
@@ -19,4 +19,4 @@
 /**
  * Etcd client changes for bookkeeper metadata driver.
  */
-package io.etcd.jetcd;
\ No newline at end of file
+package io.etcd.jetcd.impl;
diff --git a/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdWatchClient.java b/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdWatchClient.java
index fcb72126e24..6a046ba4e2f 100644
--- a/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdWatchClient.java
+++ b/metadata-drivers/etcd/src/main/java/org/apache/bookkeeper/metadata/etcd/EtcdWatchClient.java
@@ -27,7 +27,6 @@
 import com.google.protobuf.UnsafeByteOperations;
 import io.etcd.jetcd.ByteSequence;
 import io.etcd.jetcd.Client;
-import io.etcd.jetcd.EtcdConnectionManager;
 import io.etcd.jetcd.api.WatchCancelRequest;
 import io.etcd.jetcd.api.WatchCreateRequest;
 import io.etcd.jetcd.api.WatchGrpc;
@@ -36,6 +35,7 @@
 import io.etcd.jetcd.common.exception.ErrorCode;
 import io.etcd.jetcd.common.exception.EtcdException;
 import io.etcd.jetcd.common.exception.EtcdExceptionFactory;
+import io.etcd.jetcd.impl.EtcdConnectionManager;
 import io.etcd.jetcd.options.WatchOption;
 import io.etcd.jetcd.watch.WatchResponseWithError;
 import io.grpc.Status;
diff --git a/pom.xml b/pom.xml
index bd757ad70b4..dbec6f467a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +129,7 @@
     <bouncycastle.version>1.0.2.4</bouncycastle.version>
     <curator.version>5.1.0</curator.version>
     <dropwizard.version>4.1.12.1</dropwizard.version>
-    <etcd.version>0.5.11</etcd.version>
+    <etcd.version>0.7.7</etcd.version>
     <freebuilder.version>2.8.0</freebuilder.version>
     <google.code.version>3.0.2</google.code.version>
     <google.errorprone.version>2.9.0</google.errorprone.version>