diff --git a/docs/configuration.md b/docs/configuration.md
index f5fb58a..cf2d29e 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -1,6 +1,6 @@
 ---
 title: "Configuration"
-date: "2020-04-15T16:26:55+0200"
+date: "2020-06-05T14:07:06+0200"
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis-reva
 geekdocEditPath: edit/master/docs
@@ -57,11 +57,11 @@ Usage: `ocis-reva [global options] command [command options] [arguments...]`
 
 ## Sub Commands
 
-### ocis-reva gateway
+### ocis-reva sharing
 
-Start reva gateway
+Start reva sharing service
 
-Usage: `ocis-reva gateway [command options] [arguments...]`
+Usage: `ocis-reva sharing [command options] [arguments...]`
 
 --tracing-enabled | $REVA_TRACING_ENABLED  
 : Enable sending traces.
@@ -78,8 +78,8 @@ Usage: `ocis-reva gateway [command options] [arguments...]`
 --tracing-service | $REVA_TRACING_SERVICE  
 : Service name for tracing. Default: `reva`.
 
---debug-addr | $REVA_GATEWAY_DEBUG_ADDR  
-: Address to bind debug server. Default: `0.0.0.0:9143`.
+--debug-addr | $REVA_SHARING_DEBUG_ADDR  
+: Address to bind debug server. Default: `0.0.0.0:9151`.
 
 --debug-token | $REVA_DEBUG_TOKEN  
 : Token to grant metrics access.
@@ -93,89 +93,32 @@ Usage: `ocis-reva gateway [command options] [arguments...]`
 --jwt-secret | $REVA_JWT_SECRET  
 : Shared jwt secret for reva service communication. Default: `Pive-Fumkiu4`.
 
---transfer-secret | $REVA_TRANSFER_SECRET  
-: Transfer secret for datagateway. Default: `replace-me-with-a-transfer-secret`.
-
---network | $REVA_GATEWAY_NETWORK  
+--network | $REVA_SHARING_NETWORK  
 : Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
 
---protocol | $REVA_GATEWAY_PROTOCOL  
+--protocol | $REVA_SHARING_PROTOCOL  
 : protocol for reva service, can be 'http' or 'grpc'. Default: `grpc`.
 
---addr | $REVA_GATEWAY_ADDR  
-: Address to bind reva service. Default: `0.0.0.0:9142`.
-
---url | $REVA_GATEWAY_URL  
-: URL to use for the reva service. Default: `localhost:9142`.
-
---commit-share-to-storage-grant | $REVA_GATEWAY_COMMIT_SHARE_TO_STORAGE_GRANT  
-: Commit shares to the share manager. Default: `true`.
-
---commit-share-to-storage-ref | $REVA_GATEWAY_COMMIT_SHARE_TO_STORAGE_REF  
-: Commit shares to the storage. Default: `true`.
-
---share-folder | $REVA_GATEWAY_SHARE_FOLDER  
-: mount shares in this folder of the home storage provider. Default: `Shares`.
-
---disable-home-creation-on-login | $REVA_GATEWAY_DISABLE_HOME_CREATION_ON_LOGIN  
-: Disable creation of home folder on login.
-
---storage-home-provider | $REVA_STORAGE_HOME_PROVIDER  
-: mount point of the storage provider for user homes in the global namespace. Default: `/home`.
-
---frontend-url | $REVA_FRONTEND_URL  
-: URL to use for the reva service. Default: `localhost:9140`.
-
---users-url | $REVA_USERS_URL  
-: URL to use for the reva service. Default: `localhost:9144`.
-
---auth-basic-url | $REVA_AUTH_BASIC_URL  
-: URL to use for the reva service. Default: `localhost:9146`.
-
---auth-bearer-url | $REVA_AUTH_BEARER_URL  
-: URL to use for the reva service. Default: `localhost:9148`.
+--addr | $REVA_SHARING_ADDR  
+: Address to bind reva service. Default: `0.0.0.0:9150`.
 
---sharing-url | $REVA_SHARING_URL  
+--url | $REVA_SHARING_URL  
 : URL to use for the reva service. Default: `localhost:9150`.
 
---storage-root-url | $REVA_STORAGE_ROOT_URL  
-: URL to use for the reva service. Default: `localhost:9152`.
-
---storage-root-mount-path | $REVA_STORAGE_ROOT_MOUNT_PATH  
-: mount path. Default: `/`.
-
---storage-root-mount-id | $REVA_STORAGE_ROOT_MOUNT_ID  
-: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009152`.
-
---storage-home-url | $REVA_STORAGE_HOME_URL  
-: URL to use for the reva service. Default: `localhost:9154`.
-
---storage-home-mount-path | $REVA_STORAGE_HOME_MOUNT_PATH  
-: mount path. Default: `/home`.
-
---storage-eos-url | $REVA_STORAGE_EOS_URL  
-: URL to use for the reva service. Default: `localhost:9158`.
-
---storage-eos-mount-path | $REVA_STORAGE_EOS_MOUNT_PATH  
-: mount path. Default: `/eos`.
-
---storage-eos-mount-id | $REVA_STORAGE_EOS_MOUNT_ID  
-: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009158`.
-
---storage-oc-url | $REVA_STORAGE_OC_URL  
-: URL to use for the reva service. Default: `localhost:9162`.
+--user-driver | $REVA_SHARING_USER_DRIVER  
+: driver to use for the UserShareProvider. Default: `json`.
 
---storage-oc-mount-path | $REVA_STORAGE_OC_MOUNT_PATH  
-: mount path. Default: `/oc`.
+--user-json-file | $REVA_SHARING_USER_JSON_FILE  
+: file used to persist shares for the UserShareProvider. Default: `/var/tmp/reva/shares.json`.
 
---storage-oc-mount-id | $REVA_STORAGE_OC_MOUNT_ID  
-: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009162`.
+--public-driver | $REVA_SHARING_PUBLIC_DRIVER  
+: driver to use for the PublicShareProvider. Default: `json`.
 
-### ocis-reva storage-oc-data
+### ocis-reva storage-oc
 
-Start reva storage-oc-data service
+Start reva storage-oc service
 
-Usage: `ocis-reva storage-oc-data [command options] [arguments...]`
+Usage: `ocis-reva storage-oc [command options] [arguments...]`
 
 --tracing-enabled | $REVA_TRACING_ENABLED  
 : Enable sending traces.
@@ -192,8 +135,8 @@ Usage: `ocis-reva storage-oc-data [command options] [arguments...]`
 --tracing-service | $REVA_TRACING_SERVICE  
 : Service name for tracing. Default: `reva`.
 
---debug-addr | $REVA_STORAGE_OC_DATA_DEBUG_ADDR  
-: Address to bind debug server. Default: `0.0.0.0:9165`.
+--debug-addr | $REVA_STORAGE_OC_DEBUG_ADDR  
+: Address to bind debug server. Default: `0.0.0.0:9163`.
 
 --debug-token | $REVA_DEBUG_TOKEN  
 : Token to grant metrics access.
@@ -207,26 +150,35 @@ Usage: `ocis-reva storage-oc-data [command options] [arguments...]`
 --jwt-secret | $REVA_JWT_SECRET  
 : Shared jwt secret for reva service communication. Default: `Pive-Fumkiu4`.
 
---network | $REVA_STORAGE_OC_DATA_NETWORK  
+--network | $REVA_STORAGE_OC_NETWORK  
 : Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
 
---protocol | $REVA_STORAGE_OC_DATA_PROTOCOL  
-: protocol for reva service, can be 'http' or 'grpc'. Default: `http`.
+--protocol | $REVA_STORAGE_OC_PROTOCOL  
+: protocol for reva service, can be 'http' or 'grpc'. Default: `grpc`.
 
---addr | $REVA_STORAGE_OC_DATA_ADDR  
-: Address to bind reva service. Default: `0.0.0.0:9164`.
+--addr | $REVA_STORAGE_OC_ADDR  
+: Address to bind reva service. Default: `0.0.0.0:9162`.
 
---url | $REVA_STORAGE_OC_DATA_URL  
-: URL to use for the reva service. Default: `localhost:9164`.
+--url | $REVA_STORAGE_OC_URL  
+: URL to use for the reva service. Default: `localhost:9162`.
 
---driver | $REVA_STORAGE_OC_DATA_DRIVER  
+--driver | $REVA_STORAGE_OC_DRIVER  
 : storage driver, eg. local, eos, owncloud or s3. Default: `owncloud`.
 
---prefix | $REVA_STORAGE_OC_DATA_PREFIX  
-: prefix for the http endpoint, without leading slash. Default: `data`.
+--mount-path | $REVA_STORAGE_OC_MOUNT_PATH  
+: mount path. Default: `/oc`.
 
---temp-folder | $REVA_STORAGE_OC_DATA_TEMP_FOLDER  
-: temp folder. Default: `/var/tmp/`.
+--mount-id | $REVA_STORAGE_OC_MOUNT_ID  
+: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009162`.
+
+--expose-data-server | $REVA_STORAGE_OC_EXPOSE_DATA_SERVER  
+: exposes a dedicated data server. Default: `true`.
+
+--data-server-url | $REVA_STORAGE_OC_DATA_SERVER_URL  
+: data server url. Default: `http://localhost:9164/data`.
+
+--enable-home-creation | $REVA_STORAGE_OC_ENABLE_HOME_CREATION  
+: if enabled home dirs will be automatically created. Default: `false`.
 
 --storage-eos-namespace | $REVA_STORAGE_EOS_NAMESPACE  
 : Namespace for metadata operations.
@@ -297,80 +249,11 @@ Usage: `ocis-reva storage-oc-data [command options] [arguments...]`
 --storage-owncloud-layout | $REVA_STORAGE_OWNCLOUD_LAYOUT  
 : `"layout of the users home dir path on disk, in addition to {{.Username}}, {{.UsernameLower}} and {{.Provider}} also supports prefixing dirs: "{{.UsernamePrefixCount.2}}/{{.UsernameLower}}" will turn "Einstein" into "Ei/Einstein" `. Default: `{{.Username}}`.
 
