diff --git a/extensions/accounts/configuration.md b/extensions/accounts/configuration.md
index 17f1d309034..1f5ab790f1f 100644
--- a/extensions/accounts/configuration.md
+++ b/extensions/accounts/configuration.md
@@ -1,6 +1,6 @@
 ---
 title: "Configuration"
-date: "2021-02-19T03:02:48+0000"
+date: "2021-02-19T10:51:36+0000"
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/accounts/templates
@@ -35,87 +35,12 @@ If multiple variables are listed for one option, they are in order of precedence
 
 If you prefer to configure the service with commandline flags you can see the available variables below. Command line flags are only working when calling the subcommand directly.
 
-### accounts inspect
-
-Show detailed data on an existing account
-
-Usage: `accounts inspect [command options] [arguments...]`
-
--grpc-namespace |  $ACCOUNTS_GRPC_NAMESPACE
-: Set the base namespace for the grpc namespace. Default: `com.owncloud.api`.
-
--name |  $ACCOUNTS_NAME
-: service name. Default: `accounts`.
-
-### accounts list
-
-List existing accounts
-
-Usage: `accounts list [command options] [arguments...]`
-
--grpc-namespace |  $ACCOUNTS_GRPC_NAMESPACE
-: Set the base namespace for the grpc namespace. Default: `com.owncloud.api`.
-
--name |  $ACCOUNTS_NAME
-: service name. Default: `accounts`.
-
-### accounts update
-
-Make changes to an existing account
-
-Usage: `accounts update [command options] [arguments...]`
-
-### accounts version
-
-Print the versions of the running instances
-
-Usage: `accounts version [command options] [arguments...]`
-
--grpc-namespace |  $ACCOUNTS_GRPC_NAMESPACE
-: Set the base namespace for the grpc namespace. Default: `com.owncloud.api`.
-
--name |  $ACCOUNTS_NAME
-: service name. Default: `accounts`.
-
-### accounts add
-
-Create a new account
-
-Usage: `accounts add [command options] [arguments...]`
-
 ### accounts rebuildIndex
 
 Rebuilds the service's index, i.e. deleting and then re-adding all existing documents
 
 Usage: `accounts rebuildIndex [command options] [arguments...]`
 
-### accounts remove
-
-Removes an existing account
-
-Usage: `accounts remove [command options] [arguments...]`
-
--grpc-namespace |  $ACCOUNTS_GRPC_NAMESPACE
-: Set the base namespace for the grpc namespace. Default: `com.owncloud.api`.
-
--name |  $ACCOUNTS_NAME
-: service name. Default: `accounts`.
-
-### accounts ocis-accounts
-
-Provide accounts and groups for oCIS
-
-Usage: `accounts ocis-accounts [command options] [arguments...]`
-
--log-level |  $ACCOUNTS_LOG_LEVEL
-: Set logging level. Default: `info`.
-
--log-pretty |  $ACCOUNTS_LOG_PRETTY
-: Enable pretty logging. Default: `true`.
-
--log-color |  $ACCOUNTS_LOG_COLOR
-: Enable colored logging. Default: `true`.
-
 ### accounts server
 
 Start ocis accounts service
@@ -182,3 +107,78 @@ Usage: `accounts server [command options] [arguments...]`
 -service-user-username |  $ACCOUNTS_SERVICE_USER_USERNAME
 : username of the internal service user (required on EOS).
 
+### accounts add
+
+Create a new account
+
+Usage: `accounts add [command options] [arguments...]`
+
+### accounts inspect
+
+Show detailed data on an existing account
+
+Usage: `accounts inspect [command options] [arguments...]`
+
+-grpc-namespace |  $ACCOUNTS_GRPC_NAMESPACE
+: Set the base namespace for the grpc namespace. Default: `com.owncloud.api`.
+
+-name |  $ACCOUNTS_NAME
+: service name. Default: `accounts`.
+
+### accounts list
+
+List existing accounts
+
+Usage: `accounts list [command options] [arguments...]`
+
+-grpc-namespace |  $ACCOUNTS_GRPC_NAMESPACE
+: Set the base namespace for the grpc namespace. Default: `com.owncloud.api`.
+
+-name |  $ACCOUNTS_NAME
+: service name. Default: `accounts`.
+
+### accounts remove
+
+Removes an existing account
+
+Usage: `accounts remove [command options] [arguments...]`
+
+-grpc-namespace |  $ACCOUNTS_GRPC_NAMESPACE
+: Set the base namespace for the grpc namespace. Default: `com.owncloud.api`.
+
+-name |  $ACCOUNTS_NAME
+: service name. Default: `accounts`.
+
+### accounts ocis-accounts
+
+Provide accounts and groups for oCIS
+
+Usage: `accounts ocis-accounts [command options] [arguments...]`
+
+-log-level |  $ACCOUNTS_LOG_LEVEL
+: Set logging level. Default: `info`.
+
+-log-pretty |  $ACCOUNTS_LOG_PRETTY
+: Enable pretty logging. Default: `true`.
+
+-log-color |  $ACCOUNTS_LOG_COLOR
+: Enable colored logging. Default: `true`.
+
+### accounts update
+
+Make changes to an existing account
+
+Usage: `accounts update [command options] [arguments...]`
+
+### accounts version
+
+Print the versions of the running instances
+
+Usage: `accounts version [command options] [arguments...]`
+
+-grpc-namespace |  $ACCOUNTS_GRPC_NAMESPACE
+: Set the base namespace for the grpc namespace. Default: `com.owncloud.api`.
+
+-name |  $ACCOUNTS_NAME
+: service name. Default: `accounts`.
+
diff --git a/extensions/glauth/configuration.md b/extensions/glauth/configuration.md
index 290167ea478..eb28e572dee 100644
--- a/extensions/glauth/configuration.md
+++ b/extensions/glauth/configuration.md
@@ -1,6 +1,6 @@
 ---
 title: "Configuration"
