diff --git a/common/scala/build.gradle b/common/scala/build.gradle
index 135132c6775..bb0bca5466d 100644
--- a/common/scala/build.gradle
+++ b/common/scala/build.gradle
@@ -86,7 +86,7 @@ dependencies {
     api "io.kamon:kamon-datadog_${gradle.scala.depVersion}:2.1.12"
 
     // for etcd
-    api "com.ibm.etcd:etcd-java:0.0.13"
+    api "com.ibm.etcd:etcd-java:0.0.24"
 
     //tracing support
     api "io.opentracing:opentracing-api:0.31.0"
@@ -145,6 +145,51 @@ dependencies {
     api "io.netty:netty-transport-native-epoll:${gradle.netty.version}"
     api "io.netty:netty-transport-native-unix-common:${gradle.netty.version}"
     api "com.lightbend.akka.grpc:akka-grpc-runtime_${gradle.scala.depVersion}:${gradle.akka_gprc.version}"
+    constraints {
+        api("com.lightbend.akka.grpc:akka-grpc-runtime_${gradle.scala.depVersion}:${gradle.akka_gprc.version}")
+        api("io.grpc:grpc-api:${gradle.grpc.version}") {
+            version {
+                strictly gradle.grpc.version
+            }
+            because "Akka gRPC runtime 1.0.2 requires gRPC 1.32.1"
+        }
+        api("io.grpc:grpc-core:${gradle.grpc.version}") {
+            version {
+                strictly gradle.grpc.version
+            }
+            because "Akka gRPC runtime 1.0.2 requires gRPC 1.32.1"
+        }
+        api("io.grpc:grpc-netty:${gradle.grpc.version}") {
+            version {
+                strictly gradle.grpc.version
+            }
+            because "Akka gRPC runtime 1.0.2 requires gRPC 1.32.1"
+        }
+        api("io.grpc:grpc-netty-shaded:${gradle.grpc.version}") {
+            version {
+                strictly gradle.grpc.version
+            }
+            because "Akka gRPC runtime 1.0.2 requires gRPC 1.32.1"
+        }
+        api("io.grpc:grpc-stub:${gradle.grpc.version}") {
+            version {
+                strictly gradle.grpc.version
+            }
+            because "Akka gRPC runtime 1.0.2 requires gRPC 1.32.1"
+        }
+        api("io.grpc:grpc-protobuf:${gradle.grpc.version}") {
+            version {
+                strictly gradle.grpc.version
+            }
+            because "Akka gRPC runtime 1.0.2 requires gRPC 1.32.1"
+        }
+        api("io.grpc:grpc-protobuf-lite:${gradle.grpc.version}") {
+            version {
+                strictly gradle.grpc.version
+            }
+            because "Akka gRPC runtime 1.0.2 requires gRPC 1.32.1"
+        }
+    }
     api "com.typesafe.akka:akka-stream_${gradle.scala.depVersion}:${gradle.akka.version}"
 
     // Constraints for transitive dependencies to address security vulnerabilities
diff --git a/settings.gradle b/settings.gradle
index 01525f4df50..7c882d1f71d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -104,6 +104,8 @@ gradle.ext.akka_http = [version : '10.2.7']
 gradle.ext.akka_management = [version : '1.0.10']
 gradle.ext.akka_gprc = [version : '1.0.2']
 
+gradle.ext.grpc = [version : '1.32.1']
+
 gradle.ext.curator = [version : '4.3.0']
 gradle.ext.kube_client = [version: '4.10.3']