---gateway-url | $REVA_GATEWAY_URL  
-: URL to use for the reva gateway service. Default: `localhost:9142`.
-
-### ocis-reva sharing
-
-Start reva sharing service
-
-Usage: `ocis-reva sharing [command options] [arguments...]`
-
---tracing-enabled | $REVA_TRACING_ENABLED  
-: Enable sending traces.
-
---tracing-type | $REVA_TRACING_TYPE  
-: Tracing backend type. Default: `jaeger`.
-
---tracing-endpoint | $REVA_TRACING_ENDPOINT  
-: Endpoint for the agent.
-
---tracing-collector | $REVA_TRACING_COLLECTOR  
-: Endpoint for the collector.
-
---tracing-service | $REVA_TRACING_SERVICE  
-: Service name for tracing. Default: `reva`.
-
---debug-addr | $REVA_SHARING_DEBUG_ADDR  
-: Address to bind debug server. Default: `0.0.0.0:9151`.
-
---debug-token | $REVA_DEBUG_TOKEN  
-: Token to grant metrics access.
-
---debug-pprof | $REVA_DEBUG_PPROF  
-: Enable pprof debugging.
-
---debug-zpages | $REVA_DEBUG_ZPAGES  
-: Enable zpages debugging.
-
---jwt-secret | $REVA_JWT_SECRET  
-: Shared jwt secret for reva service communication. Default: `Pive-Fumkiu4`.
-
---network | $REVA_SHARING_NETWORK  
-: Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
-
---protocol | $REVA_SHARING_PROTOCOL  
-: protocol for reva service, can be 'http' or 'grpc'. Default: `grpc`.
-
---addr | $REVA_SHARING_ADDR  
-: Address to bind reva service. Default: `0.0.0.0:9150`.
-
---url | $REVA_SHARING_URL  
-: URL to use for the reva service. Default: `localhost:9150`.
-
---user-driver | $REVA_SHARING_USER_DRIVER  
-: driver to use for the UserShareProvider. Default: `json`.
-
---user-json-file | $REVA_SHARING_USER_JSON_FILE  
-: file used to persist shares for the UserShareProvider. Default: `/var/tmp/reva/shares.json`.
-
---public-driver | $REVA_SHARING_PUBLIC_DRIVER  
-: driver to use for the PublicShareProvider. Default: `memory`.
-
-### ocis-reva health
-
-Check health status
-
-Usage: `ocis-reva health [command options] [arguments...]`
-
---debug-addr | $REVA_DEBUG_ADDR  
-: Address to debug endpoint. Default: `0.0.0.0:9109`.
-
-### ocis-reva storage-home-data
+### ocis-reva storage-oc-data
 
-Start reva storage-home-data service
+Start reva storage-oc-data service
 
-Usage: `ocis-reva storage-home-data [command options] [arguments...]`
+Usage: `ocis-reva storage-oc-data [command options] [arguments...]`
 
 --tracing-enabled | $REVA_TRACING_ENABLED  
 : Enable sending traces.
@@ -387,8 +270,8 @@ Usage: `ocis-reva storage-home-data [command options] [arguments...]`
 --tracing-service | $REVA_TRACING_SERVICE  
 : Service name for tracing. Default: `reva`.
 
---debug-addr | $REVA_STORAGE_HOME_DATA_DEBUG_ADDR  
-: Address to bind debug server. Default: `0.0.0.0:9157`.
+--debug-addr | $REVA_STORAGE_OC_DATA_DEBUG_ADDR  
+: Address to bind debug server. Default: `0.0.0.0:9165`.
 
 --debug-token | $REVA_DEBUG_TOKEN  
 : Token to grant metrics access.
@@ -402,35 +285,35 @@ Usage: `ocis-reva storage-home-data [command options] [arguments...]`
 --jwt-secret | $REVA_JWT_SECRET  
 : Shared jwt secret for reva service communication. Default: `Pive-Fumkiu4`.
 
---network | $REVA_STORAGE_HOME_DATA_NETWORK  
+--network | $REVA_STORAGE_OC_DATA_NETWORK  
 : Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
 
---protocol | $REVA_STORAGE_HOME_DATA_PROTOCOL  
+--protocol | $REVA_STORAGE_OC_DATA_PROTOCOL  
 : protocol for reva service, can be 'http' or 'grpc'. Default: `http`.
 
---addr | $REVA_STORAGE_HOME_DATA_ADDR  
-: Address to bind reva service. Default: `0.0.0.0:9156`.
+--addr | $REVA_STORAGE_OC_DATA_ADDR  
+: Address to bind reva service. Default: `0.0.0.0:9164`.
 
---url | $REVA_STORAGE_HOME_DATA_URL  
-: URL to use for the reva service. Default: `localhost:9156`.
+--url | $REVA_STORAGE_OC_DATA_URL  
+: URL to use for the reva service. Default: `localhost:9164`.
 
---driver | $REVA_STORAGE_HOME_DATA_DRIVER  
+--driver | $REVA_STORAGE_OC_DATA_DRIVER  
 : storage driver, eg. local, eos, owncloud or s3. Default: `owncloud`.
 
---prefix | $REVA_STORAGE_HOME_DATA_PREFIX  
+--prefix | $REVA_STORAGE_OC_DATA_PREFIX  
 : prefix for the http endpoint, without leading slash. Default: `data`.
 
---temp-folder | $REVA_STORAGE_HOME_DATA_TEMP_FOLDER  
+--temp-folder | $REVA_STORAGE_OC_DATA_TEMP_FOLDER  
 : temp folder. Default: `/var/tmp/`.
 
 --storage-eos-namespace | $REVA_STORAGE_EOS_NAMESPACE  
-: Namespace for metadata operations. Default: `/eos/dockertest/reva/users`.
+: Namespace for metadata operations.
 
 --storage-eos-shadow-namespace | $REVA_STORAGE_EOS_SHADOW_NAMESPACE  
 : Shadow namespace where share references are stored.
 
 --storage-eos-share-folder | $REVA_STORAGE_EOS_SHARE_FOLDER  
-: name of the share folder. Default: `/Shares`.
+: name of the share folder.
 
 --storage-eos-binary | $REVA_STORAGE_EOS_BINARY  
 : Location of the eos binary. Default: `/usr/bin/eos`.
@@ -439,10 +322,10 @@ Usage: `ocis-reva storage-home-data [command options] [arguments...]`
 : Location of the xrdcopy binary. Default: `/usr/bin/xrdcopy`.
 
 --storage-eos-master-url | $REVA_STORAGE_EOS_MASTER_URL  
-: URL of the Master EOS MGM. Default: `root://eos-mgm1.eoscluster.cern.ch:1094`.
+: URL of the Master EOS MGM. Default: `root://eos-example.org`.
 
 --storage-eos-slave-url | $REVA_STORAGE_EOS_SLAVE_URL  
-: URL of the Slave EOS MGM. Default: `root://eos-mgm1.eoscluster.cern.ch:1094`.
+: URL of the Slave EOS MGM. Default: `root://eos-example.org`.
 
 --storage-eos-cache-directory | $REVA_STORAGE_EOS_CACHE_DIRECTORY  
 : Location on the local fs where to store reads. Default: `os.TempDir()`.
@@ -460,7 +343,7 @@ Usage: `ocis-reva storage-home-data [command options] [arguments...]`
 : authenticate requests by using an EOS keytab.
 
 --storage-eos-enable-home | $REVA_STORAGE_EOS_ENABLE_HOME  
-: enable the creation of home directories. Default: `true`.
+: enable the creation of home directories.
 
 --storage-eos-sec-protocol | $REVA_STORAGE_EOS_SEC_PROTOCOL  
 : the xrootd security protocol to use between the server and EOS.
@@ -472,7 +355,7 @@ Usage: `ocis-reva storage-home-data [command options] [arguments...]`
 : the username to use when SingleUserMode is enabled.
 
 --storage-eos-layout | $REVA_STORAGE_EOS_LAYOUT  
-: `"layout of the users home dir path on disk, in addition to {{.Username}}, {{.UsernameLower}} and {{.Provider}} also supports prefixing dirs: "{{substr 0 1 .Username}}/{{.Username}}" will turn "Einstein" into "E/Einstein" `. Default: `{{substr 0 1 .Username}}/{{.Username}}`.
+: `"layout of the users home dir path on disk, in addition to {{.Username}}, {{.UsernameLower}} and {{.Provider}} also supports prefixing dirs: "{{.UsernamePrefixCount.2}}/{{.UsernameLower}}" will turn "Einstein" into "Ei/Einstein" `. Default: `{{substr 0 1 .Username}}/{{.Username}}`.
 
 --storage-local-root | $REVA_STORAGE_LOCAL_ROOT  
 : the path to the local storage root. Default: `/var/tmp/reva/root`.
@@ -487,7 +370,7 @@ Usage: `ocis-reva storage-home-data [command options] [arguments...]`
 : the address of the redis server. Default: `:6379`.
 
 --storage-owncloud-enable-home | $REVA_STORAGE_OWNCLOUD_ENABLE_HOME  
-: enable the creation of home storages. Default: `true`.
+: enable the creation of home storages. Default: `false`.
 
 --storage-owncloud-layout | $REVA_STORAGE_OWNCLOUD_LAYOUT  
 : `"layout of the users home dir path on disk, in addition to {{.Username}}, {{.UsernameLower}} and {{.Provider}} also supports prefixing dirs: "{{.UsernamePrefixCount.2}}/{{.UsernameLower}}" will turn "Einstein" into "Ei/Einstein" `. Default: `{{.Username}}`.
@@ -495,11 +378,11 @@ Usage: `ocis-reva storage-home-data [command options] [arguments...]`
 --gateway-url | $REVA_GATEWAY_URL  
 : URL to use for the reva gateway service. Default: `localhost:9142`.
 
-### ocis-reva storage-oc
+### ocis-reva storage-root
 
-Start reva storage-oc service
+Start reva storage-root service
 
-Usage: `ocis-reva storage-oc [command options] [arguments...]`
+Usage: `ocis-reva storage-root [command options] [arguments...]`
 
 --tracing-enabled | $REVA_TRACING_ENABLED  
 : Enable sending traces.
@@ -516,8 +399,8 @@ Usage: `ocis-reva storage-oc [command options] [arguments...]`
 --tracing-service | $REVA_TRACING_SERVICE  
 : Service name for tracing. Default: `reva`.
 
---debug-addr | $REVA_STORAGE_OC_DEBUG_ADDR  
-: Address to bind debug server. Default: `0.0.0.0:9163`.
+--debug-addr | $REVA_STORAGE_ROOT_DEBUG_ADDR  
+: Address to bind debug server. Default: `0.0.0.0:9153`.
 
 --debug-token | $REVA_DEBUG_TOKEN  
 : Token to grant metrics access.
@@ -531,45 +414,39 @@ Usage: `ocis-reva storage-oc [command options] [arguments...]`
 --jwt-secret | $REVA_JWT_SECRET  
 : Shared jwt secret for reva service communication. Default: `Pive-Fumkiu4`.
 
---network | $REVA_STORAGE_OC_NETWORK  
+--network | $REVA_STORAGE_ROOT_NETWORK  
 : Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
 
---protocol | $REVA_STORAGE_OC_PROTOCOL  
+--protocol | $REVA_STORAGE_ROOT_PROTOCOL  
 : protocol for reva service, can be 'http' or 'grpc'. Default: `grpc`.
 
---addr | $REVA_STORAGE_OC_ADDR  
-: Address to bind reva service. Default: `0.0.0.0:9162`.
+--addr | $REVA_STORAGE_ROOT_ADDR  
+: Address to bind reva service. Default: `0.0.0.0:9152`.
 
---url | $REVA_STORAGE_OC_URL  
-: URL to use for the reva service. Default: `localhost:9162`.
+--url | $REVA_STORAGE_ROOT_URL  
+: URL to use for the reva service. Default: `localhost:9152`.
 
---driver | $REVA_STORAGE_OC_DRIVER  
-: storage driver, eg. local, eos, owncloud or s3. Default: `owncloud`.
+--driver | $REVA_STORAGE_ROOT_DRIVER  
+: storage driver, eg. local, eos, owncloud or s3. Default: `local`.
 