-date: "2021-02-19T03:04:08+0000"
+date: "2021-02-19T10:52:47+0000"
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/glauth/templates
@@ -35,6 +35,30 @@ If multiple variables are listed for one option, they are in order of precedence
 
 If you prefer to configure the service with commandline flags you can see the available variables below. Command line flags are only working when calling the subcommand directly.
 
+### glauth health
+
+Check health status
+
+Usage: `glauth health [command options] [arguments...]`
+
+-debug-addr |  $GLAUTH_DEBUG_ADDR
+: Address to debug endpoint. Default: `0.0.0.0:9129`.
+
+### glauth ocis-glauth
+
+Serve GLAuth API for oCIS
+
+Usage: `glauth ocis-glauth [command options] [arguments...]`
+
+-log-level |  $GLAUTH_LOG_LEVEL
+: Set logging level. Default: `info`.
+
+-log-pretty |  $GLAUTH_LOG_PRETTY
+: Enable pretty logging. Default: `true`.
+
+-log-color |  $GLAUTH_LOG_COLOR
+: Enable colored logging. Default: `true`.
+
 ### glauth server
 
 Start integrated server
@@ -134,27 +158,3 @@ Usage: `glauth server [command options] [arguments...]`
 -fallback-use-graphapi |  $GLAUTH_FALLBACK_USE_GRAPHAPI
 : use Graph API, only for owncloud datastore. Default: `true`.
 
-### glauth health
-
-Check health status
-
-Usage: `glauth health [command options] [arguments...]`
-
--debug-addr |  $GLAUTH_DEBUG_ADDR
-: Address to debug endpoint. Default: `0.0.0.0:9129`.
-
-### glauth ocis-glauth
-
-Serve GLAuth API for oCIS
-
-Usage: `glauth ocis-glauth [command options] [arguments...]`
-
--log-level |  $GLAUTH_LOG_LEVEL
-: Set logging level. Default: `info`.
-
--log-pretty |  $GLAUTH_LOG_PRETTY
-: Enable pretty logging. Default: `true`.
-
--log-color |  $GLAUTH_LOG_COLOR
-: Enable colored logging. Default: `true`.
-
diff --git a/extensions/graph-explorer/configuration.md b/extensions/graph-explorer/configuration.md
index 669648c59b6..d397158b290 100644
--- a/extensions/graph-explorer/configuration.md
+++ b/extensions/graph-explorer/configuration.md
@@ -1,6 +1,6 @@
 ---
 title: "Configuration"
-date: "2021-02-19T03:04:10+0000"
+date: "2021-02-19T10:52:48+0000"
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/graph-explorer/templates
diff --git a/extensions/graph/configuration.md b/extensions/graph/configuration.md
index 35fda2d477d..3c27c25f134 100644
--- a/extensions/graph/configuration.md
+++ b/extensions/graph/configuration.md
@@ -1,6 +1,6 @@
 ---
 title: "Configuration"
-date: "2021-02-19T03:04:11+0000"
+date: "2021-02-19T10:52:50+0000"
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/graph/templates
@@ -55,6 +55,15 @@ Usage: `graph [global options] command [command options] [arguments...]`
 
 ## Sub Commands
 
+### graph health
+
+Check health status
+
+Usage: `graph health [command options] [arguments...]`
+
+-debug-addr |  $GRAPH_DEBUG_ADDR
+: Address to debug endpoint. Default: `0.0.0.0:9124`.
+
 ### graph server
 
 Start integrated server
@@ -127,12 +136,3 @@ Usage: `graph server [command options] [arguments...]`
 -reva-gateway-addr |  $REVA_GATEWAY_ADDR
 : REVA Gateway Endpoint. Default: `127.0.0.1:9142`.
 
-### graph health
-
-Check health status
-
-Usage: `graph health [command options] [arguments...]`
-
--debug-addr |  $GRAPH_DEBUG_ADDR
-: Address to debug endpoint. Default: `0.0.0.0:9124`.
-
diff --git a/extensions/idp/configuration.md b/extensions/idp/configuration.md
index a687872a5be..d716ae67934 100644
--- a/extensions/idp/configuration.md
+++ b/extensions/idp/configuration.md
@@ -1,6 +1,6 @@
 ---
 title: "Configuration"
-date: "2021-02-19T03:04:13+0000"
+date: "2021-02-19T10:52:51+0000"
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/idp/templates
@@ -35,6 +35,18 @@ If multiple variables are listed for one option, they are in order of precedence
 
 If you prefer to configure the service with commandline flags you can see the available variables below. Command line flags are only working when calling the subcommand directly.
 
+### idp version
+
+Print the versions of the running instances
+
+Usage: `idp version [command options] [arguments...]`
+
+-http-namespace |  $IDP_HTTP_NAMESPACE
+: Set the base namespace for service discovery. Default: `com.owncloud.web`.
+
+-name |  $IDP_NAME
+: Service name. Default: `idp`.
+
 ### idp health
 
 Check health status
@@ -206,15 +218,3 @@ Usage: `idp server [command options] [arguments...]`
 -disable-identifier-webapp |  $IDP_DISABLE_IDENTIFIER_WEBAPP
 : Disable built-in identifier-webapp to use a frontend hosted elsewhere.. Default: `true`.
 
-### idp version
-
-Print the versions of the running instances
-
-Usage: `idp version [command options] [arguments...]`
-
--http-namespace |  $IDP_HTTP_NAMESPACE
-: Set the base namespace for service discovery. Default: `com.owncloud.web`.
-
--name |  $IDP_NAME
-: Service name. Default: `idp`.
-
diff --git a/extensions/ocs/configuration.md b/extensions/ocs/configuration.md
index 518082bedc6..27ec9066a84 100644
--- a/extensions/ocs/configuration.md
+++ b/extensions/ocs/configuration.md
@@ -1,6 +1,6 @@
 ---
 title: "Configuration"
-date: "2021-02-19T03:04:15+0000"
+date: "2021-02-19T10:52:53+0000"
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/ocs/templates
diff --git a/extensions/onlyoffice/configuration.md b/extensions/onlyoffice/configuration.md
index d57a517497f..881676a4c9a 100644
--- a/extensions/onlyoffice/configuration.md
+++ b/extensions/onlyoffice/configuration.md
@@ -1,6 +1,6 @@
 ---
 title: "Configuration"
