diff --git a/components/common-go/baseserver/server.go b/components/common-go/baseserver/server.go
index 1061e813916660..69ddeec2520f59 100644
--- a/components/common-go/baseserver/server.go
+++ b/components/common-go/baseserver/server.go
@@ -347,13 +347,13 @@ type builtinServices struct {
 func newBuiltinServices(server *Server) *builtinServices {
 	healthAddr := fmt.Sprintf(":%d", BuiltinHealthPort)
 	if server.options.underTest {
-		healthAddr = "localhost:0"
+		healthAddr = ":0"
 	}
 
 	return &builtinServices{
 		underTest: server.options.underTest,
 		Debug: &http.Server{
-			Addr:    fmt.Sprintf("localhost:%d", BuiltinDebugPort),
+			Addr:    fmt.Sprintf(":%d", BuiltinDebugPort),
 			Handler: pprof.Handler(),
 		},
 		Health: &http.Server{
@@ -361,7 +361,7 @@ func newBuiltinServices(server *Server) *builtinServices {
 			Handler: server.healthEndpoint(),
 		},
 		Metrics: &http.Server{
-			Addr:    fmt.Sprintf("localhost:%d", BuiltinMetricsPort),
+			Addr:    fmt.Sprintf(":%d", BuiltinMetricsPort),
 			Handler: server.metricsEndpoint(),
 		},
 	}
diff --git a/components/public-api-server/pkg/server/server.go b/components/public-api-server/pkg/server/server.go
index 89d6a8de71ad1a..808f3339f5a390 100644
--- a/components/public-api-server/pkg/server/server.go
+++ b/components/public-api-server/pkg/server/server.go
@@ -20,7 +20,7 @@ func Start(logger *logrus.Entry, cfg Config) error {
 
 	srv, err := baseserver.New("public_api_server",
 		baseserver.WithLogger(logger),
-		baseserver.WithGRPC(&baseserver.ServerConfiguration{Address: fmt.Sprintf("localhost:%d", cfg.GRPCPort)}),
+		baseserver.WithGRPC(&baseserver.ServerConfiguration{Address: fmt.Sprintf(":%d", cfg.GRPCPort)}),
 		baseserver.WithMetricsRegistry(registry),
 	)
 	if err != nil {