---mount-path | $REVA_STORAGE_OC_MOUNT_PATH  
-: mount path. Default: `/oc`.
+--mount-path | $REVA_STORAGE_ROOT_MOUNT_PATH  
+: mount path. Default: `/`.
 
---mount-id | $REVA_STORAGE_OC_MOUNT_ID  
-: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009162`.
+--mount-id | $REVA_STORAGE_ROOT_MOUNT_ID  
+: mount id. Default: `123e4567-e89b-12d3-a456-426655440001`.
 
---expose-data-server | $REVA_STORAGE_OC_EXPOSE_DATA_SERVER  
-: exposes a dedicated data server. Default: `true`.
+--expose-data-server | $REVA_STORAGE_ROOT_EXPOSE_DATA_SERVER  
+: exposes a dedicated data server.
 
---data-server-url | $REVA_STORAGE_OC_DATA_SERVER_URL  
-: data server url. Default: `http://localhost:9164/data`.
+--data-server-url | $REVA_STORAGE_ROOT_DATA_SERVER_URL  
+: data server url.
 
---enable-home-creation | $REVA_STORAGE_OC_ENABLE_HOME_CREATION  
-: if enabled home dirs will be automatically created. Default: `false`.
+--enable-home-creation | $REVA_STORAGE_HOME_ENABLE_HOME_CREATION  
+: if enabled home dirs will be automatically created.
 
 --storage-eos-namespace | $REVA_STORAGE_EOS_NAMESPACE  
 : Namespace for metadata operations.
 
---storage-eos-shadow-namespace | $REVA_STORAGE_EOS_SHADOW_NAMESPACE  
-: Shadow namespace where share references are stored.
-
---storage-eos-share-folder | $REVA_STORAGE_EOS_SHARE_FOLDER  
-: name of the share folder.
-
 --storage-eos-binary | $REVA_STORAGE_EOS_BINARY  
 : Location of the eos binary. Default: `/usr/bin/eos`.
 
@@ -630,11 +507,20 @@ Usage: `ocis-reva storage-oc [command options] [arguments...]`
 --storage-owncloud-layout | $REVA_STORAGE_OWNCLOUD_LAYOUT  
 : `"layout of the users home dir path on disk, in addition to {{.Username}}, {{.UsernameLower}} and {{.Provider}} also supports prefixing dirs: "{{.UsernamePrefixCount.2}}/{{.UsernameLower}}" will turn "Einstein" into "Ei/Einstein" `. Default: `{{.Username}}`.
 
-### ocis-reva users
+### ocis-reva health
 
-Start reva users service
+Check health status
 
-Usage: `ocis-reva users [command options] [arguments...]`
+Usage: `ocis-reva health [command options] [arguments...]`
+
+--debug-addr | $REVA_DEBUG_ADDR  
+: Address to debug endpoint. Default: `0.0.0.0:9109`.
+
+### ocis-reva storage-eos
+
+Start reva storage-eos service
+
+Usage: `ocis-reva storage-eos [command options] [arguments...]`
 
 --tracing-enabled | $REVA_TRACING_ENABLED  
 : Enable sending traces.
@@ -651,8 +537,8 @@ Usage: `ocis-reva users [command options] [arguments...]`
 --tracing-service | $REVA_TRACING_SERVICE  
 : Service name for tracing. Default: `reva`.
 
---debug-addr | $REVA_SHARING_DEBUG_ADDR  
-: Address to bind debug server. Default: `0.0.0.0:9145`.
+--debug-addr | $REVA_STORAGE_EOS_DEBUG_ADDR  
+: Address to bind debug server. Default: `0.0.0.0:9159`.
 
 --debug-token | $REVA_DEBUG_TOKEN  
 : Token to grant metrics access.
@@ -666,62 +552,110 @@ Usage: `ocis-reva users [command options] [arguments...]`
 --jwt-secret | $REVA_JWT_SECRET  
 : Shared jwt secret for reva service communication. Default: `Pive-Fumkiu4`.
 
---ldap-hostname | $REVA_LDAP_HOSTNAME  
-: LDAP hostname. Default: `localhost`.
+--network | $REVA_STORAGE_EOS_NETWORK  
+: Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
 
---ldap-base-dn | $REVA_LDAP_BASE_DN  
-: LDAP basedn. Default: `dc=example,dc=org`.
+--protocol | $REVA_STORAGE_EOS_PROTOCOL  
+: protocol for reva service, can be 'http' or 'grpc'. Default: `grpc`.
 
---ldap-userfilter | $REVA_LDAP_USERFILTER  
-: LDAP userfilter. Default: `(&(objectclass=posixAccount)(cn=%s*))`.
+--addr | $REVA_STORAGE_EOS_ADDR  
+: Address to bind reva service. Default: `0.0.0.0:9158`.
 
---ldap-groupfilter | $REVA_LDAP_GROUPFILTER  
-: LDAP groupfilter. Default: `(&(objectclass=posixGroup)(cn=%s*))`.
+--url | $REVA_STORAGE_EOS_URL  
+: URL to use for the reva service. Default: `localhost:9158`.
 
---ldap-bind-dn | $REVA_LDAP_BIND_DN  
-: LDAP bind dn. Default: `cn=reva,ou=sysusers,dc=example,dc=org`.
+--driver | $REVA_STORAGE_EOS_DRIVER  
+: storage driver, eg. local, eos, owncloud or s3. Default: `eos`.
 
---ldap-bind-password | $REVA_LDAP_BIND_PASSWORD  
-: LDAP bind password. Default: `reva`.
+--mount-path | $REVA_STORAGE_EOS_MOUNT_PATH  
+: mount path. Default: `/eos`.
 
---ldap-idp | $REVA_LDAP_IDP  
-: Identity provider to use for users. Default: `https://localhost:9200`.
+--mount-id | $REVA_STORAGE_EOS_MOUNT_ID  
+: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009158`.
 
---ldap-schema-uid | $REVA_LDAP_SCHEMA_UID  
-: LDAP schema uid. Default: `uid`.
+--expose-data-server | $REVA_STORAGE_EOS_EXPOSE_DATA_SERVER  
+: exposes a dedicated data server. Default: `true`.
 
---ldap-schema-mail | $REVA_LDAP_SCHEMA_MAIL  
-: LDAP schema mail. Default: `mail`.
+--data-server-url | $REVA_STORAGE_EOS_DATA_SERVER_URL  
+: data server url. Default: `http://localhost:9160/data`.
 
---ldap-schema-displayName | $REVA_LDAP_SCHEMA_DISPLAYNAME  
-: LDAP schema displayName. Default: `sn`.
+--enable-home-creation | $REVA_STORAGE_EOS_ENABLE_HOME_CREATION  
+: if enabled home dirs will be automatically created. Default: `false`.
 
---ldap-schema-cn | $REVA_LDAP_SCHEMA_CN  
-: LDAP schema cn. Default: `cn`.
+--storage-eos-namespace | $REVA_STORAGE_EOS_NAMESPACE  
+: Namespace for metadata operations. Default: `/eos/dockertest/reva`.
 
---network | $REVA_USERS_NETWORK  
-: Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
+--storage-eos-shadow-namespace | $REVA_STORAGE_EOS_SHADOW_NAMESPACE  
+: Shadow namespace where share references are stored.
 
---protocol | $REVA_USERS_PROTOCOL  
-: protocol for reva service, can be 'http' or 'grpc'. Default: `grpc`.
+--storage-eos-share-folder | $REVA_STORAGE_EOS_SHARE_FOLDER  
+: name of the share folder. Default: `/Shares`.
 
---addr | $REVA_USERS_ADDR  
-: Address to bind reva service. Default: `0.0.0.0:9144`.
+--storage-eos-binary | $REVA_STORAGE_EOS_BINARY  
+: Location of the eos binary. Default: `/usr/bin/eos`.
 
---url | $REVA_USERS_URL  
-: URL to use for the reva service. Default: `localhost:9144`.
+--storage-eos-xrdcopy-binary | $REVA_STORAGE_EOS_XRDCOPY_BINARY  
+: Location of the xrdcopy binary. Default: `/usr/bin/xrdcopy`.
 
---driver | $REVA_USERS_DRIVER  
-: user driver: 'demo', 'json' or 'ldap'. Default: `ldap`.
+--storage-eos-master-url | $REVA_STORAGE_EOS_MASTER_URL  
+: URL of the Master EOS MGM. Default: `root://eos-mgm1.eoscluster.cern.ch:1094`.
 
---json-config | $REVA_USERS_JSON  
-: Path to users.json file.
+--storage-eos-slave-url | $REVA_STORAGE_EOS_SLAVE_URL  
+: URL of the Slave EOS MGM. Default: `root://eos-mgm1.eoscluster.cern.ch:1094`.
 
-### ocis-reva auth-basic
+--storage-eos-cache-directory | $REVA_STORAGE_EOS_CACHE_DIRECTORY  
+: Location on the local fs where to store reads. Default: `os.TempDir()`.
 
-Start reva authprovider for basic auth
+--storage-eos-enable-logging | $REVA_STORAGE_EOS_ENABLE_LOGGING  
+: Enables logging of the commands executed.
 
-Usage: `ocis-reva auth-basic [command options] [arguments...]`
+--storage-eos-show-hidden-sysfiles | $REVA_STORAGE_EOS_SHOW_HIDDEN_SYSFILES  
+: show internal EOS files like .sys.v# and .sys.a# files..
+
+--storage-eos-force-singleuser-mode | $REVA_STORAGE_EOS_FORCE_SINGLEUSER_MODE  
+: force connections to EOS to use SingleUsername.
+
+--storage-eos-use-keytab | $REVA_STORAGE_EOS_USE_KEYTAB  
+: authenticate requests by using an EOS keytab.
+
+--storage-eos-enable-home | $REVA_STORAGE_EOS_ENABLE_HOME  
+: enable the creation of home directories.
+
+--storage-eos-sec-protocol | $REVA_STORAGE_EOS_SEC_PROTOCOL  
+: the xrootd security protocol to use between the server and EOS.
+
+--storage-eos-keytab | $REVA_STORAGE_EOS_KEYTAB  
+: the location of the keytab to use to authenticate to EOS.
+
+--storage-eos-single-username | $REVA_STORAGE_EOS_SINGLE_USERNAME  
+: the username to use when SingleUserMode is enabled.
+
+--storage-eos-layout | $REVA_STORAGE_EOS_LAYOUT  
+: `"layout of the users home dir path on disk, in addition to {{.Username}}, {{.UsernameLower}} and {{.Provider}} also supports prefixing dirs: "{{.UsernamePrefixCount.2}}/{{.UsernameLower}}" will turn "Einstein" into "Ei/Einstein" `. Default: `{{substr 0 1 .Username}}/{{.Username}}`.
+
+--storage-local-root | $REVA_STORAGE_LOCAL_ROOT  
+: the path to the local storage root. Default: `/var/tmp/reva/root`.
+
+--storage-owncloud-datadir | $REVA_STORAGE_OWNCLOUD_DATADIR  
+: the path to the owncloud data directory. Default: `/var/tmp/reva/data`.
+
+--storage-owncloud-scan | $REVA_STORAGE_OWNCLOUD_SCAN  
+: scan files on startup to add fileids. Default: `true`.
+
+--storage-owncloud-redis | $REVA_STORAGE_OWNCLOUD_REDIS_ADDR  
+: the address of the redis server. Default: `:6379`.
+
+--storage-owncloud-enable-home | $REVA_STORAGE_OWNCLOUD_ENABLE_HOME  
+: enable the creation of home storages. Default: `false`.
+
+--storage-owncloud-layout | $REVA_STORAGE_OWNCLOUD_LAYOUT  
+: `"layout of the users home dir path on disk, in addition to {{.Username}}, {{.UsernameLower}} and {{.Provider}} also supports prefixing dirs: "{{.UsernamePrefixCount.2}}/{{.UsernameLower}}" will turn "Einstein" into "Ei/Einstein" `. Default: `{{.Username}}`.
+
+### ocis-reva storage-eos-data
+
+Start reva storage-eos-data service
+
+Usage: `ocis-reva storage-eos-data [command options] [arguments...]`
 
 --tracing-enabled | $REVA_TRACING_ENABLED  
 : Enable sending traces.