-date: "2021-02-19T03:04:16+0000"
+date: "2021-02-19T10:52:54+0000"
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/onlyoffice/templates
diff --git a/extensions/proxy/configuration.md b/extensions/proxy/configuration.md
index 5e6da1b0f1f..db8ebadd4ec 100644
--- a/extensions/proxy/configuration.md
+++ b/extensions/proxy/configuration.md
@@ -1,6 +1,6 @@
 ---
 title: "Configuration"
-date: "2021-02-19T03:04:17+0000"
+date: "2021-02-19T10:52:55+0000"
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/proxy/templates
@@ -35,6 +35,30 @@ If multiple variables are listed for one option, they are in order of precedence
 
 If you prefer to configure the service with commandline flags you can see the available variables below. Command line flags are only working when calling the subcommand directly.
 
+### proxy health
+
+Check health status
+
+Usage: `proxy health [command options] [arguments...]`
+
+--debug-addr |  $PROXY_DEBUG_ADDR
+: Address to debug endpoint. Default: `0.0.0.0:9109`.
+
+### proxy ocis-proxy
+
+proxy for oCIS
+
+Usage: `proxy ocis-proxy [command options] [arguments...]`
+
+--log-level |  $PROXY_LOG_LEVEL
+: Set logging level. Default: `info`.
+
+--log-pretty |  $PROXY_LOG_PRETTY
+: Enable pretty logging. Default: `true`.
+
+--log-color |  $PROXY_LOG_COLOR
+: Enable colored logging. Default: `true`.
+
 ### proxy server
 
 Start integrated server
@@ -134,27 +158,3 @@ Usage: `proxy version [command options] [arguments...]`
 --service-name |  $PROXY_SERVICE_NAME
 : Service name. Default: `proxy`.
 
-### proxy health
-
-Check health status
-
-Usage: `proxy health [command options] [arguments...]`
-
---debug-addr |  $PROXY_DEBUG_ADDR
-: Address to debug endpoint. Default: `0.0.0.0:9109`.
-
-### proxy ocis-proxy
-
-proxy for oCIS
-
-Usage: `proxy ocis-proxy [command options] [arguments...]`
-
---log-level |  $PROXY_LOG_LEVEL
-: Set logging level. Default: `info`.
-
---log-pretty |  $PROXY_LOG_PRETTY
-: Enable pretty logging. Default: `true`.
-
---log-color |  $PROXY_LOG_COLOR
-: Enable colored logging. Default: `true`.
-
diff --git a/extensions/settings/configuration.md b/extensions/settings/configuration.md
index 9f17379c086..98e7035a7d8 100644
--- a/extensions/settings/configuration.md
+++ b/extensions/settings/configuration.md
@@ -1,6 +1,6 @@
 ---
 title: "Configuration"
-date: "2021-02-19T03:04:18+0000"
+date: "2021-02-19T10:52:56+0000"
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/settings/templates
diff --git a/extensions/storage/configuration.md b/extensions/storage/configuration.md
index 400c4fbd7b7..3f1cfc5f84e 100644
--- a/extensions/storage/configuration.md
+++ b/extensions/storage/configuration.md
@@ -1,6 +1,6 @@
 ---
 title: "Configuration"
-date: "2021-02-19T03:04:19+0000"
+date: "2021-02-19T10:52:56+0000"
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/storage/templates
@@ -55,59 +55,29 @@ Usage: `storage [global options] command [command options] [arguments...]`
 
 ## Sub Commands
 
-### storage frontend
-
-Start frontend service
-
-Usage: `storage frontend [command options] [arguments...]`
-
--debug-addr |  $STORAGE_FRONTEND_DEBUG_ADDR
-: Address to bind debug server. Default: `0.0.0.0:9141`.
-
--transfer-secret |  $STORAGE_TRANSFER_SECRET
-: Transfer secret for datagateway. Default: `replace-me-with-a-transfer-secret`.
+### storage groups
 
--chunk-folder |  $STORAGE_CHUNK_FOLDER
-: temp directory for chunked uploads. Default: `/var/tmp/ocis/tmp/chunks`.
+Start groups service
 
--webdav-namespace |  $STORAGE_WEBDAV_NAMESPACE
-: Namespace prefix for the /webdav endpoint. Default: `/home/`.
+Usage: `storage groups [command options] [arguments...]`
 
--dav-files-namespace |  $STORAGE_DAV_FILES_NAMESPACE
-: Namespace prefix for the webdav /dav/files endpoint. Default: `/users/`.
+-debug-addr |  $STORAGE_GROUPPROVIDER_DEBUG_ADDR
+: Address to bind debug server. Default: `0.0.0.0:9161`.
 
--network |  $STORAGE_FRONTEND_HTTP_NETWORK
+-network |  $STORAGE_GROUPPROVIDER_NETWORK
 : Network to use for the storage service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
 
--addr |  $STORAGE_FRONTEND_HTTP_ADDR
-: Address to bind storage service. Default: `0.0.0.0:9140`.
-
--public-url |  $STORAGE_FRONTEND_PUBLIC_URL , $OCIS_URL
-: URL to use for the storage service. Default: `https://localhost:9200`.
-
--datagateway-prefix |  $STORAGE_FRONTEND_DATAGATEWAY_PREFIX
-: datagateway prefix. Default: `data`.
-
--ocdav-prefix |  $STORAGE_FRONTEND_OCDAV_PREFIX
-: owncloud webdav endpoint prefix.
-
--ocs-prefix |  $STORAGE_FRONTEND_OCS_PREFIX
-: open collaboration services endpoint prefix. Default: `ocs`.
-
--ocs-share-prefix |  $STORAGE_FRONTEND_OCS_Share_PREFIX
-: the prefix prepended to the path of shared files. Default: `/Shares`.
-
--gateway-url |  $STORAGE_GATEWAY_ENDPOINT
-: URL to use for the storage gateway service. Default: `localhost:9142`.
+-addr |  $STORAGE_GROUPPROVIDER_ADDR
+: Address to bind storage service. Default: `0.0.0.0:9160`.
 
