diff --git a/pkg/flagset/storageeos.go b/pkg/flagset/storageeos.go
index 450765bc5d..e30283254a 100644
--- a/pkg/flagset/storageeos.go
+++ b/pkg/flagset/storageeos.go
@@ -146,7 +146,7 @@ func StorageEOSWithConfig(cfg *config.Config) []cli.Flag {
 		},
 		&cli.BoolFlag{
 			Name:        "expose-data-server",
-			Value:       true,
+			Value:       false,
 			Usage:       "exposes a dedicated data server",
 			EnvVars:     []string{"REVA_STORAGE_EOS_EXPOSE_DATA_SERVER"},
 			Destination: &cfg.Reva.StorageEOS.ExposeDataServer,
diff --git a/pkg/flagset/storagehome.go b/pkg/flagset/storagehome.go
index aa84c76084..4c5cc8d506 100644
--- a/pkg/flagset/storagehome.go
+++ b/pkg/flagset/storagehome.go
@@ -148,7 +148,7 @@ func StorageHomeWithConfig(cfg *config.Config) []cli.Flag {
 		},
 		&cli.BoolFlag{
 			Name:        "expose-data-server",
-			Value:       true,
+			Value:       false,
 			Usage:       "exposes a dedicated data server",
 			EnvVars:     []string{"REVA_STORAGE_HOME_EXPOSE_DATA_SERVER"},
 			Destination: &cfg.Reva.StorageHome.ExposeDataServer,
diff --git a/pkg/flagset/storageoc.go b/pkg/flagset/storageoc.go
index 5e45273e68..62d58bccbe 100644
--- a/pkg/flagset/storageoc.go
+++ b/pkg/flagset/storageoc.go
@@ -146,7 +146,7 @@ func StorageOCWithConfig(cfg *config.Config) []cli.Flag {
 		},
 		&cli.BoolFlag{
 			Name:        "expose-data-server",
-			Value:       true,
+			Value:       false,
 			Usage:       "exposes a dedicated data server",
 			EnvVars:     []string{"REVA_STORAGE_OC_EXPOSE_DATA_SERVER"},
 			Destination: &cfg.Reva.StorageOC.ExposeDataServer,