@@ -738,8 +672,8 @@ Usage: `ocis-reva auth-basic [command options] [arguments...]`
 --tracing-service | $REVA_TRACING_SERVICE  
 : Service name for tracing. Default: `reva`.
 
---debug-addr | $REVA_AUTH_BASIC_DEBUG_ADDR  
-: Address to bind debug server. Default: `0.0.0.0:9147`.
+--debug-addr | $REVA_STORAGE_OC_DATA_DEBUG_ADDR  
+: Address to bind debug server. Default: `0.0.0.0:9161`.
 
 --debug-token | $REVA_DEBUG_TOKEN  
 : Token to grant metrics access.
@@ -753,62 +687,104 @@ Usage: `ocis-reva auth-basic [command options] [arguments...]`
 --jwt-secret | $REVA_JWT_SECRET  
 : Shared jwt secret for reva service communication. Default: `Pive-Fumkiu4`.
 
---users-driver | $REVA_USERS_DRIVER  
-: user driver: 'demo', 'json' or 'ldap'. Default: `ldap`.
+--network | $REVA_STORAGE_EOS_DATA_NETWORK  
+: Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
 
---users-json | $REVA_USERS_JSON  
-: Path to users.json file.
+--protocol | $REVA_STORAGE_EOS_DATA_PROTOCOL  
+: protocol for reva service, can be 'http' or 'grpc'. Default: `http`.
 
---ldap-hostname | $REVA_LDAP_HOSTNAME  
-: LDAP hostname. Default: `localhost`.
+--addr | $REVA_STORAGE_EOS_DATA_ADDR  
+: Address to bind reva service. Default: `0.0.0.0:9160`.
 
---ldap-base-dn | $REVA_LDAP_BASE_DN  
-: LDAP basedn. Default: `dc=example,dc=org`.
+--url | $REVA_STORAGE_EOS_DATA_URL  
+: URL to use for the reva service. Default: `localhost:9160`.
 
---ldap-userfilter | $REVA_LDAP_USERFILTER  
-: LDAP userfilter. Default: `(&(objectclass=posixAccount)(cn=%s))`.
+--driver | $REVA_STORAGE_EOS_DATA_DRIVER  
+: storage driver, eg. local, eos, owncloud or s3. Default: `eos`.
 
---ldap-groupfilter | $REVA_LDAP_GROUPFILTER  
-: LDAP groupfilter. Default: `(&(objectclass=posixGroup)(cn=%s))`.
+--prefix | $REVA_STORAGE_EOS_DATA_PREFIX  
+: prefix for the http endpoint, without leading slash. Default: `data`.
 
---ldap-bind-dn | $REVA_LDAP_BIND_DN  
-: LDAP bind dn. Default: `cn=reva,ou=sysusers,dc=example,dc=org`.
+--temp-folder | $REVA_STORAGE_EOS_DATA_TEMP_FOLDER  
+: temp folder. Default: `/var/tmp/`.
 
---ldap-bind-password | $REVA_LDAP_BIND_PASSWORD  
-: LDAP bind password. Default: `reva`.
+--storage-eos-namespace | $REVA_STORAGE_EOS_NAMESPACE  
+: Namespace for metadata operations. Default: `/eos/dockertest/reva`.
 
---ldap-idp | $REVA_LDAP_IDP  
-: Identity provider to use for users. Default: `https://localhost:9200`.
+--storage-eos-shadow-namespace | $REVA_STORAGE_EOS_SHADOW_NAMESPACE  
+: Shadow namespace where share references are stored.
 
---ldap-schema-uid | $REVA_LDAP_SCHEMA_UID  
-: LDAP schema uid. Default: `uid`.
+--storage-eos-share-folder | $REVA_STORAGE_EOS_SHARE_FOLDER  
+: name of the share folder. Default: `/Shares`.
 
---ldap-schema-mail | $REVA_LDAP_SCHEMA_MAIL  
-: LDAP schema mail. Default: `mail`.
+--storage-eos-binary | $REVA_STORAGE_EOS_BINARY  
+: Location of the eos binary. Default: `/usr/bin/eos`.
 
---ldap-schema-displayName | $REVA_LDAP_SCHEMA_DISPLAYNAME  
-: LDAP schema displayName. Default: `sn`.
+--storage-eos-xrdcopy-binary | $REVA_STORAGE_EOS_XRDCOPY_BINARY  
+: Location of the xrdcopy binary. Default: `/usr/bin/xrdcopy`.
+
+--storage-eos-master-url | $REVA_STORAGE_EOS_MASTER_URL  
+: URL of the Master EOS MGM. Default: `root://eos-mgm1.eoscluster.cern.ch:1094`.
+
+--storage-eos-slave-url | $REVA_STORAGE_EOS_SLAVE_URL  
+: URL of the Slave EOS MGM. Default: `root://eos-mgm1.eoscluster.cern.ch:1094`.
+
+--storage-eos-cache-directory | $REVA_STORAGE_EOS_CACHE_DIRECTORY  
+: Location on the local fs where to store reads. Default: `os.TempDir()`.
+
+--storage-eos-enable-logging | $REVA_STORAGE_EOS_ENABLE_LOGGING  
+: Enables logging of the commands executed.
+
+--storage-eos-show-hidden-sysfiles | $REVA_STORAGE_EOS_SHOW_HIDDEN_SYSFILES  
+: show internal EOS files like .sys.v# and .sys.a# files..
+
+--storage-eos-force-singleuser-mode | $REVA_STORAGE_EOS_FORCE_SINGLEUSER_MODE  
+: force connections to EOS to use SingleUsername.
+
+--storage-eos-use-keytab | $REVA_STORAGE_EOS_USE_KEYTAB  
+: authenticate requests by using an EOS keytab.
+
+--storage-eos-enable-home | $REVA_STORAGE_EOS_ENABLE_HOME  
+: enable the creation of home directories.
+
+--storage-eos-sec-protocol | $REVA_STORAGE_EOS_SEC_PROTOCOL  
+: the xrootd security protocol to use between the server and EOS.
+
+--storage-eos-keytab | $REVA_STORAGE_EOS_KEYTAB  
+: the location of the keytab to use to authenticate to EOS.
+
+--storage-eos-single-username | $REVA_STORAGE_EOS_SINGLE_USERNAME  
+: the username to use when SingleUserMode is enabled.
+
+--storage-eos-layout | $REVA_STORAGE_EOS_LAYOUT  
+: `"layout of the users home dir path on disk, in addition to {{.Username}}, {{.UsernameLower}} and {{.Provider}} also supports prefixing dirs: "{{.UsernamePrefixCount.2}}/{{.UsernameLower}}" will turn "Einstein" into "Ei/Einstein" `. Default: `{{substr 0 1 .Username}}/{{.Username}}`.
+
+--storage-local-root | $REVA_STORAGE_LOCAL_ROOT  
+: the path to the local storage root. Default: `/var/tmp/reva/root`.
+
+--storage-owncloud-datadir | $REVA_STORAGE_OWNCLOUD_DATADIR  
+: the path to the owncloud data directory. Default: `/var/tmp/reva/data`.
 
---ldap-schema-cn | $REVA_LDAP_SCHEMA_CN  
-: LDAP schema cn. Default: `cn`.
+--storage-owncloud-scan | $REVA_STORAGE_OWNCLOUD_SCAN  
+: scan files on startup to add fileids. Default: `true`.
 
---network | $REVA_AUTH_BASIC_NETWORK  
-: Network to use for the reva auth-basic service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
+--storage-owncloud-redis | $REVA_STORAGE_OWNCLOUD_REDIS_ADDR  
+: the address of the redis server. Default: `:6379`.
 
---protocol | $REVA_AUTH_BASIC_PROTOCOL  
-: protocol for reva service, can be 'http' or 'grpc'. Default: `grpc`.
+--storage-owncloud-enable-home | $REVA_STORAGE_OWNCLOUD_ENABLE_HOME  
+: enable the creation of home storages. Default: `false`.
 
---addr | $REVA_AUTH_BASIC_ADDR  
-: Address to bind reva service. Default: `0.0.0.0:9146`.
+--storage-owncloud-layout | $REVA_STORAGE_OWNCLOUD_LAYOUT  
+: `"layout of the users home dir path on disk, in addition to {{.Username}}, {{.UsernameLower}} and {{.Provider}} also supports prefixing dirs: "{{.UsernamePrefixCount.2}}/{{.UsernameLower}}" will turn "Einstein" into "Ei/Einstein" `. Default: `{{.Username}}`.
 
---url | $REVA_AUTH_BASIC_URL  
-: URL to use for the reva service. Default: `localhost:9146`.
+--gateway-url | $REVA_GATEWAY_URL  
+: URL to use for the reva gateway service. Default: `localhost:9142`.
 
-### ocis-reva storage-root
+### ocis-reva storage-home
 
-Start reva storage-root service
+Start reva storage-home service
 
-Usage: `ocis-reva storage-root [command options] [arguments...]`
+Usage: `ocis-reva storage-home [command options] [arguments...]`
 
 --tracing-enabled | $REVA_TRACING_ENABLED  
 : Enable sending traces.
@@ -825,8 +801,8 @@ Usage: `ocis-reva storage-root [command options] [arguments...]`
 --tracing-service | $REVA_TRACING_SERVICE  
 : Service name for tracing. Default: `reva`.
 
---debug-addr | $REVA_STORAGE_ROOT_DEBUG_ADDR  
-: Address to bind debug server. Default: `0.0.0.0:9153`.
+--debug-addr | $REVA_STORAGE_HOME_DEBUG_ADDR  
+: Address to bind debug server. Default: `0.0.0.0:9155`.
 
 --debug-token | $REVA_DEBUG_TOKEN  
 : Token to grant metrics access.
@@ -840,38 +816,44 @@ Usage: `ocis-reva storage-root [command options] [arguments...]`
 --jwt-secret | $REVA_JWT_SECRET  
 : Shared jwt secret for reva service communication. Default: `Pive-Fumkiu4`.
 
---network | $REVA_STORAGE_ROOT_NETWORK  
+--network | $REVA_STORAGE_HOME_NETWORK  
 : Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
 