--default-upload-protocol |  $STORAGE_FRONTEND_DEFAULT_UPLOAD_PROTOCOL
-: Default upload chunking protocol to be used out of tus/v1/ng. Default: `tus`.
+-endpoint |  $STORAGE_GROUPPROVIDER_ENDPOINT
+: URL to use for the storage service. Default: `localhost:9160`.
 
--upload-http-method-override |  $STORAGE_FRONTEND_UPLOAD_HTTP_METHOD_OVERRIDE
-: Specify an HTTP method (ex: POST) that clients should to use when uploading instead of PATCH.
+-driver |  $STORAGE_GROUPPROVIDER_DRIVER
+: group driver: 'json', 'ldap', or 'rest'. Default: `ldap`.
 
--checksum-preferred-upload-type |  $STORAGE_FRONTEND_CHECKSUM_PREFERRED_UPLOAD_TYPE
-: Specify the preferred checksum algorithm used for uploads.
+-json-config |  $STORAGE_GROUPPROVIDER_JSON
+: Path to groups.json file.
 
 ### storage storage
 
@@ -127,6 +97,153 @@ Usage: `storage storage [command options] [arguments...]`
 -log-color |  $STORAGE_LOG_COLOR
 : Enable colored logging.
 
+### storage health
+
+Check health status
+
+Usage: `storage health [command options] [arguments...]`
+
+-debug-addr |  $STORAGE_DEBUG_ADDR
+: Address to debug endpoint. Default: `0.0.0.0:9109`.
+
+### storage auth-basic
+
+Start authprovider for basic auth
+
+Usage: `storage auth-basic [command options] [arguments...]`
+
+-debug-addr |  $STORAGE_AUTH_BASIC_DEBUG_ADDR
+: Address to bind debug server. Default: `0.0.0.0:9147`.
+
+-auth-driver |  $STORAGE_AUTH_DRIVER
+: auth driver: 'demo', 'json' or 'ldap'. Default: `ldap`.
+
+-auth-json |  $STORAGE_AUTH_JSON
+: Path to users.json file.
+
+-network |  $STORAGE_AUTH_BASIC_GRPC_NETWORK
+: Network to use for the storage auth-basic service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
+
+-addr |  $STORAGE_AUTH_BASIC_GRPC_ADDR
+: Address to bind storage service. Default: `0.0.0.0:9146`.
+
+### storage auth-bearer
+
+Start authprovider for bearer auth
+
+Usage: `storage auth-bearer [command options] [arguments...]`
+
+-debug-addr |  $STORAGE_AUTH_BEARER_DEBUG_ADDR
+: Address to bind debug server. Default: `0.0.0.0:9149`.
+
+-oidc-issuer |  $STORAGE_OIDC_ISSUER , $OCIS_URL
+: OIDC issuer. Default: `https://localhost:9200`.
+
+-oidc-insecure |  $STORAGE_OIDC_INSECURE
+: OIDC allow insecure communication. Default: `true`.
+
+-oidc-id-claim |  $STORAGE_OIDC_ID_CLAIM
+: OIDC id claim. Default: `preferred_username`.
+
+-oidc-uid-claim |  $STORAGE_OIDC_UID_CLAIM
+: OIDC uid claim.
+
+-oidc-gid-claim |  $STORAGE_OIDC_GID_CLAIM
+: OIDC gid claim.
+
+-network |  $STORAGE_AUTH_BEARER_GRPC_NETWORK
+: Network to use for the storage service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
+
+-addr |  $STORAGE_AUTH_BEARER_GRPC_ADDR
+: Address to bind storage service. Default: `0.0.0.0:9148`.
+
+### storage gateway
+
+Start gateway
+
+Usage: `storage gateway [command options] [arguments...]`
+
+-debug-addr |  $STORAGE_GATEWAY_DEBUG_ADDR
+: Address to bind debug server. Default: `0.0.0.0:9143`.
+
+-transfer-secret |  $STORAGE_TRANSFER_SECRET
+: Transfer secret for datagateway. Default: `replace-me-with-a-transfer-secret`.
+
+-network |  $STORAGE_GATEWAY_GRPC_NETWORK
+: Network to use for the storage service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
+
+-addr |  $STORAGE_GATEWAY_GRPC_ADDR
+: Address to bind storage service. Default: `0.0.0.0:9142`.
+
+-endpoint |  $STORAGE_GATEWAY_ENDPOINT
+: endpoint to use for the storage service. Default: `localhost:9142`.
+
+-commit-share-to-storage-grant |  $STORAGE_GATEWAY_COMMIT_SHARE_TO_STORAGE_GRANT
+: Commit shares to the share manager. Default: `true`.
+
+-commit-share-to-storage-ref |  $STORAGE_GATEWAY_COMMIT_SHARE_TO_STORAGE_REF
+: Commit shares to the storage. Default: `true`.
+
+-share-folder |  $STORAGE_GATEWAY_SHARE_FOLDER
+: mount shares in this folder of the home storage provider. Default: `Shares`.
+
+-disable-home-creation-on-login |  $STORAGE_GATEWAY_DISABLE_HOME_CREATION_ON_LOGIN
+: Disable creation of home folder on login.
+
+-storage-home-mapping |  $STORAGE_GATEWAY_HOME_MAPPING
+: mapping template for user home paths to user-specific mount points, e.g. /home/{{substr 0 1 .Username}}.
+
+-auth-basic-endpoint |  $STORAGE_AUTH_BASIC_ENDPOINT
+: endpoint to use for the basic auth provider. Default: `localhost:9146`.
+
+-auth-bearer-endpoint |  $STORAGE_AUTH_BEARER_ENDPOINT
+: endpoint to use for the bearer auth provider. Default: `localhost:9148`.
+
+-storage-registry-driver |  $STORAGE_STORAGE_REGISTRY_DRIVER
+: driver of the storage registry. Default: `static`.
+
+-storage-home-provider |  $STORAGE_REGISTRY_HOME_PROVIDER
+: mount point of the storage provider for user homes in the global namespace. Default: `/home`.
+
+-public-url |  $STORAGE_FRONTEND_PUBLIC_URL , $OCIS_URL
+: URL to use for the storage service. Default: `https://localhost:9200`.
+
+-datagateway-url |  $STORAGE_DATAGATEWAY_PUBLIC_URL
+: URL to use for the storage datagateway, defaults to <STORAGE_FRONTEND_PUBLIC_URL>/data.
+
+-userprovider-endpoint |  $STORAGE_USERPROVIDER_ENDPOINT
+: endpoint to use for the userprovider. Default: `localhost:9144`.
+
+-groupprovider-endpoint |  $STORAGE_GROUPPROVIDER_ENDPOINT
+: endpoint to use for the groupprovider. Default: `localhost:9160`.
+
+-sharing-endpoint |  $STORAGE_SHARING_ENDPOINT
+: endpoint to use for the storage service. Default: `localhost:9150`.
+
+-storage-home-endpoint |  $STORAGE_HOME_ENDPOINT
+: endpoint to use for the home storage. Default: `localhost:9154`.
+
+-storage-home-mount-path |  $STORAGE_HOME_MOUNT_PATH
+: mount path. Default: `/home`.
+
+-storage-home-mount-id |  $STORAGE_HOME_MOUNT_ID
+: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009154`.
+
+-storage-users-endpoint |  $STORAGE_USERS_ENDPOINT
+: endpoint to use for the users storage. Default: `localhost:9157`.
+
+-storage-users-mount-path |  $STORAGE_USERS_MOUNT_PATH
+: mount path. Default: `/users`.
+
+-storage-users-mount-id |  $STORAGE_USERS_MOUNT_ID
+: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009157`.
+
+-public-link-endpoint |  $STORAGE_PUBLIC_LINK_ENDPOINT
+: endpoint to use for the public links service. Default: `localhost:9178`.
+
+-storage-public-link-mount-path |  $STORAGE_PUBLIC_LINK_MOUNT_PATH
+: mount path. Default: `/public`.
+
 ### storage sharing
 
 Start sharing service
