diff --git a/pkg/flagset/storagehomedata.go b/pkg/flagset/storagehomedata.go
index d36267ca8d..569f428be5 100644
--- a/pkg/flagset/storagehomedata.go
+++ b/pkg/flagset/storagehomedata.go
@@ -256,5 +256,15 @@ func StorageHomeDataWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVar:      "REVA_STORAGE_OWNCLOUD_DATADIR",
 			Destination: &cfg.Reva.Storages.OwnCloud.Datadirectory,
 		},
+
+		// Gateway
+
+		&cli.StringFlag{
+			Name:        "gateway-url",
+			Value:       "localhost:9142",
+			Usage:       "URL to use for the reva gateway service",
+			EnvVar:      "REVA_GATEWAY_URL",
+			Destination: &cfg.Reva.Gateway.URL,
+		},
 	}
 }
diff --git a/pkg/flagset/storageoc.go b/pkg/flagset/storageoc.go
index 85112f6fa0..2bf4303dba 100644
--- a/pkg/flagset/storageoc.go
+++ b/pkg/flagset/storageoc.go
@@ -167,7 +167,7 @@ func StorageOCWithConfig(cfg *config.Config) []cli.Flag {
 		},
 		&cli.StringFlag{
 			Name:        "data-server-url",
-			Value:       "",
+			Value:       "http://localhost:9164/data",
 			Usage:       "data server url",
 			EnvVar:      "REVA_STORAGE_OC_DATA_SERVER_URL",
 			Destination: &cfg.Reva.StorageOC.DataServerURL,
diff --git a/pkg/flagset/storageocdata.go b/pkg/flagset/storageocdata.go
index 8046303699..8d0244d517 100644
--- a/pkg/flagset/storageocdata.go
+++ b/pkg/flagset/storageocdata.go
@@ -256,5 +256,15 @@ func StorageOCDataWithConfig(cfg *config.Config) []cli.Flag {
 			EnvVar:      "REVA_STORAGE_OWNCLOUD_DATADIR",
 			Destination: &cfg.Reva.Storages.OwnCloud.Datadirectory,
 		},
+
+		// Gateway
+
+		&cli.StringFlag{
+			Name:        "gateway-url",
+			Value:       "localhost:9142",
+			Usage:       "URL to use for the reva gateway service",
+			EnvVar:      "REVA_GATEWAY_URL",
+			Destination: &cfg.Reva.Gateway.URL,
+		},
 	}
 }