---protocol | $REVA_STORAGE_ROOT_PROTOCOL  
+--protocol | $REVA_STORAGE_HOME_PROTOCOL  
 : protocol for reva service, can be 'http' or 'grpc'. Default: `grpc`.
 
---addr | $REVA_STORAGE_ROOT_ADDR  
-: Address to bind reva service. Default: `0.0.0.0:9152`.
+--addr | $REVA_STORAGE_HOME_ADDR  
+: Address to bind reva service. Default: `0.0.0.0:9154`.
 
---url | $REVA_STORAGE_ROOT_URL  
-: URL to use for the reva service. Default: `localhost:9152`.
+--url | $REVA_STORAGE_HOME_URL  
+: URL to use for the reva service. Default: `localhost:9154`.
 
---driver | $REVA_STORAGE_ROOT_DRIVER  
-: storage driver, eg. local, eos, owncloud or s3. Default: `local`.
+--driver | $REVA_STORAGE_HOME_DRIVER  
+: storage driver, eg. local, eos, owncloud or s3. Default: `owncloud`.
 
---mount-path | $REVA_STORAGE_ROOT_MOUNT_PATH  
-: mount path. Default: `/`.
+--mount-path | $REVA_STORAGE_HOME_MOUNT_PATH  
+: mount path. Default: `/home`.
 
---mount-id | $REVA_STORAGE_ROOT_MOUNT_ID  
-: mount id. Default: `123e4567-e89b-12d3-a456-426655440001`.
+--mount-id | $REVA_STORAGE_HOME_MOUNT_ID  
+: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009162`.
 
---expose-data-server | $REVA_STORAGE_ROOT_EXPOSE_DATA_SERVER  
-: exposes a dedicated data server.
+--expose-data-server | $REVA_STORAGE_HOME_EXPOSE_DATA_SERVER  
+: exposes a dedicated data server. Default: `true`.
 
---data-server-url | $REVA_STORAGE_ROOT_DATA_SERVER_URL  
-: data server url.
+--data-server-url | $REVA_STORAGE_HOME_DATA_SERVER_URL  
+: data server url. Default: `http://localhost:9156/data`.
 
 --enable-home-creation | $REVA_STORAGE_HOME_ENABLE_HOME_CREATION  
-: if enabled home dirs will be automatically created.
+: if enabled home dirs will be automatically created. Default: `true`.
 
 --storage-eos-namespace | $REVA_STORAGE_EOS_NAMESPACE  
-: Namespace for metadata operations.
+: Namespace for metadata operations. Default: `/eos/dockertest/reva/users`.
+
+--storage-eos-shadow-namespace | $REVA_STORAGE_EOS_SHADOW_NAMESPACE  
+: Shadow namespace where share references are stored.
+
+--storage-eos-share-folder | $REVA_STORAGE_EOS_SHARE_FOLDER  
+: name of the share folder. Default: `/Shares`.
 
 --storage-eos-binary | $REVA_STORAGE_EOS_BINARY  
 : Location of the eos binary. Default: `/usr/bin/eos`.
@@ -880,10 +862,10 @@ Usage: `ocis-reva storage-root [command options] [arguments...]`
 : Location of the xrdcopy binary. Default: `/usr/bin/xrdcopy`.
 
 --storage-eos-master-url | $REVA_STORAGE_EOS_MASTER_URL  
-: URL of the Master EOS MGM. Default: `root://eos-example.org`.
+: URL of the Master EOS MGM. Default: `root://eos-mgm1.eoscluster.cern.ch:1094`.
 
 --storage-eos-slave-url | $REVA_STORAGE_EOS_SLAVE_URL  
-: URL of the Slave EOS MGM. Default: `root://eos-example.org`.
+: URL of the Slave EOS MGM. Default: `root://eos-mgm1.eoscluster.cern.ch:1094`.
 
 --storage-eos-cache-directory | $REVA_STORAGE_EOS_CACHE_DIRECTORY  
 : Location on the local fs where to store reads. Default: `os.TempDir()`.
@@ -901,7 +883,7 @@ Usage: `ocis-reva storage-root [command options] [arguments...]`
 : authenticate requests by using an EOS keytab.
 
 --storage-eos-enable-home | $REVA_STORAGE_EOS_ENABLE_HOME  
-: enable the creation of home directories.
+: enable the creation of home directories. Default: `true`.
 
 --storage-eos-sec-protocol | $REVA_STORAGE_EOS_SEC_PROTOCOL  
 : the xrootd security protocol to use between the server and EOS.
@@ -913,7 +895,7 @@ Usage: `ocis-reva storage-root [command options] [arguments...]`
 : the username to use when SingleUserMode is enabled.
 
 --storage-eos-layout | $REVA_STORAGE_EOS_LAYOUT  
-: `"layout of the users home dir path on disk, in addition to {{.Username}}, {{.UsernameLower}} and {{.Provider}} also supports prefixing dirs: "{{.UsernamePrefixCount.2}}/{{.UsernameLower}}" will turn "Einstein" into "Ei/Einstein" `. Default: `{{substr 0 1 .Username}}/{{.Username}}`.
+: `"layout of the users home dir path on disk, in addition to {{.Username}}, {{.UsernameLower}} and {{.Provider}} also supports prefixing dirs: "{{substr 0 1 .Username}}/{{.Username}}" will turn "Einstein" into "E/Einstein" `. Default: `{{substr 0 1 .Username}}/{{.Username}}`.
 
 --storage-local-root | $REVA_STORAGE_LOCAL_ROOT  
 : the path to the local storage root. Default: `/var/tmp/reva/root`.
@@ -928,16 +910,16 @@ Usage: `ocis-reva storage-root [command options] [arguments...]`
 : the address of the redis server. Default: `:6379`.
 
 --storage-owncloud-enable-home | $REVA_STORAGE_OWNCLOUD_ENABLE_HOME  
-: enable the creation of home storages. Default: `false`.
+: enable the creation of home storages. Default: `true`.
 
 --storage-owncloud-layout | $REVA_STORAGE_OWNCLOUD_LAYOUT  
 : `"layout of the users home dir path on disk, in addition to {{.Username}}, {{.UsernameLower}} and {{.Provider}} also supports prefixing dirs: "{{.UsernamePrefixCount.2}}/{{.UsernameLower}}" will turn "Einstein" into "Ei/Einstein" `. Default: `{{.Username}}`.
 
-### ocis-reva auth-bearer
+### ocis-reva reva-storage-public-link
 
-Start reva authprovider for bearer auth
+Start reva storage-public-link service
 
-Usage: `ocis-reva auth-bearer [command options] [arguments...]`
+Usage: `ocis-reva reva-storage-public-link [command options] [arguments...]`
 
 --tracing-enabled | $REVA_TRACING_ENABLED  
 : Enable sending traces.
@@ -954,8 +936,8 @@ Usage: `ocis-reva auth-bearer [command options] [arguments...]`
 --tracing-service | $REVA_TRACING_SERVICE  
 : Service name for tracing. Default: `reva`.
 
---debug-addr | $REVA_AUTH_BEARER_DEBUG_ADDR  
-: Address to bind debug server. Default: `0.0.0.0:9149`.
+--debug-addr | $REVA_STORAGE_PUBLIC_LINK_DEBUG_ADDR  
+: Address to bind debug server. Default: `0.0.0.0:10053`.
 
 --debug-token | $REVA_DEBUG_TOKEN  
 : Token to grant metrics access.
@@ -969,32 +951,50 @@ Usage: `ocis-reva auth-bearer [command options] [arguments...]`
 --jwt-secret | $REVA_JWT_SECRET  
 : Shared jwt secret for reva service communication. Default: `Pive-Fumkiu4`.
 
---oidc-issuer | $REVA_OIDC_ISSUER  
-: OIDC issuer. Default: `https://localhost:9200`.
+--network | $REVA_STORAGE_PUBLIC_LINK_NETWORK  
+: Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
 
---oidc-insecure | $REVA_OIDC_INSECURE  
-: OIDC allow insecure communication. Default: `true`.
+--protocol | $REVA_STORAGE_PUBLIC_LINK_PROTOCOL  
+: protocol for reva service, can be 'http' or 'grpc'. Default: `grpc`.
 
---oidc-id-claim | $REVA_OIDC_ID_CLAIM  
-: OIDC id claim. Default: `preferred_username`.
+--addr | $REVA_STORAGE_PUBLIC_LINK_ADDR  
+: Address to bind reva service. Default: `localhost:10054`.
 
---network | $REVA_AUTH_BEARER_NETWORK  
-: Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
+--public_share_provider_addr | $REVA_STORAGE_PUBLICLINK_PUBLIC_SHARE_PROVIDER_ADDR  
+: public share provider service address. Default: `localhost:9150`.
 
---protocol | $REVA_AUTH_BEARER_PROTOCOL  
-: protocol for reva service, can be 'http' or 'grpc'. Default: `grpc`.
+--user_provider_addr | $REVA_STORAGE_PUBLICLINK_USER_PROVIDER_ADDR  
+: user provider service address. Default: `localhost:9144`.
 
---addr | $REVA_AUTH_BEARER_ADDR  
-: Address to bind reva service. Default: `0.0.0.0:9148`.
+--storage_provider_addr | $REVA_STORAGE_PUBLICLINK_STORAGE_PROVIDER_ADDR  
+: storage provider service address. Default: `localhost:9154`.
 
---url | $REVA_AUTH_BEARER_URL  
-: URL to use for the reva service. Default: `localhost:9148`.
+--driver | $REVA_STORAGE_PUBLIC_LINK_DRIVER  
+: storage driver, eg. local, eos, owncloud or s3. Default: `owncloud`.
 
-### ocis-reva storage-eos
+--mount-id | $REVA_STORAGE_PUBLIC_LINK_MOUNT_ID  
+: mount id. Default: `e1a73ede-549b-4226-abdf-40e69ca8230d`.
 
-Start reva storage-eos service
+--expose-data-server | $REVA_STORAGE_PUBLIC_LINK_EXPOSE_DATA_SERVER  
+: exposes a dedicated data server. Default: `true`.
 
-Usage: `ocis-reva storage-eos [command options] [arguments...]`
+--data-server-url | $REVA_STORAGE_PUBLIC_LINK_DATA_SERVER_URL  
+: data server url. Default: `http://localhost:9156/data`.
+
+--enable-home-creation | $REVA_STORAGE_PUBLIC_LINK_ENABLE_HOME_CREATION  
+: if enabled home dirs will be automatically created. Default: `true`.
+
+--mount-path | $REVA_STORAGE_PUBLIC_LINK_MOUNT_PATH  
+: mount path. Default: `/public/`.
+
+--gateway-url | $REVA_GATEWAY_URL  
+: URL to use for the reva gateway service. Default: `localhost:9142`.
+
+### ocis-reva users
+
+Start reva users service
+
+Usage: `ocis-reva users [command options] [arguments...]`
 
 --tracing-enabled | $REVA_TRACING_ENABLED  
 : Enable sending traces.
@@ -1011,8 +1011,8 @@ Usage: `ocis-reva storage-eos [command options] [arguments...]`
 --tracing-service | $REVA_TRACING_SERVICE  
 : Service name for tracing. Default: `reva`.
 