@@ -205,35 +322,44 @@ Usage: `storage storage-home [command options] [arguments...]`
 -users-endpoint |  $STORAGE_USERPROVIDER_ENDPOINT
 : endpoint to use for the storage service. Default: `localhost:9144`.
 
-### storage auth-bearer
+### storage storage-metadata
 
-Start authprovider for bearer auth
+Start storage-metadata service
 
-Usage: `storage auth-bearer [command options] [arguments...]`
+Usage: `storage storage-metadata [command options] [arguments...]`
 
--debug-addr |  $STORAGE_AUTH_BEARER_DEBUG_ADDR
-: Address to bind debug server. Default: `0.0.0.0:9149`.
+-debug-addr |  $STORAGE_METADATA_DEBUG_ADDR
+: Address to bind debug server. Default: `0.0.0.0:9217`.
 
--oidc-issuer |  $STORAGE_OIDC_ISSUER , $OCIS_URL
-: OIDC issuer. Default: `https://localhost:9200`.
+-grpc-network |  $STORAGE_METADATA_GRPC_NETWORK
+: Network to use for the storage service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
 
--oidc-insecure |  $STORAGE_OIDC_INSECURE
-: OIDC allow insecure communication. Default: `true`.
+-grpc-addr |  $STORAGE_METADATA_GRPC_PROVIDER_ADDR
+: Address to bind storage service. Default: `0.0.0.0:9215`.
 
--oidc-id-claim |  $STORAGE_OIDC_ID_CLAIM
-: OIDC id claim. Default: `preferred_username`.
+-data-server-url |  $STORAGE_METADATA_DATA_SERVER_URL
+: URL of the data-provider the storage-provider uses. Default: `http://localhost:9216`.
 
--oidc-uid-claim |  $STORAGE_OIDC_UID_CLAIM
-: OIDC uid claim.
+-http-network |  $STORAGE_METADATA_HTTP_NETWORK
+: Network to use for the storage service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
 
--oidc-gid-claim |  $STORAGE_OIDC_GID_CLAIM
-: OIDC gid claim.
+-http-addr |  $STORAGE_METADATA_HTTP_ADDR
+: Address to bind storage service. Default: `0.0.0.0:9216`.
 
--network |  $STORAGE_AUTH_BEARER_GRPC_NETWORK
-: Network to use for the storage service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
+-tmp-folder |  $STORAGE_METADATA_TMP_FOLDER
+: path to tmp folder. Default: `/var/tmp/ocis/tmp/metadata`.
 
--addr |  $STORAGE_AUTH_BEARER_GRPC_ADDR
-: Address to bind storage service. Default: `0.0.0.0:9148`.
+-driver |  $STORAGE_METADATA_DRIVER
+: storage driver for metadata mount: eg. local, eos, owncloud, ocis or s3. Default: `ocis`.
+
+-gateway-endpoint |  $STORAGE_GATEWAY_ENDPOINT
+: endpoint to use for the gateway service. Default: `localhost:9142`.
+
+-userprovider-endpoint |  $STORAGE_USERPROVIDER_ENDPOINT
+: endpoint to use for the userprovider service. Default: `localhost:9144`.
+
+-storage-root |  $STORAGE_METADATA_ROOT
+: the path to the metadata storage root. Default: `/var/tmp/ocis/storage/metadata`.
 
 ### storage storage-public-link
 
@@ -256,27 +382,6 @@ Usage: `storage storage-public-link [command options] [arguments...]`
 -gateway-endpoint |  $STORAGE_GATEWAY_ENDPOINT
 : endpoint to use for the storage gateway service. Default: `localhost:9142`.
 
