diff --git a/ocis-reva/pkg/flagset/storagemetadata.go b/ocis-reva/pkg/flagset/storagemetadata.go
index 0f817e734..bc891c91f 100644
--- a/ocis-reva/pkg/flagset/storagemetadata.go
+++ b/ocis-reva/pkg/flagset/storagemetadata.go
@@ -3,6 +3,7 @@ package flagset
 import (
 	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-reva/pkg/config"
+	"path"
 )
 
 // StorageMetadata applies cfg to the root flagset
@@ -67,6 +68,12 @@ func StorageMetadata(cfg *config.Config) []cli.Flag {
 	flags = append(flags, DriverOwnCloudWithConfig(cfg)...)
 	flags = append(flags, DriverOCISWithConfig(cfg)...)
 
+	// Metadata storage needs its own root
+	cfg.Reva.Storages.Common.Root = path.Join(cfg.Reva.Storages.Common.Root, "metadata")
+	cfg.Reva.Storages.OwnCloud.Root = path.Join(cfg.Reva.Storages.OwnCloud.Root, "metadata")
+	cfg.Reva.Storages.EOS.Root = path.Join(cfg.Reva.Storages.EOS.Root, "metadata")
+	cfg.Reva.Storages.Local.Root = path.Join(cfg.Reva.Storages.Local.Root, "metadata")
+
 	return flags
 
 }