---debug-addr | $REVA_STORAGE_EOS_DEBUG_ADDR  
-: Address to bind debug server. Default: `0.0.0.0:9159`.
+--debug-addr | $REVA_SHARING_DEBUG_ADDR  
+: Address to bind debug server. Default: `0.0.0.0:9145`.
 
 --debug-token | $REVA_DEBUG_TOKEN  
 : Token to grant metrics access.
@@ -1026,104 +1026,176 @@ Usage: `ocis-reva storage-eos [command options] [arguments...]`
 --jwt-secret | $REVA_JWT_SECRET  
 : Shared jwt secret for reva service communication. Default: `Pive-Fumkiu4`.
 
---network | $REVA_STORAGE_EOS_NETWORK  
+--ldap-hostname | $REVA_LDAP_HOSTNAME  
+: LDAP hostname. Default: `localhost`.
+
+--ldap-base-dn | $REVA_LDAP_BASE_DN  
+: LDAP basedn. Default: `dc=example,dc=org`.
+
+--ldap-userfilter | $REVA_LDAP_USERFILTER  
+: LDAP userfilter. Default: `(&(objectclass=posixAccount)(cn=%s*))`.
+
+--ldap-groupfilter | $REVA_LDAP_GROUPFILTER  
+: LDAP groupfilter. Default: `(&(objectclass=posixGroup)(cn=%s*))`.
+
+--ldap-bind-dn | $REVA_LDAP_BIND_DN  
+: LDAP bind dn. Default: `cn=reva,ou=sysusers,dc=example,dc=org`.
+
+--ldap-bind-password | $REVA_LDAP_BIND_PASSWORD  
+: LDAP bind password. Default: `reva`.
+
+--ldap-idp | $REVA_LDAP_IDP  
+: Identity provider to use for users. Default: `https://localhost:9200`.
+
+--ldap-schema-uid | $REVA_LDAP_SCHEMA_UID  
+: LDAP schema uid. Default: `uid`.
+
+--ldap-schema-mail | $REVA_LDAP_SCHEMA_MAIL  
+: LDAP schema mail. Default: `mail`.
+
+--ldap-schema-displayName | $REVA_LDAP_SCHEMA_DISPLAYNAME  
+: LDAP schema displayName. Default: `sn`.
+
+--ldap-schema-cn | $REVA_LDAP_SCHEMA_CN  
+: LDAP schema cn. Default: `cn`.
+
+--network | $REVA_USERS_NETWORK  
 : Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
 
---protocol | $REVA_STORAGE_EOS_PROTOCOL  
+--protocol | $REVA_USERS_PROTOCOL  
 : protocol for reva service, can be 'http' or 'grpc'. Default: `grpc`.
 
---addr | $REVA_STORAGE_EOS_ADDR  
-: Address to bind reva service. Default: `0.0.0.0:9158`.
+--addr | $REVA_USERS_ADDR  
+: Address to bind reva service. Default: `0.0.0.0:9144`.
 
---url | $REVA_STORAGE_EOS_URL  
-: URL to use for the reva service. Default: `localhost:9158`.
+--url | $REVA_USERS_URL  
+: URL to use for the reva service. Default: `localhost:9144`.
 
---driver | $REVA_STORAGE_EOS_DRIVER  
-: storage driver, eg. local, eos, owncloud or s3. Default: `eos`.
+--driver | $REVA_USERS_DRIVER  
+: user driver: 'demo', 'json' or 'ldap'. Default: `ldap`.
 
---mount-path | $REVA_STORAGE_EOS_MOUNT_PATH  
-: mount path. Default: `/eos`.
+--json-config | $REVA_USERS_JSON  
+: Path to users.json file.
 
---mount-id | $REVA_STORAGE_EOS_MOUNT_ID  
-: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009158`.
+### ocis-reva gateway
 
---expose-data-server | $REVA_STORAGE_EOS_EXPOSE_DATA_SERVER  
-: exposes a dedicated data server. Default: `true`.
+Start reva gateway
 
---data-server-url | $REVA_STORAGE_EOS_DATA_SERVER_URL  
-: data server url. Default: `http://localhost:9160/data`.
+Usage: `ocis-reva gateway [command options] [arguments...]`
 
---enable-home-creation | $REVA_STORAGE_EOS_ENABLE_HOME_CREATION  
-: if enabled home dirs will be automatically created. Default: `false`.
+--tracing-enabled | $REVA_TRACING_ENABLED  
+: Enable sending traces.
 
---storage-eos-namespace | $REVA_STORAGE_EOS_NAMESPACE  
-: Namespace for metadata operations. Default: `/eos/dockertest/reva`.
+--tracing-type | $REVA_TRACING_TYPE  
+: Tracing backend type. Default: `jaeger`.
 
---storage-eos-shadow-namespace | $REVA_STORAGE_EOS_SHADOW_NAMESPACE  
-: Shadow namespace where share references are stored.
+--tracing-endpoint | $REVA_TRACING_ENDPOINT  
+: Endpoint for the agent.
 
---storage-eos-share-folder | $REVA_STORAGE_EOS_SHARE_FOLDER  
-: name of the share folder. Default: `/Shares`.
+--tracing-collector | $REVA_TRACING_COLLECTOR  
+: Endpoint for the collector.
 
---storage-eos-binary | $REVA_STORAGE_EOS_BINARY  
-: Location of the eos binary. Default: `/usr/bin/eos`.
+--tracing-service | $REVA_TRACING_SERVICE  
+: Service name for tracing. Default: `reva`.
 
---storage-eos-xrdcopy-binary | $REVA_STORAGE_EOS_XRDCOPY_BINARY  
-: Location of the xrdcopy binary. Default: `/usr/bin/xrdcopy`.
+--debug-addr | $REVA_GATEWAY_DEBUG_ADDR  
+: Address to bind debug server. Default: `0.0.0.0:9143`.
 
---storage-eos-master-url | $REVA_STORAGE_EOS_MASTER_URL  
-: URL of the Master EOS MGM. Default: `root://eos-mgm1.eoscluster.cern.ch:1094`.
+--debug-token | $REVA_DEBUG_TOKEN  
+: Token to grant metrics access.
 
---storage-eos-slave-url | $REVA_STORAGE_EOS_SLAVE_URL  
-: URL of the Slave EOS MGM. Default: `root://eos-mgm1.eoscluster.cern.ch:1094`.
+--debug-pprof | $REVA_DEBUG_PPROF  
+: Enable pprof debugging.
+
+--debug-zpages | $REVA_DEBUG_ZPAGES  
+: Enable zpages debugging.
+
+--jwt-secret | $REVA_JWT_SECRET  
+: Shared jwt secret for reva service communication. Default: `Pive-Fumkiu4`.
+
+--transfer-secret | $REVA_TRANSFER_SECRET  
+: Transfer secret for datagateway. Default: `replace-me-with-a-transfer-secret`.
+
+--network | $REVA_GATEWAY_NETWORK  
+: Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
+
+--protocol | $REVA_GATEWAY_PROTOCOL  
+: protocol for reva service, can be 'http' or 'grpc'. Default: `grpc`.
+
+--addr | $REVA_GATEWAY_ADDR  
+: Address to bind reva service. Default: `0.0.0.0:9142`.
+
+--url | $REVA_GATEWAY_URL  
+: URL to use for the reva service. Default: `localhost:9142`.
+
+--commit-share-to-storage-grant | $REVA_GATEWAY_COMMIT_SHARE_TO_STORAGE_GRANT  
+: Commit shares to the share manager. Default: `true`.
+
+--commit-share-to-storage-ref | $REVA_GATEWAY_COMMIT_SHARE_TO_STORAGE_REF  
+: Commit shares to the storage. Default: `true`.
+
+--share-folder | $REVA_GATEWAY_SHARE_FOLDER  
+: mount shares in this folder of the home storage provider. Default: `Shares`.
+
+--link_grants_file | $REVA_GATEWAY_LINK_GRANTS_FILE  
+: when using a json manager, file to use as json serialized database. Default: `/var/tmp/reva/link_grants.json`.
+
+--disable-home-creation-on-login | $REVA_GATEWAY_DISABLE_HOME_CREATION_ON_LOGIN  
+: Disable creation of home folder on login.
+
+--storage-home-provider | $REVA_STORAGE_HOME_PROVIDER  
+: mount point of the storage provider for user homes in the global namespace. Default: `/home`.
 
---storage-eos-cache-directory | $REVA_STORAGE_EOS_CACHE_DIRECTORY  
-: Location on the local fs where to store reads. Default: `os.TempDir()`.
+--frontend-url | $REVA_FRONTEND_URL  
+: URL to use for the reva service. Default: `localhost:9140`.
 
---storage-eos-enable-logging | $REVA_STORAGE_EOS_ENABLE_LOGGING  
-: Enables logging of the commands executed.
+--users-url | $REVA_USERS_URL  
+: URL to use for the reva service. Default: `localhost:9144`.
 
---storage-eos-show-hidden-sysfiles | $REVA_STORAGE_EOS_SHOW_HIDDEN_SYSFILES  
-: show internal EOS files like .sys.v# and .sys.a# files..
+--auth-basic-url | $REVA_AUTH_BASIC_URL  
+: URL to use for the reva service. Default: `localhost:9146`.
 
---storage-eos-force-singleuser-mode | $REVA_STORAGE_EOS_FORCE_SINGLEUSER_MODE  
-: force connections to EOS to use SingleUsername.
+--auth-bearer-url | $REVA_AUTH_BEARER_URL  
+: URL to use for the reva service. Default: `localhost:9148`.
 
---storage-eos-use-keytab | $REVA_STORAGE_EOS_USE_KEYTAB  
-: authenticate requests by using an EOS keytab.
+--sharing-url | $REVA_SHARING_URL  
+: URL to use for the reva service. Default: `localhost:9150`.
 
---storage-eos-enable-home | $REVA_STORAGE_EOS_ENABLE_HOME  
-: enable the creation of home directories.
+--storage-root-url | $REVA_STORAGE_ROOT_URL  
+: URL to use for the reva service. Default: `localhost:9152`.
 
---storage-eos-sec-protocol | $REVA_STORAGE_EOS_SEC_PROTOCOL  
-: the xrootd security protocol to use between the server and EOS.
+--storage-root-mount-path | $REVA_STORAGE_ROOT_MOUNT_PATH  
+: mount path. Default: `/`.
 
---storage-eos-keytab | $REVA_STORAGE_EOS_KEYTAB  
-: the location of the keytab to use to authenticate to EOS.
+--storage-root-mount-id | $REVA_STORAGE_ROOT_MOUNT_ID  
+: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009152`.
 
---storage-eos-single-username | $REVA_STORAGE_EOS_SINGLE_USERNAME  
-: the username to use when SingleUserMode is enabled.
+--storage-home-url | $REVA_STORAGE_HOME_URL  
+: URL to use for the reva service. Default: `localhost:9154`.
 
---storage-eos-layout | $REVA_STORAGE_EOS_LAYOUT  
-: `"layout of the users home dir path on disk, in addition to {{.Username}}, {{.UsernameLower}} and {{.Provider}} also supports prefixing dirs: "{{.UsernamePrefixCount.2}}/{{.UsernameLower}}" will turn "Einstein" into "Ei/Einstein" `. Default: `{{substr 0 1 .Username}}/{{.Username}}`.
+--storage-home-mount-path | $REVA_STORAGE_HOME_MOUNT_PATH  
+: mount path. Default: `/home`.
 