-### storage auth-basic
-
-Start authprovider for basic auth
-
-Usage: `storage auth-basic [command options] [arguments...]`
-
--debug-addr |  $STORAGE_AUTH_BASIC_DEBUG_ADDR
-: Address to bind debug server. Default: `0.0.0.0:9147`.
-
--auth-driver |  $STORAGE_AUTH_DRIVER
-: auth driver: 'demo', 'json' or 'ldap'. Default: `ldap`.
-
--auth-json |  $STORAGE_AUTH_JSON
-: Path to users.json file.
-
--network |  $STORAGE_AUTH_BASIC_GRPC_NETWORK
-: Network to use for the storage auth-basic service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
-
--addr |  $STORAGE_AUTH_BASIC_GRPC_ADDR
-: Address to bind storage service. Default: `0.0.0.0:9146`.
-
 ### storage storage-users
 
 Start storage-users service
@@ -349,164 +454,59 @@ Usage: `storage users [command options] [arguments...]`
 -json-config |  $STORAGE_USERPROVIDER_JSON
 : Path to users.json file.
 
-### storage gateway
+### storage frontend
 
-Start gateway
+Start frontend service
 
-Usage: `storage gateway [command options] [arguments...]`
+Usage: `storage frontend [command options] [arguments...]`
 
--debug-addr |  $STORAGE_GATEWAY_DEBUG_ADDR
-: Address to bind debug server. Default: `0.0.0.0:9143`.
+-debug-addr |  $STORAGE_FRONTEND_DEBUG_ADDR
+: Address to bind debug server. Default: `0.0.0.0:9141`.
 
 -transfer-secret |  $STORAGE_TRANSFER_SECRET
 : Transfer secret for datagateway. Default: `replace-me-with-a-transfer-secret`.
 
--network |  $STORAGE_GATEWAY_GRPC_NETWORK
-: Network to use for the storage service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
-
--addr |  $STORAGE_GATEWAY_GRPC_ADDR
-: Address to bind storage service. Default: `0.0.0.0:9142`.
-
--endpoint |  $STORAGE_GATEWAY_ENDPOINT
-: endpoint to use for the storage service. Default: `localhost:9142`.
-
--commit-share-to-storage-grant |  $STORAGE_GATEWAY_COMMIT_SHARE_TO_STORAGE_GRANT
-: Commit shares to the share manager. Default: `true`.
-
--commit-share-to-storage-ref |  $STORAGE_GATEWAY_COMMIT_SHARE_TO_STORAGE_REF
-: Commit shares to the storage. Default: `true`.
-
--share-folder |  $STORAGE_GATEWAY_SHARE_FOLDER
-: mount shares in this folder of the home storage provider. Default: `Shares`.
-
--disable-home-creation-on-login |  $STORAGE_GATEWAY_DISABLE_HOME_CREATION_ON_LOGIN
-: Disable creation of home folder on login.
-
--storage-home-mapping |  $STORAGE_GATEWAY_HOME_MAPPING
-: mapping template for user home paths to user-specific mount points, e.g. /home/{{substr 0 1 .Username}}.
+-chunk-folder |  $STORAGE_CHUNK_FOLDER
+: temp directory for chunked uploads. Default: `/var/tmp/ocis/tmp/chunks`.
 
--auth-basic-endpoint |  $STORAGE_AUTH_BASIC_ENDPOINT
-: endpoint to use for the basic auth provider. Default: `localhost:9146`.
+-webdav-namespace |  $STORAGE_WEBDAV_NAMESPACE
+: Namespace prefix for the /webdav endpoint. Default: `/home/`.
 
--auth-bearer-endpoint |  $STORAGE_AUTH_BEARER_ENDPOINT
-: endpoint to use for the bearer auth provider. Default: `localhost:9148`.
+-dav-files-namespace |  $STORAGE_DAV_FILES_NAMESPACE
+: Namespace prefix for the webdav /dav/files endpoint. Default: `/users/`.
 
--storage-registry-driver |  $STORAGE_STORAGE_REGISTRY_DRIVER
-: driver of the storage registry. Default: `static`.
+-network |  $STORAGE_FRONTEND_HTTP_NETWORK
+: Network to use for the storage service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
 
--storage-home-provider |  $STORAGE_REGISTRY_HOME_PROVIDER
-: mount point of the storage provider for user homes in the global namespace. Default: `/home`.
+-addr |  $STORAGE_FRONTEND_HTTP_ADDR
+: Address to bind storage service. Default: `0.0.0.0:9140`.
 
 -public-url |  $STORAGE_FRONTEND_PUBLIC_URL , $OCIS_URL
 : URL to use for the storage service. Default: `https://localhost:9200`.
 
