diff --git a/engine/api/api.go b/engine/api/api.go
index 13ec342204..aa72f7ed48 100644
--- a/engine/api/api.go
+++ b/engine/api/api.go
@@ -46,12 +46,13 @@ type Configuration struct {
 		UI  string `toml:"ui" default:"http://localhost:2015"`
 	} `toml:"url" comment:"#####################\n CDS URLs Settings \n####################"`
 	HTTP struct {
-		Addr       string `toml:"addr" default:"" commented:"true" comment:"Listen address without port, example: 127.0.0.1"`
+		Addr       string `toml:"addr" default:"" commented:"true" comment:"Listen HTTP address without port, example: 127.0.0.1"`
 		Port       int    `toml:"port" default:"8081"`
 		SessionTTL int    `toml:"sessionTTL" default:"60"`
 	} `toml:"http"`
 	GRPC struct {
-		Port int `toml:"port" default:"8082"`
+		Addr string `toml:"addr" default:"" commented:"true" comment:"Listen GRPC address without port, example: 127.0.0.1"`
+		Port int    `toml:"port" default:"8082"`
 	} `toml:"grpc"`
 	Secrets struct {
 		Key string `toml:"key"`
@@ -549,12 +550,12 @@ func (a *API) Serve(ctx context.Context) error {
 
 	go func() {
 		//TLS is disabled for the moment. We need to serve TLS on HTTP too
-		if err := grpcInit(a.DBConnectionFactory, a.Config.GRPC.Port, false, "", ""); err != nil {
+		if err := grpcInit(a.DBConnectionFactory, a.Config.GRPC.Addr, a.Config.GRPC.Port, false, "", ""); err != nil {
 			log.Error("Cannot start GRPC server: %v", err)
 		}
 	}()
 
-	log.Info("Starting CDS API HTTP Server on port %d", a.Config.HTTP.Port)
+	log.Info("Starting CDS API HTTP Server on %s:%d", a.Config.HTTP.Addr, a.Config.HTTP.Port)
 	if err := s.ListenAndServe(); err != nil {
 		return fmt.Errorf("Cannot start HTTP server: %v", err)
 	}
diff --git a/engine/api/grpc_server.go b/engine/api/grpc_server.go
index b87fb81add..b33b47cbf7 100644
--- a/engine/api/grpc_server.go
+++ b/engine/api/grpc_server.go
@@ -17,13 +17,13 @@ import (
 )
 
 // grpcInit initialize all GRPC services
-func grpcInit(dbConnectionFactory *database.DBConnectionFactory, port int, tls bool, certFile, keyFile string) error {
-	lis, err := net.Listen("tcp", fmt.Sprintf(":%d", port))
+func grpcInit(dbConnectionFactory *database.DBConnectionFactory, addr string, port int, tls bool, certFile, keyFile string) error {
+	lis, err := net.Listen("tcp", fmt.Sprintf("%s:%d", addr, port))
 	if err != nil {
 		return err
 	}
 
-	log.Info("Starting GRPC services on port %d", port)
+	log.Info("Starting GRPC services on %s:%d", addr, port)
 
 	grpcHandlers := &grpcHandlers{
 		dbConnectionFactory: dbConnectionFactory,