diff --git a/Dockerfile.corteza-server b/Dockerfile.corteza-server
index 31f801266..51cd0c2f9 100644
--- a/Dockerfile.corteza-server
+++ b/Dockerfile.corteza-server
@@ -19,6 +19,8 @@ ENV COMPOSE_STORAGE_PATH   /data/compose
 ENV MESSAGING_STORAGE_PATH /data/messaging
 ENV SYSTEM_STORAGE_PATH    /data/system
 
+ENV CORREDOR_ADDR corredor:80
+
 VOLUME /data
 
 EXPOSE 80
diff --git a/Dockerfile.corteza-server-compose b/Dockerfile.corteza-server-compose
index 0b867ce97..6b5a1cc4e 100644
--- a/Dockerfile.corteza-server-compose
+++ b/Dockerfile.corteza-server-compose
@@ -16,6 +16,7 @@ RUN apk add --no-cache ca-certificates
 COPY --from=builder /tmp/corteza-server-compose /bin
 
 ENV COMPOSE_STORAGE_PATH /data/compose
+ENV CORREDOR_ADDR corredor:80
 
 VOLUME /data
 
diff --git a/Dockerfile.corteza-server-messaging b/Dockerfile.corteza-server-messaging
index 454d51c35..b5136b2b3 100644
--- a/Dockerfile.corteza-server-messaging
+++ b/Dockerfile.corteza-server-messaging
@@ -16,6 +16,7 @@ RUN apk add --no-cache ca-certificates
 COPY --from=builder /tmp/corteza-server-messaging /bin
 
 ENV MESSAGING_STORAGE_PATH /data/messaging
+ENV CORREDOR_ADDR corredor:80
 
 VOLUME /data
 
diff --git a/Dockerfile.corteza-server-system b/Dockerfile.corteza-server-system
index 334be40fb..c0770fda9 100644
--- a/Dockerfile.corteza-server-system
+++ b/Dockerfile.corteza-server-system
@@ -16,6 +16,7 @@ RUN apk add --no-cache ca-certificates
 COPY --from=builder /tmp/corteza-server-system /bin
 
 ENV SYSTEM_STORAGE_PATH /data/system
+ENV CORREDOR_ADDR corredor:80
 
 VOLUME /data
 
diff --git a/pkg/app/options/corredor.go b/pkg/app/options/corredor.go
index 40067d953..61bf4721d 100644
--- a/pkg/app/options/corredor.go
+++ b/pkg/app/options/corredor.go
@@ -37,14 +37,14 @@ func Corredor() (o *CorredorOpt) {
 	o = &CorredorOpt{
 		Enabled:            true,
 		RunAsEnabled:       true,
-		Addr:               "corredor:80",
+		Addr:               "localhost:50051",
 		MaxBackoffDelay:    time.Minute,
 		DefaultExecTimeout: time.Minute,
 		ListTimeout:        time.Second * 2,
 		Log:                false,
 
 		TlsCertEnabled: true,
-		TlsCertPath:    "/corredor-certificates",
+		TlsCertPath:    "/certs/corredor/client",
 		TlsCertCA:      "ca.crt",
 		TlsCertPublic:  "public.crt",
 		TlsCertPrivate: "private.key",