--datagateway-url |  $STORAGE_DATAGATEWAY_PUBLIC_URL
-: URL to use for the storage datagateway, defaults to <STORAGE_FRONTEND_PUBLIC_URL>/data.
-
--userprovider-endpoint |  $STORAGE_USERPROVIDER_ENDPOINT
-: endpoint to use for the userprovider. Default: `localhost:9144`.
-
--groupprovider-endpoint |  $STORAGE_GROUPPROVIDER_ENDPOINT
-: endpoint to use for the groupprovider. Default: `localhost:9160`.
-
--sharing-endpoint |  $STORAGE_SHARING_ENDPOINT
-: endpoint to use for the storage service. Default: `localhost:9150`.
-
--storage-home-endpoint |  $STORAGE_HOME_ENDPOINT
-: endpoint to use for the home storage. Default: `localhost:9154`.
-
--storage-home-mount-path |  $STORAGE_HOME_MOUNT_PATH
-: mount path. Default: `/home`.
-
--storage-home-mount-id |  $STORAGE_HOME_MOUNT_ID
-: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009154`.
-
--storage-users-endpoint |  $STORAGE_USERS_ENDPOINT
-: endpoint to use for the users storage. Default: `localhost:9157`.
-
--storage-users-mount-path |  $STORAGE_USERS_MOUNT_PATH
-: mount path. Default: `/users`.
-
--storage-users-mount-id |  $STORAGE_USERS_MOUNT_ID
-: mount id. Default: `1284d238-aa92-42ce-bdc4-0b0000009157`.
-
--public-link-endpoint |  $STORAGE_PUBLIC_LINK_ENDPOINT
-: endpoint to use for the public links service. Default: `localhost:9178`.
-
--storage-public-link-mount-path |  $STORAGE_PUBLIC_LINK_MOUNT_PATH
-: mount path. Default: `/public`.
-
-### storage groups
-
-Start groups service
-
-Usage: `storage groups [command options] [arguments...]`
-
--debug-addr |  $STORAGE_GROUPPROVIDER_DEBUG_ADDR
-: Address to bind debug server. Default: `0.0.0.0:9161`.
-
--network |  $STORAGE_GROUPPROVIDER_NETWORK
-: Network to use for the storage service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
-
--addr |  $STORAGE_GROUPPROVIDER_ADDR
-: Address to bind storage service. Default: `0.0.0.0:9160`.
-
--endpoint |  $STORAGE_GROUPPROVIDER_ENDPOINT
-: URL to use for the storage service. Default: `localhost:9160`.
-
--driver |  $STORAGE_GROUPPROVIDER_DRIVER
-: group driver: 'json', 'ldap', or 'rest'. Default: `ldap`.
-
--json-config |  $STORAGE_GROUPPROVIDER_JSON
-: Path to groups.json file.
-
-### storage health
-
-Check health status
-
-Usage: `storage health [command options] [arguments...]`
-
--debug-addr |  $STORAGE_DEBUG_ADDR
-: Address to debug endpoint. Default: `0.0.0.0:9109`.
-
-### storage storage-metadata
-
-Start storage-metadata service
-
-Usage: `storage storage-metadata [command options] [arguments...]`
-
--debug-addr |  $STORAGE_METADATA_DEBUG_ADDR
-: Address to bind debug server. Default: `0.0.0.0:9217`.
-
--grpc-network |  $STORAGE_METADATA_GRPC_NETWORK
-: Network to use for the storage service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
-
--grpc-addr |  $STORAGE_METADATA_GRPC_PROVIDER_ADDR
-: Address to bind storage service. Default: `0.0.0.0:9215`.
-
--data-server-url |  $STORAGE_METADATA_DATA_SERVER_URL
-: URL of the data-provider the storage-provider uses. Default: `http://localhost:9216`.
+-datagateway-prefix |  $STORAGE_FRONTEND_DATAGATEWAY_PREFIX
+: datagateway prefix. Default: `data`.
 
--http-network |  $STORAGE_METADATA_HTTP_NETWORK
-: Network to use for the storage service, can be 'tcp', 'udp' or 'unix'. Default: `tcp`.
+-ocdav-prefix |  $STORAGE_FRONTEND_OCDAV_PREFIX
+: owncloud webdav endpoint prefix.
 
--http-addr |  $STORAGE_METADATA_HTTP_ADDR
-: Address to bind storage service. Default: `0.0.0.0:9216`.
+-ocs-prefix |  $STORAGE_FRONTEND_OCS_PREFIX
+: open collaboration services endpoint prefix. Default: `ocs`.
 
--tmp-folder |  $STORAGE_METADATA_TMP_FOLDER
-: path to tmp folder. Default: `/var/tmp/ocis/tmp/metadata`.
+-ocs-share-prefix |  $STORAGE_FRONTEND_OCS_Share_PREFIX
+: the prefix prepended to the path of shared files. Default: `/Shares`.
 
--driver |  $STORAGE_METADATA_DRIVER
-: storage driver for metadata mount: eg. local, eos, owncloud, ocis or s3. Default: `ocis`.
+-gateway-url |  $STORAGE_GATEWAY_ENDPOINT
+: URL to use for the storage gateway service. Default: `localhost:9142`.
 
--gateway-endpoint |  $STORAGE_GATEWAY_ENDPOINT
-: endpoint to use for the gateway service. Default: `localhost:9142`.
+-default-upload-protocol |  $STORAGE_FRONTEND_DEFAULT_UPLOAD_PROTOCOL
+: Default upload chunking protocol to be used out of tus/v1/ng. Default: `tus`.
 
--userprovider-endpoint |  $STORAGE_USERPROVIDER_ENDPOINT
-: endpoint to use for the userprovider service. Default: `localhost:9144`.
+-upload-http-method-override |  $STORAGE_FRONTEND_UPLOAD_HTTP_METHOD_OVERRIDE
+: Specify an HTTP method (ex: POST) that clients should to use when uploading instead of PATCH.
 
--storage-root |  $STORAGE_METADATA_ROOT
-: the path to the metadata storage root. Default: `/var/tmp/ocis/storage/metadata`.
+-checksum-preferred-upload-type |  $STORAGE_FRONTEND_CHECKSUM_PREFERRED_UPLOAD_TYPE
+: Specify the preferred checksum algorithm used for uploads.
 
 ## Config for the different Storage Drivers
 
diff --git a/extensions/store/configuration.md b/extensions/store/configuration.md
index ab968e656b1..2fcd18b4fbc 100644
--- a/extensions/store/configuration.md
+++ b/extensions/store/configuration.md
@@ -1,6 +1,6 @@
 ---
 title: "Configuration"
-date: "2021-02-19T03:04:20+0000"
+date: "2021-02-19T10:52:57+0000"
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/store/templates
@@ -35,18 +35,6 @@ If multiple variables are listed for one option, they are in order of precedence
 
 If you prefer to configure the service with commandline flags you can see the available variables below. Command line flags are only working when calling the subcommand directly.
 
-### store version
-
-Print the versions of the running instances
-
-Usage: `store version [command options] [arguments...]`
-
--grpc-namespace |  $STORE_GRPC_NAMESPACE
-: Set the base namespace for the grpc namespace. Default: `com.owncloud.api`.
-
--name |  $STORE_NAME
-: Service name. Default: `store`.
-
 ### store health
 
 Check health status
@@ -116,3 +104,15 @@ Usage: `store server [command options] [arguments...]`
 -data-path |  $STORE_DATA_PATH
 : location of the store data path. Default: `/var/tmp/ocis/store`.
 