---storage-local-root | $REVA_STORAGE_LOCAL_ROOT  
-: the path to the local storage root. Default: `/var/tmp/reva/root`.
+--storage-eos-url | $REVA_STORAGE_EOS_URL  
+: URL to use for the reva service. Default: `localhost:9158`.
 
---storage-owncloud-datadir | $REVA_STORAGE_OWNCLOUD_DATADIR  
-: the path to the owncloud data directory. Default: `/var/tmp/reva/data`.
+--storage-eos-mount-path | $REVA_STORAGE_EOS_MOUNT_PATH  
+: mount path. Default: `/eos`.
 
---storage-owncloud-scan | $REVA_STORAGE_OWNCLOUD_SCAN  
-: scan files on startup to add fileids. Default: `true`.
+--storage-eos-mount-id | $REVA_STORAGE_EOS_MOUNT_ID  
+: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009158`.
 
---storage-owncloud-redis | $REVA_STORAGE_OWNCLOUD_REDIS_ADDR  
-: the address of the redis server. Default: `:6379`.
+--storage-oc-url | $REVA_STORAGE_OC_URL  
+: URL to use for the reva service. Default: `localhost:9162`.
 
---storage-owncloud-enable-home | $REVA_STORAGE_OWNCLOUD_ENABLE_HOME  
-: enable the creation of home storages. Default: `false`.
+--storage-oc-mount-path | $REVA_STORAGE_OC_MOUNT_PATH  
+: mount path. Default: `/oc`.
 
---storage-owncloud-layout | $REVA_STORAGE_OWNCLOUD_LAYOUT  
-: `"layout of the users home dir path on disk, in addition to {{.Username}}, {{.UsernameLower}} and {{.Provider}} also supports prefixing dirs: "{{.UsernamePrefixCount.2}}/{{.UsernameLower}}" will turn "Einstein" into "Ei/Einstein" `. Default: `{{.Username}}`.
+--storage-oc-mount-id | $REVA_STORAGE_OC_MOUNT_ID  
+: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009162`.
+
+--public-links-url | $REVA_STORAGE_PUBLIC_LINK_URL  
+: URL to use for the public links service. Default: `localhost:10054`.
 
 ### ocis-reva frontend
 
@@ -1185,11 +1257,17 @@ Usage: `ocis-reva frontend [command options] [arguments...]`
 --gateway-url | $REVA_GATEWAY_URL  
 : URL to use for the reva gateway service. Default: `localhost:9142`.
 
-### ocis-reva storage-home
+--upload-disable-tus | $REVA_FRONTEND_UPLOAD_DISABLE_TUS  
+: Disables TUS upload mechanism. Default: `false`.
 
-Start reva storage-home service
+--upload-http-method-override | $REVA_FRONTEND_UPLOAD_HTTP_METHOD_OVERRIDE  
+: Specify an HTTP method (ex: POST) that clients should to use when uploading instead of PATCH.
 
-Usage: `ocis-reva storage-home [command options] [arguments...]`
+### ocis-reva auth-basic
+
+Start reva authprovider for basic auth
+
+Usage: `ocis-reva auth-basic [command options] [arguments...]`
 
 --tracing-enabled | $REVA_TRACING_ENABLED  
 : Enable sending traces.
@@ -1206,8 +1284,8 @@ Usage: `ocis-reva storage-home [command options] [arguments...]`
 --tracing-service | $REVA_TRACING_SERVICE  
 : Service name for tracing. Default: `reva`.
 
---debug-addr | $REVA_STORAGE_HOME_DEBUG_ADDR  
-: Address to bind debug server. Default: `0.0.0.0:9155`.
+--debug-addr | $REVA_AUTH_BASIC_DEBUG_ADDR  
+: Address to bind debug server. Default: `0.0.0.0:9147`.
 
 --debug-token | $REVA_DEBUG_TOKEN  
 : Token to grant metrics access.
@@ -1221,110 +1299,119 @@ Usage: `ocis-reva storage-home [command options] [arguments...]`
 --jwt-secret | $REVA_JWT_SECRET  
 : Shared jwt secret for reva service communication. Default: `Pive-Fumkiu4`.
 
---network | $REVA_STORAGE_HOME_NETWORK  
-: Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
+--users-driver | $REVA_USERS_DRIVER  
+: user driver: 'demo', 'json' or 'ldap'. Default: `ldap`.
 
---protocol | $REVA_STORAGE_HOME_PROTOCOL  
-: protocol for reva service, can be 'http' or 'grpc'. Default: `grpc`.
+--users-json | $REVA_USERS_JSON  
+: Path to users.json file.
 
---addr | $REVA_STORAGE_HOME_ADDR  
-: Address to bind reva service. Default: `0.0.0.0:9154`.
+--ldap-hostname | $REVA_LDAP_HOSTNAME  
+: LDAP hostname. Default: `localhost`.
 
---url | $REVA_STORAGE_HOME_URL  
-: URL to use for the reva service. Default: `localhost:9154`.
+--ldap-base-dn | $REVA_LDAP_BASE_DN  
+: LDAP basedn. Default: `dc=example,dc=org`.
 
---driver | $REVA_STORAGE_HOME_DRIVER  
-: storage driver, eg. local, eos, owncloud or s3. Default: `owncloud`.
+--ldap-userfilter | $REVA_LDAP_USERFILTER  
+: LDAP userfilter. Default: `(&(objectclass=posixAccount)(cn=%s))`.
 
---mount-path | $REVA_STORAGE_HOME_MOUNT_PATH  
-: mount path. Default: `/home`.
+--ldap-groupfilter | $REVA_LDAP_GROUPFILTER  
+: LDAP groupfilter. Default: `(&(objectclass=posixGroup)(cn=%s))`.
 
---mount-id | $REVA_STORAGE_HOME_MOUNT_ID  
-: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009162`.
+--ldap-bind-dn | $REVA_LDAP_BIND_DN  
+: LDAP bind dn. Default: `cn=reva,ou=sysusers,dc=example,dc=org`.
 
---expose-data-server | $REVA_STORAGE_HOME_EXPOSE_DATA_SERVER  
-: exposes a dedicated data server. Default: `true`.
+--ldap-bind-password | $REVA_LDAP_BIND_PASSWORD  
+: LDAP bind password. Default: `reva`.
 
---data-server-url | $REVA_STORAGE_HOME_DATA_SERVER_URL  
-: data server url. Default: `http://localhost:9156/data`.
+--ldap-idp | $REVA_LDAP_IDP  
+: Identity provider to use for users. Default: `https://localhost:9200`.
 
---enable-home-creation | $REVA_STORAGE_HOME_ENABLE_HOME_CREATION  
-: if enabled home dirs will be automatically created. Default: `true`.
+--ldap-schema-uid | $REVA_LDAP_SCHEMA_UID  
+: LDAP schema uid. Default: `uid`.
 
---storage-eos-namespace | $REVA_STORAGE_EOS_NAMESPACE  
-: Namespace for metadata operations. Default: `/eos/dockertest/reva/users`.
+--ldap-schema-mail | $REVA_LDAP_SCHEMA_MAIL  
+: LDAP schema mail. Default: `mail`.
 
---storage-eos-shadow-namespace | $REVA_STORAGE_EOS_SHADOW_NAMESPACE  
-: Shadow namespace where share references are stored.
+--ldap-schema-displayName | $REVA_LDAP_SCHEMA_DISPLAYNAME  
+: LDAP schema displayName. Default: `sn`.
 
---storage-eos-share-folder | $REVA_STORAGE_EOS_SHARE_FOLDER  
-: name of the share folder. Default: `/Shares`.
+--ldap-schema-cn | $REVA_LDAP_SCHEMA_CN  
+: LDAP schema cn. Default: `cn`.
 
---storage-eos-binary | $REVA_STORAGE_EOS_BINARY  
-: Location of the eos binary. Default: `/usr/bin/eos`.
+--network | $REVA_AUTH_BASIC_NETWORK  
+: Network to use for the reva auth-basic service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
 
---storage-eos-xrdcopy-binary | $REVA_STORAGE_EOS_XRDCOPY_BINARY  
-: Location of the xrdcopy binary. Default: `/usr/bin/xrdcopy`.
+--protocol | $REVA_AUTH_BASIC_PROTOCOL  
+: protocol for reva service, can be 'http' or 'grpc'. Default: `grpc`.
 
---storage-eos-master-url | $REVA_STORAGE_EOS_MASTER_URL  
-: URL of the Master EOS MGM. Default: `root://eos-mgm1.eoscluster.cern.ch:1094`.
+--addr | $REVA_AUTH_BASIC_ADDR  
+: Address to bind reva service. Default: `0.0.0.0:9146`.
 
---storage-eos-slave-url | $REVA_STORAGE_EOS_SLAVE_URL  
-: URL of the Slave EOS MGM. Default: `root://eos-mgm1.eoscluster.cern.ch:1094`.
+--url | $REVA_AUTH_BASIC_URL  
+: URL to use for the reva service. Default: `localhost:9146`.
 
---storage-eos-cache-directory | $REVA_STORAGE_EOS_CACHE_DIRECTORY  
-: Location on the local fs where to store reads. Default: `os.TempDir()`.
+### ocis-reva auth-bearer
 
---storage-eos-enable-logging | $REVA_STORAGE_EOS_ENABLE_LOGGING  
-: Enables logging of the commands executed.
+Start reva authprovider for bearer auth
 
---storage-eos-show-hidden-sysfiles | $REVA_STORAGE_EOS_SHOW_HIDDEN_SYSFILES  
-: show internal EOS files like .sys.v# and .sys.a# files..
+Usage: `ocis-reva auth-bearer [command options] [arguments...]`
 
---storage-eos-force-singleuser-mode | $REVA_STORAGE_EOS_FORCE_SINGLEUSER_MODE  
-: force connections to EOS to use SingleUsername.
+--tracing-enabled | $REVA_TRACING_ENABLED  
+: Enable sending traces.
 
---storage-eos-use-keytab | $REVA_STORAGE_EOS_USE_KEYTAB  
-: authenticate requests by using an EOS keytab.
+--tracing-type | $REVA_TRACING_TYPE  
+: Tracing backend type. Default: `jaeger`.
 
---storage-eos-enable-home | $REVA_STORAGE_EOS_ENABLE_HOME  
-: enable the creation of home directories. Default: `true`.
+--tracing-endpoint | $REVA_TRACING_ENDPOINT  
+: Endpoint for the agent.
 
---storage-eos-sec-protocol | $REVA_STORAGE_EOS_SEC_PROTOCOL  
-: the xrootd security protocol to use between the server and EOS.
+--tracing-collector | $REVA_TRACING_COLLECTOR  
+: Endpoint for the collector.
 
