diff --git a/storage/pkg/flagset/frontend.go b/storage/pkg/flagset/frontend.go
index cddbc5e5d..4fcfe18f2 100644
--- a/storage/pkg/flagset/frontend.go
+++ b/storage/pkg/flagset/frontend.go
@@ -66,6 +66,9 @@ func FrontendWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVars:     []string{"STORAGE_FRONTEND_HTTP_ADDR"},
 			Destination: &cfg.Reva.Frontend.HTTPAddr,
 		},
+		// please note that STORAGE_FRONTEND_PUBLIC_URL is also defined in
+		// storage/pkg/flagset/gateway.go because this setting may be consumed
+		// by both the gateway and frontend service
 		&cli.StringFlag{
 			Name:        "public-url",
 			Value:       "https://localhost:9200",
diff --git a/storage/pkg/flagset/gateway.go b/storage/pkg/flagset/gateway.go
index 7180e7af6..0411f1404 100644
--- a/storage/pkg/flagset/gateway.go
+++ b/storage/pkg/flagset/gateway.go
@@ -139,6 +139,9 @@ func GatewayWithConfig(cfg *config.Config) []cli.Flag {
 			Destination: &cfg.Reva.StorageRegistry.HomeProvider,
 		},
 
+		// please note that STORAGE_FRONTEND_PUBLIC_URL is also defined in
+		// storage/pkg/flagset/frontend.go because this setting may be consumed
+		// by both the gateway and frontend service
 		&cli.StringFlag{
 			Name:        "public-url",
 			Value:       "https://localhost:9200",