+### store version
+
+Print the versions of the running instances
+
+Usage: `store version [command options] [arguments...]`
+
+-grpc-namespace |  $STORE_GRPC_NAMESPACE
+: Set the base namespace for the grpc namespace. Default: `com.owncloud.api`.
+
+-name |  $STORE_NAME
+: Service name. Default: `store`.
+
diff --git a/extensions/thumbnails/configuration.md b/extensions/thumbnails/configuration.md
index fe77f395734..1fa76f782c9 100644
--- a/extensions/thumbnails/configuration.md
+++ b/extensions/thumbnails/configuration.md
@@ -1,6 +1,6 @@
 ---
 title: "Configuration"
-date: "2021-02-19T03:04:21+0000"
+date: "2021-02-19T10:52:58+0000"
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/thumbnails/templates
@@ -35,18 +35,6 @@ If multiple variables are listed for one option, they are in order of precedence
 
 If you prefer to configure the service with commandline flags you can see the available variables below. Command line flags are only working when calling the subcommand directly.
 
-### thumbnails version
-
-Print the versions of the running instances
-
-Usage: `thumbnails version [command options] [arguments...]`
-
--grpc-name |  $THUMBNAILS_GRPC_NAME
-: Name of the service. Default: `thumbnails`.
-
--grpc-namespace |  $THUMBNAILS_GRPC_NAMESPACE
-: Set the base namespace for the grpc namespace. Default: `com.owncloud.api`.
-
 ### thumbnails health
 
 Check health status
@@ -125,3 +113,15 @@ Usage: `thumbnails server [command options] [arguments...]`
 -webdavsource-insecure |  $THUMBNAILS_WEBDAVSOURCE_INSECURE
 : Whether to skip certificate checks. Default: `true`.
 
+### thumbnails version
+
+Print the versions of the running instances
+
+Usage: `thumbnails version [command options] [arguments...]`
+
+-grpc-name |  $THUMBNAILS_GRPC_NAME
+: Name of the service. Default: `thumbnails`.
+
+-grpc-namespace |  $THUMBNAILS_GRPC_NAMESPACE
+: Set the base namespace for the grpc namespace. Default: `com.owncloud.api`.
+
diff --git a/extensions/web/configuration.md b/extensions/web/configuration.md
index f030e1658ed..390e1c1c511 100644
--- a/extensions/web/configuration.md
+++ b/extensions/web/configuration.md
@@ -1,6 +1,6 @@
 ---
 title: "Configuration"
-date: "2021-02-19T03:04:22+0000"
+date: "2021-02-19T10:52:59+0000"
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/web/templates
diff --git a/extensions/webdav/configuration.md b/extensions/webdav/configuration.md
index ac2c2e782a1..d71ade15882 100644
--- a/extensions/webdav/configuration.md
+++ b/extensions/webdav/configuration.md
@@ -1,6 +1,6 @@
 ---
 title: "Configuration"
-date: "2021-02-19T03:04:23+0000"
+date: "2021-02-19T10:53:00+0000"
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/webdav/templates
diff --git a/ocis/configuration.md b/ocis/configuration.md
index 898c411c923..1d9b5eb786a 100644
--- a/ocis/configuration.md
+++ b/ocis/configuration.md
@@ -1,6 +1,6 @@
 ---
 title: "Configuration"
-date: "2021-02-19T03:04:14+0000"
+date: "2021-02-19T10:52:52+0000"
 weight: 2
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/ocis/templates
@@ -132,95 +132,95 @@ Usage: `ocis kill [command options] [arguments...]`
 
 There are more subcommands to start the individual extensions. Please check the documentation about their usage and options in the dedicated section of the documentation.
 
-#### ocis storage-gateway
-
-Start storage gateway
-
-#### ocis store
-
-Start a go-micro store
-
-#### ocis version
+#### ocis storage-metadata
 
-Lists running services with version
+Start storage and data service for metadata
 
-#### ocis storage-home
+#### ocis storage-sharing
 
-Start storage and data provider for /home mount
+Start storage sharing service
 
-#### ocis storage-userprovider
+#### ocis storage-groupprovider
 
-Start storage userprovider service
+Start storage groupprovider service
 
-#### ocis storage-users
+#### ocis storage-public-link
 
-Start storage and data provider for /users mount
+Start storage public link storage
 
-#### ocis glauth
+#### ocis idp
 
-Start glauth server
+Start idp server
 
-#### ocis proxy
+#### ocis storage-gateway
 
-Start proxy server
+Start storage gateway
 
 #### ocis thumbnails
 
 Start thumbnails server
 
-#### ocis ocs
-
-Start ocs server
-
 #### ocis accounts
 
 Start accounts server
 
-#### ocis storage-groupprovider
-
-Start storage groupprovider service
-
 #### ocis web
 
 Start web server
 
+#### ocis storage-auth-basic
+
+Start storage auth-basic service
+
+#### ocis storage-frontend
+
+Start storage frontend
+
 #### ocis webdav
 
 Start webdav server
 
-#### ocis settings
+#### ocis glauth
 
-Start settings server
+Start glauth server
 
-#### ocis storage-auth-basic
+#### ocis storage-auth-bearer
 
-Start storage auth-basic service
+Start storage auth-bearer service
 
-#### ocis storage-sharing
+#### ocis proxy
 
-Start storage sharing service
+Start proxy server
 
-#### ocis storage-metadata
+#### ocis storage-users
 
-Start storage and data service for metadata
+Start storage and data provider for /users mount
 
-#### ocis idp
+#### ocis settings
 
-Start idp server
+Start settings server
 
-#### ocis onlyoffice
+#### ocis ocs
 
-Start onlyoffice server
+Start ocs server
 
-#### ocis storage-auth-bearer
+#### ocis storage-home
 
-Start storage auth-bearer service
+Start storage and data provider for /home mount
 
-#### ocis storage-frontend
+#### ocis storage-userprovider
 
-Start storage frontend
+Start storage userprovider service
 
-#### ocis storage-public-link
+#### ocis store
 
-Start storage public link storage
+Start a go-micro store
+
+#### ocis version
+
+Lists running services with version
+
+#### ocis onlyoffice
+
+Start onlyoffice server