diff --git a/ocis-pkg/service/grpc/service.go b/ocis-pkg/service/grpc/service.go
index 522c91399c..7c2d5891c7 100644
--- a/ocis-pkg/service/grpc/service.go
+++ b/ocis-pkg/service/grpc/service.go
@@ -22,10 +22,14 @@ import (
 var DefaultClient = newGrpcClient()
 
 func newGrpcClient() mclient.Client {
+	addresses := strings.Split(os.Getenv("MICRO_REGISTRY_ADDRESS"), ",")
+
 	var r registry.Registry
 	switch os.Getenv("MICRO_REGISTRY") {
 	case "etcd":
-		r = etcdr.NewRegistry()
+		r = etcdr.NewRegistry(
+			registry.Addrs(addresses...),
+		)
 	default:
 		r = mdnsr.NewRegistry()
 	}