diff --git a/storage/pkg/flagset/drivereos.go b/storage/pkg/flagset/drivereos.go
index df6eeeaf5..dee7c2301 100644
--- a/storage/pkg/flagset/drivereos.go
+++ b/storage/pkg/flagset/drivereos.go
@@ -125,7 +125,7 @@ func DriverEOSWithConfig(cfg *config.Config) []cli.Flag {
 			Destination: &cfg.Reva.Storages.EOS.UserLayout,
 		},
 		&cli.StringFlag{
-			Name:        "reva-gateway-addr",
+			Name:        "storage-eos-reva-gateway-addr",
 			Value:       flags.OverrideDefaultString(cfg.Reva.Storages.EOS.GatewaySVC, "127.0.0.1:9142"),
 			Usage:       "Address of REVA gateway endpoint",
 			EnvVars:     []string{"REVA_GATEWAY_ADDR"},
diff --git a/storage/pkg/flagset/gateway.go b/storage/pkg/flagset/gateway.go
index 9ccfa7d5a..f99eb082f 100644
--- a/storage/pkg/flagset/gateway.go
+++ b/storage/pkg/flagset/gateway.go
@@ -47,10 +47,10 @@ func GatewayWithConfig(cfg *config.Config) []cli.Flag {
 			Destination: &cfg.Reva.Gateway.GRPCNetwork,
 		},
 		&cli.StringFlag{
-			Name:        "reva-gateway-bind-addr",
+			Name:        "addr",
 			Value:       flags.OverrideDefaultString(cfg.Reva.Gateway.GRPCAddr, "0.0.0.0:9142"),
 			Usage:       "Address to bind REVA service",
-			EnvVars:     []string{"REVA_GATEWAY_BIND_ADDR"},
+			EnvVars:     []string{"STORAGE_GATEWAY_GRPC_ADDR"},
 			Destination: &cfg.Reva.Gateway.GRPCAddr,
 		},
 		&cli.StringFlag{