---storage-eos-keytab | $REVA_STORAGE_EOS_KEYTAB  
-: the location of the keytab to use to authenticate to EOS.
+--tracing-service | $REVA_TRACING_SERVICE  
+: Service name for tracing. Default: `reva`.
 
---storage-eos-single-username | $REVA_STORAGE_EOS_SINGLE_USERNAME  
-: the username to use when SingleUserMode is enabled.
+--debug-addr | $REVA_AUTH_BEARER_DEBUG_ADDR  
+: Address to bind debug server. Default: `0.0.0.0:9149`.
 
---storage-eos-layout | $REVA_STORAGE_EOS_LAYOUT  
-: `"layout of the users home dir path on disk, in addition to {{.Username}}, {{.UsernameLower}} and {{.Provider}} also supports prefixing dirs: "{{substr 0 1 .Username}}/{{.Username}}" will turn "Einstein" into "E/Einstein" `. Default: `{{substr 0 1 .Username}}/{{.Username}}`.
+--debug-token | $REVA_DEBUG_TOKEN  
+: Token to grant metrics access.
 
---storage-local-root | $REVA_STORAGE_LOCAL_ROOT  
-: the path to the local storage root. Default: `/var/tmp/reva/root`.
+--debug-pprof | $REVA_DEBUG_PPROF  
+: Enable pprof debugging.
 
---storage-owncloud-datadir | $REVA_STORAGE_OWNCLOUD_DATADIR  
-: the path to the owncloud data directory. Default: `/var/tmp/reva/data`.
+--debug-zpages | $REVA_DEBUG_ZPAGES  
+: Enable zpages debugging.
 
---storage-owncloud-scan | $REVA_STORAGE_OWNCLOUD_SCAN  
-: scan files on startup to add fileids. Default: `true`.
+--jwt-secret | $REVA_JWT_SECRET  
+: Shared jwt secret for reva service communication. Default: `Pive-Fumkiu4`.
 
---storage-owncloud-redis | $REVA_STORAGE_OWNCLOUD_REDIS_ADDR  
-: the address of the redis server. Default: `:6379`.
+--oidc-issuer | $REVA_OIDC_ISSUER  
+: OIDC issuer. Default: `https://localhost:9200`.
 
---storage-owncloud-enable-home | $REVA_STORAGE_OWNCLOUD_ENABLE_HOME  
-: enable the creation of home storages. Default: `true`.
+--oidc-insecure | $REVA_OIDC_INSECURE  
+: OIDC allow insecure communication. Default: `true`.
 
---storage-owncloud-layout | $REVA_STORAGE_OWNCLOUD_LAYOUT  
-: `"layout of the users home dir path on disk, in addition to {{.Username}}, {{.UsernameLower}} and {{.Provider}} also supports prefixing dirs: "{{.UsernamePrefixCount.2}}/{{.UsernameLower}}" will turn "Einstein" into "Ei/Einstein" `. Default: `{{.Username}}`.
+--oidc-id-claim | $REVA_OIDC_ID_CLAIM  
+: OIDC id claim. Default: `preferred_username`.
 
-### ocis-reva storage-oc-data
+--network | $REVA_AUTH_BEARER_NETWORK  
+: Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
 
-Start reva storage-oc-data service
+--protocol | $REVA_AUTH_BEARER_PROTOCOL  
+: protocol for reva service, can be 'http' or 'grpc'. Default: `grpc`.
 
-Usage: `ocis-reva storage-oc-data [command options] [arguments...]`
+--addr | $REVA_AUTH_BEARER_ADDR  
+: Address to bind reva service. Default: `0.0.0.0:9148`.
+
+--url | $REVA_AUTH_BEARER_URL  
+: URL to use for the reva service. Default: `localhost:9148`.
+
+### ocis-reva storage-home-data
+
+Start reva storage-home-data service
+
+Usage: `ocis-reva storage-home-data [command options] [arguments...]`
 
 --tracing-enabled | $REVA_TRACING_ENABLED  
 : Enable sending traces.
@@ -1341,8 +1428,8 @@ Usage: `ocis-reva storage-oc-data [command options] [arguments...]`
 --tracing-service | $REVA_TRACING_SERVICE  
 : Service name for tracing. Default: `reva`.
 
---debug-addr | $REVA_STORAGE_OC_DATA_DEBUG_ADDR  
-: Address to bind debug server. Default: `0.0.0.0:9161`.
+--debug-addr | $REVA_STORAGE_HOME_DATA_DEBUG_ADDR  
+: Address to bind debug server. Default: `0.0.0.0:9157`.
 
 --debug-token | $REVA_DEBUG_TOKEN  
 : Token to grant metrics access.
@@ -1356,29 +1443,29 @@ Usage: `ocis-reva storage-oc-data [command options] [arguments...]`
 --jwt-secret | $REVA_JWT_SECRET  
 : Shared jwt secret for reva service communication. Default: `Pive-Fumkiu4`.
 
---network | $REVA_STORAGE_EOS_DATA_NETWORK  
+--network | $REVA_STORAGE_HOME_DATA_NETWORK  
 : Network to use for the reva service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
 
---protocol | $REVA_STORAGE_EOS_DATA_PROTOCOL  
+--protocol | $REVA_STORAGE_HOME_DATA_PROTOCOL  
 : protocol for reva service, can be 'http' or 'grpc'. Default: `http`.
 
---addr | $REVA_STORAGE_EOS_DATA_ADDR  
-: Address to bind reva service. Default: `0.0.0.0:9160`.
+--addr | $REVA_STORAGE_HOME_DATA_ADDR  
+: Address to bind reva service. Default: `0.0.0.0:9156`.
 
---url | $REVA_STORAGE_EOS_DATA_URL  
-: URL to use for the reva service. Default: `localhost:9160`.
+--url | $REVA_STORAGE_HOME_DATA_URL  
+: URL to use for the reva service. Default: `localhost:9156`.
 
---driver | $REVA_STORAGE_EOS_DATA_DRIVER  
-: storage driver, eg. local, eos, owncloud or s3. Default: `eos`.
+--driver | $REVA_STORAGE_HOME_DATA_DRIVER  
+: storage driver, eg. local, eos, owncloud or s3. Default: `owncloud`.
 
---prefix | $REVA_STORAGE_EOS_DATA_PREFIX  
+--prefix | $REVA_STORAGE_HOME_DATA_PREFIX  
 : prefix for the http endpoint, without leading slash. Default: `data`.
 
---temp-folder | $REVA_STORAGE_EOS_DATA_TEMP_FOLDER  
+--temp-folder | $REVA_STORAGE_HOME_DATA_TEMP_FOLDER  
 : temp folder. Default: `/var/tmp/`.
 
 --storage-eos-namespace | $REVA_STORAGE_EOS_NAMESPACE  
-: Namespace for metadata operations. Default: `/eos/dockertest/reva`.
+: Namespace for metadata operations. Default: `/eos/dockertest/reva/users`.
 
 --storage-eos-shadow-namespace | $REVA_STORAGE_EOS_SHADOW_NAMESPACE  
 : Shadow namespace where share references are stored.
@@ -1414,7 +1501,7 @@ Usage: `ocis-reva storage-oc-data [command options] [arguments...]`
 : authenticate requests by using an EOS keytab.
 
 --storage-eos-enable-home | $REVA_STORAGE_EOS_ENABLE_HOME  
-: enable the creation of home directories.
+: enable the creation of home directories. Default: `true`.
 
 --storage-eos-sec-protocol | $REVA_STORAGE_EOS_SEC_PROTOCOL  
 : the xrootd security protocol to use between the server and EOS.
@@ -1426,7 +1513,7 @@ Usage: `ocis-reva storage-oc-data [command options] [arguments...]`
 : the username to use when SingleUserMode is enabled.
 
 --storage-eos-layout | $REVA_STORAGE_EOS_LAYOUT  
-: `"layout of the users home dir path on disk, in addition to {{.Username}}, {{.UsernameLower}} and {{.Provider}} also supports prefixing dirs: "{{.UsernamePrefixCount.2}}/{{.UsernameLower}}" will turn "Einstein" into "Ei/Einstein" `. Default: `{{substr 0 1 .Username}}/{{.Username}}`.
+: `"layout of the users home dir path on disk, in addition to {{.Username}}, {{.UsernameLower}} and {{.Provider}} also supports prefixing dirs: "{{substr 0 1 .Username}}/{{.Username}}" will turn "Einstein" into "E/Einstein" `. Default: `{{substr 0 1 .Username}}/{{.Username}}`.
 
 --storage-local-root | $REVA_STORAGE_LOCAL_ROOT  
 : the path to the local storage root. Default: `/var/tmp/reva/root`.
@@ -1441,7 +1528,7 @@ Usage: `ocis-reva storage-oc-data [command options] [arguments...]`
 : the address of the redis server. Default: `:6379`.
 
 --storage-owncloud-enable-home | $REVA_STORAGE_OWNCLOUD_ENABLE_HOME  
-: enable the creation of home storages. Default: `false`.
+: enable the creation of home storages. Default: `true`.
 
 --storage-owncloud-layout | $REVA_STORAGE_OWNCLOUD_LAYOUT  
 : `"layout of the users home dir path on disk, in addition to {{.Username}}, {{.UsernameLower}} and {{.Provider}} also supports prefixing dirs: "{{.UsernamePrefixCount.2}}/{{.UsernameLower}}" will turn "Einstein" into "Ei/Einstein" `. Default: `{{.Username}}`.
diff --git a/pkg/flagset/frontend.go b/pkg/flagset/frontend.go
index a53370f..e0484fb 100644
--- a/pkg/flagset/frontend.go
+++ b/pkg/flagset/frontend.go
@@ -162,21 +162,21 @@ func FrontendWithConfig(cfg *config.Config) []cli.Flag {
 		&cli.BoolFlag{
 			Name:        "upload-disable-tus",
 			Value:       false,
-			Usage:       "Tells clients to not use TUS by disabling the capability (this doesn't disable the endpoints)",
+			Usage:       "Disables TUS upload mechanism",
 			EnvVars:     []string{"REVA_FRONTEND_UPLOAD_DISABLE_TUS"},
 			Destination: &cfg.Reva.UploadDisableTus,
 		},
 		&cli.IntFlag{
 			Name:        "upload-max-chunk-size",
 			Value:       0,
-			Usage:       "Max chunk size in bytes to advertise to clients through capabilities",
+			Usage:       "Max chunk size in bytes to advertise to clients through capabilities, or 0 for unlimited",
 			EnvVars:     []string{"REVA_FRONTEND_UPLOAD_MAX_CHUNK_SIZE"},
 			Destination: &cfg.Reva.UploadMaxChunkSize,
 		},
 		&cli.StringFlag{
 			Name:        "upload-http-method-override",
 			Value:       "",
-			Usage:       "Specify an HTTP method (ex: POST) to use when uploading in case OPTIONS and PATCH are not available",
+			Usage:       "Specify an HTTP method (ex: POST) that clients should to use when uploading instead of PATCH",
 			EnvVars:     []string{"REVA_FRONTEND_UPLOAD_HTTP_METHOD_OVERRIDE"},
 			Destination: &cfg.Reva.UploadHTTPMethodOverride,
 		},