diff --git a/graph/pkg/flagset/flagset.go b/graph/pkg/flagset/flagset.go
index 76f9d3644..9da2a1214 100644
--- a/graph/pkg/flagset/flagset.go
+++ b/graph/pkg/flagset/flagset.go
@@ -160,7 +160,7 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
 			Name:        "reva-gateway-addr",
 			Value:       flags.OverrideDefaultString(cfg.Reva.Address, "127.0.0.1:9142"),
 			Usage:       "REVA Gateway Endpoint",
-			EnvVars:     []string{"REVA_GATEWAY_ADDR"},
+			EnvVars:     []string{"GRAPH_REVA_GATEWAY_ADDR", "REVA_GATEWAY_ADDR"},
 			Destination: &cfg.Reva.Address,
 		},
 		&cli.StringFlag{
diff --git a/ocs/pkg/flagset/flagset.go b/ocs/pkg/flagset/flagset.go
index a7d4c594f..a56e45694 100644
--- a/ocs/pkg/flagset/flagset.go
+++ b/ocs/pkg/flagset/flagset.go
@@ -162,7 +162,7 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
 			Name:        "reva-gateway-addr",
 			Value:       flags.OverrideDefaultString(cfg.RevaAddress, "127.0.0.1:9142"),
 			Usage:       "REVA Gateway Endpoint",
-			EnvVars:     []string{"OCS_REVA_GATEWAY_ADDR"},
+			EnvVars:     []string{"OCS_REVA_GATEWAY_ADDR", "REVA_GATEWAY_ADDR"},
 			Destination: &cfg.RevaAddress,
 		},
 		&cli.StringFlag{
diff --git a/proxy/pkg/flagset/flagset.go b/proxy/pkg/flagset/flagset.go
index 88ceadd58..e45347055 100644
--- a/proxy/pkg/flagset/flagset.go
+++ b/proxy/pkg/flagset/flagset.go
@@ -186,7 +186,7 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
 			Name:        "reva-gateway-addr",
 			Value:       flags.OverrideDefaultString(cfg.Reva.Address, "127.0.0.1:9142"),
 			Usage:       "REVA Gateway Endpoint",
-			EnvVars:     []string{"PROXY_REVA_GATEWAY_ADDR"},
+			EnvVars:     []string{"PROXY_REVA_GATEWAY_ADDR", "REVA_GATEWAY_ADDR"},
 			Destination: &cfg.Reva.Address,
 		},
 		&cli.BoolFlag{
diff --git a/thumbnails/pkg/flagset/flagset.go b/thumbnails/pkg/flagset/flagset.go
index de61db3d9..6aab80d5a 100644
--- a/thumbnails/pkg/flagset/flagset.go
+++ b/thumbnails/pkg/flagset/flagset.go
@@ -146,7 +146,7 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
 			Name:        "reva-gateway-addr",
 			Value:       flags.OverrideDefaultString(cfg.Thumbnail.RevaGateway, "127.0.0.1:9142"),
 			Usage:       "Reva gateway address",
-			EnvVars:     []string{"THUMBNAILS_REVA_GATEWAY", "PROXY_REVA_GATEWAY_ADDR"},
+			EnvVars:     []string{"THUMBNAILS_REVA_GATEWAY", "PROXY_REVA_GATEWAY_ADDR", "REVA_GATEWAY_ADDR"},
 			Destination: &cfg.Thumbnail.RevaGateway,
 		},
 		&cli.BoolFlag{