diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9343ad34ac..cb54972348 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,164 @@
+Changelog for reva 2.6.0 (2022-06-21)
+=======================================
+
+The following sections list the changes in reva 2.6.0 relevant to
+reva users. The changes are ordered by importance.
+
+Summary
+-------
+
+ * Fix #2985: Make stat requests route based on storage providerid
+ * Fix #2987: Let archiver handle all error codes
+ * Fix #2994: Fix errors when loading shares
+ * Fix #2996: Do not close share dump channels
+ * Fix #2993: Remove unused configuration
+ * Fix #2950: Fix sharing with space ref
+ * Fix #2991: Make sharesstorageprovider get accepted share
+ * Chg #2877: Enable resharing
+ * Chg #2984: Update CS3Apis
+ * Enh #3753: Add executant to the events
+ * Enh #2820: Instrument GRPC and HTTP requests with OTel
+ * Enh #2975: Leverage shares space storageid and type when listing shares
+ * Enh #3882: Explicitly return on ocdav move requests with body
+ * Enh #2932: Stat accepted shares mountpoints, configure existing share updates
+ * Enh #2944: Improve owncloudsql connection management
+ * Enh #2962: Per service TracerProvider
+ * Enh #2911: Allow for dumping and loading shares
+ * Enh #2938: Sharpen tooling
+
+Details
+-------
+
+ * Bugfix #2985: Make stat requests route based on storage providerid
+
+   The gateway now uses a filter mask to only fetch the root id of a space for stat requests. This
+   allows the spaces registry to determine the responsible storage provider without querying
+   the storageproviders.
+
+   https://github.com/cs3org/reva/pull/2985
+
+ * Bugfix #2987: Let archiver handle all error codes
+
+   We fixed the archiver handler to handle all error codes
+
+   https://github.com/cs3org/reva/pull/2987
+
+ * Bugfix #2994: Fix errors when loading shares
+
+   We fixed a bug where loading shares and associated received shares ran into issues when
+   handling them simultaneously.
+
+   https://github.com/cs3org/reva/pull/2994
+
+ * Bugfix #2996: Do not close share dump channels
+
+   We no longer close the channels when dumping shares, it's the responsibility of the caller.
+
+   https://github.com/cs3org/reva/pull/2996
+
+ * Bugfix #2993: Remove unused configuration
+
+   We've fixed removed unused configuration:
+
+   - `insecure` from the dataprovider - `timeout` from the dataprovider - `tmp_folder` from the
+   storageprovider
+
+   https://github.com/cs3org/reva/pull/2993
+
+ * Bugfix #2950: Fix sharing with space ref
+
+   We've fixed a bug where share requests with `path` attribute present ignored the `space_ref`
+   attribute. We now give the `space_ref` attribute precedence over the `path` attribute.
+
+   https://github.com/cs3org/reva/pull/2950
+
+ * Bugfix #2991: Make sharesstorageprovider get accepted share
+
+   The sharesstorageprovider now gets an accepted share instead of filtering all shares.
+
+   https://github.com/cs3org/reva/pull/2991
+
+ * Change #2877: Enable resharing
+
+   This will allow resharing of files. - All Viewers and Editors are now able to reshare files and
+   folders - One can still edit their own shares, even when loosing share permissions - Viewers and
+   Editors in a space are not affected
+
+   https://github.com/cs3org/reva/pull/2877
+
+ * Change #2984: Update CS3Apis
+
+   Updated the CS3Apis to make use of field_mask and pagination for list requests.
+
+   https://github.com/cs3org/reva/pull/2984
+
+ * Enhancement #3753: Add executant to the events
+
+   Added the executant field to all events.
+
+   https://github.com/owncloud/ocis/issues/3753
+   https://github.com/cs3org/reva/pull/2945
+
+ * Enhancement #2820: Instrument GRPC and HTTP requests with OTel
+
+   We've added the enduser.id tag to the HTTP and GRPC requests. We've fixed the tracer names.
+   We've decorated the traces with the hostname.
+
+   https://github.com/cs3org/reva/pull/2820
+
+ * Enhancement #2975: Leverage shares space storageid and type when listing shares
+
+   The list shares call now also fills the storageid to allow the space registry to directly route
+   requests to the correct storageprovider. The spaces registry will now also skip
+   storageproviders that are not configured for a requested type, causing type 'personal'
+   requests to skip the sharestorageprovider.
+
+   https://github.com/cs3org/reva/pull/2975
+   https://github.com/cs3org/reva/pull/2980
+
+ * Enhancement #3882: Explicitly return on ocdav move requests with body
+
+   Added a check if a ocdav move request contains a body. If it does a 415 415 (Unsupported Media
+   Type) will be returned.
+
+   https://github.com/owncloud/ocis/issues/3882
+   https://github.com/cs3org/reva/pull/2974
+
+ * Enhancement #2932: Stat accepted shares mountpoints, configure existing share updates
+
+   https://github.com/cs3org/reva/pull/2932
+
+ * Enhancement #2944: Improve owncloudsql connection management
+
+   The owncloudsql storagedriver is now aware of the request context and will close db
+   connections when http connections are closed or time out. We also increased the max number of
+   open connections from 10 to 100 to prevent a corner case where all connections were used but idle
+   connections were not freed.
+
+   https://github.com/cs3org/reva/pull/2944
+
+ * Enhancement #2962: Per service TracerProvider
+
+   To improve tracing we create separate TracerProviders per service now. This is especially
+   helpful when running multiple reva services in a single process (like e.g. oCIS does).
+
+   https://github.com/cs3org/reva/pull/2962
+   https://github.com/cs3org/reva/pull/2978
+
+ * Enhancement #2911: Allow for dumping and loading shares
+
+   We now have interfaces for dumpable and loadable share manages which can be used to migrate
+   shares between share managers
+
+   https://github.com/cs3org/reva/pull/2911
+
+ * Enhancement #2938: Sharpen tooling
+
+   * We increased the linting timeout to 10min which caused some release builds to time out
+
+   https://github.com/cs3org/reva/pull/2938
+
+
 Changelog for reva 2.5.1 (2022-06-08)
 =======================================
 
@@ -149,17 +310,17 @@ reva users. The changes are ordered by importance.
 Summary
 -------
 
-* Fix #2891: Add missing http status code
+ * Fix #2891: Add missing http status code
 
 Details
 -------
 
-* Bugfix #2891: Add missing http status code
+ * Bugfix #2891: Add missing http status code
 
-  This Fix adds a missing status code to the InsufficientStorage error in reva, to allow tus to
-  pass it through.
+   This Fix adds a missing status code to the InsufficientStorage error in reva, to allow tus to
+   pass it through.
 
-  https://github.com/cs3org/reva/pull/2891
+   https://github.com/cs3org/reva/pull/2891
 
 
 Changelog for reva 2.4.0 (2022-05-24)
diff --git a/RELEASE_DATE b/RELEASE_DATE
index 3a1db58904..f05730521b 100644
--- a/RELEASE_DATE
+++ b/RELEASE_DATE
@@ -1 +1 @@
-2022-06-08
\ No newline at end of file
+2022-06-21
\ No newline at end of file
diff --git a/VERSION b/VERSION
index 4fd0fe3cd5..914ec96711 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5.1
\ No newline at end of file
+2.6.0
\ No newline at end of file
diff --git a/changelog/unreleased/allow-stat-to-route-based-on-id.md b/changelog/2.6.0_2022-06-21/allow-stat-to-route-based-on-id.md
similarity index 100%
rename from changelog/unreleased/allow-stat-to-route-based-on-id.md
rename to changelog/2.6.0_2022-06-21/allow-stat-to-route-based-on-id.md
diff --git a/changelog/unreleased/archiver-error-handling.md b/changelog/2.6.0_2022-06-21/archiver-error-handling.md
similarity index 100%
rename from changelog/unreleased/archiver-error-handling.md
rename to changelog/2.6.0_2022-06-21/archiver-error-handling.md
diff --git a/changelog/unreleased/events-executant.md b/changelog/2.6.0_2022-06-21/events-executant.md
similarity index 100%
rename from changelog/unreleased/events-executant.md
rename to changelog/2.6.0_2022-06-21/events-executant.md
diff --git a/changelog/unreleased/fix-loading-shares.md b/changelog/2.6.0_2022-06-21/fix-loading-shares.md
similarity index 100%
rename from changelog/unreleased/fix-loading-shares.md
rename to changelog/2.6.0_2022-06-21/fix-loading-shares.md
diff --git a/changelog/unreleased/fix-loading-shares2.md b/changelog/2.6.0_2022-06-21/fix-loading-shares2.md
similarity index 100%
rename from changelog/unreleased/fix-loading-shares2.md
rename to changelog/2.6.0_2022-06-21/fix-loading-shares2.md
diff --git a/changelog/unreleased/fix-remove-unused-config.md b/changelog/2.6.0_2022-06-21/fix-remove-unused-config.md
similarity index 100%
rename from changelog/unreleased/fix-remove-unused-config.md
rename to changelog/2.6.0_2022-06-21/fix-remove-unused-config.md
diff --git a/changelog/unreleased/fix-space-ref-sharing.md b/changelog/2.6.0_2022-06-21/fix-space-ref-sharing.md
similarity index 100%
rename from changelog/unreleased/fix-space-ref-sharing.md
rename to changelog/2.6.0_2022-06-21/fix-space-ref-sharing.md
diff --git a/changelog/unreleased/instrument-with-otel.md b/changelog/2.6.0_2022-06-21/instrument-with-otel.md
similarity index 100%
rename from changelog/unreleased/instrument-with-otel.md
rename to changelog/2.6.0_2022-06-21/instrument-with-otel.md
diff --git a/changelog/unreleased/leverage-sharesstorage-storageid.md b/changelog/2.6.0_2022-06-21/leverage-sharesstorage-storageid.md
similarity index 100%
rename from changelog/unreleased/leverage-sharesstorage-storageid.md
rename to changelog/2.6.0_2022-06-21/leverage-sharesstorage-storageid.md
diff --git a/changelog/unreleased/ocdav-move-body.md b/changelog/2.6.0_2022-06-21/ocdav-move-body.md
similarity index 100%
rename from changelog/unreleased/ocdav-move-body.md
rename to changelog/2.6.0_2022-06-21/ocdav-move-body.md
diff --git a/changelog/unreleased/ocs-optimizations.md b/changelog/2.6.0_2022-06-21/ocs-optimizations.md
similarity index 100%
rename from changelog/unreleased/ocs-optimizations.md
rename to changelog/2.6.0_2022-06-21/ocs-optimizations.md
diff --git a/changelog/unreleased/owncloudsql-context-and-connections.md b/changelog/2.6.0_2022-06-21/owncloudsql-context-and-connections.md
similarity index 100%
rename from changelog/unreleased/owncloudsql-context-and-connections.md
rename to changelog/2.6.0_2022-06-21/owncloudsql-context-and-connections.md
diff --git a/changelog/unreleased/per-service-trace.md b/changelog/2.6.0_2022-06-21/per-service-trace.md
similarity index 100%
rename from changelog/unreleased/per-service-trace.md
rename to changelog/2.6.0_2022-06-21/per-service-trace.md
diff --git a/changelog/unreleased/resharing.md b/changelog/2.6.0_2022-06-21/resharing.md
similarity index 100%
rename from changelog/unreleased/resharing.md
rename to changelog/2.6.0_2022-06-21/resharing.md
diff --git a/changelog/unreleased/share-manager-migration.md b/changelog/2.6.0_2022-06-21/share-manager-migration.md
similarity index 100%
rename from changelog/unreleased/share-manager-migration.md
rename to changelog/2.6.0_2022-06-21/share-manager-migration.md
diff --git a/changelog/unreleased/sharesstoregoprovider-get-accepted-shares.md b/changelog/2.6.0_2022-06-21/sharesstoregoprovider-get-accepted-shares.md
similarity index 100%
rename from changelog/unreleased/sharesstoregoprovider-get-accepted-shares.md
rename to changelog/2.6.0_2022-06-21/sharesstoregoprovider-get-accepted-shares.md
diff --git a/changelog/unreleased/sharpen-tooling.md b/changelog/2.6.0_2022-06-21/sharpen-tooling.md
similarity index 100%
rename from changelog/unreleased/sharpen-tooling.md
rename to changelog/2.6.0_2022-06-21/sharpen-tooling.md
diff --git a/changelog/unreleased/update-cs3apis.md b/changelog/2.6.0_2022-06-21/update-cs3apis.md
similarity index 100%
rename from changelog/unreleased/update-cs3apis.md
rename to changelog/2.6.0_2022-06-21/update-cs3apis.md
diff --git a/changelog/NOTE.md b/changelog/NOTE.md
index 9ab3fd4cd6..45c1046c87 100644
--- a/changelog/NOTE.md
+++ b/changelog/NOTE.md
@@ -1,30 +1,161 @@
-Changelog for reva 2.5.1 (2022-06-08)
+Changelog for reva 2.6.0 (2022-06-21)
 =======================================
 
-The following sections list the changes in reva 2.5.1 relevant to
+The following sections list the changes in reva 2.6.0 relevant to
 reva users. The changes are ordered by importance.
 
 Summary
 -------
 
- * Fix #2931: Allow listing share jail space
- * Fix #3704: Fix propfinds with depth 0
+ * Fix #2985: Make stat requests route based on storage providerid
+ * Fix #2987: Let archiver handle all error codes
+ * Fix #2994: Fix errors when loading shares
+ * Fix #2996: Do not close share dump channels
+ * Fix #2993: Remove unused configuration
+ * Fix #2950: Fix sharing with space ref
+ * Fix #2991: Make sharesstorageprovider get accepted share
+ * Chg #2877: Enable resharing
+ * Chg #2984: Update CS3Apis
+ * Enh #3753: Add executant to the events
+ * Enh #2820: Instrument GRPC and HTTP requests with OTel
+ * Enh #2975: Leverage shares space storageid and type when listing shares
+ * Enh #3882: Explicitly return on ocdav move requests with body
+ * Enh #2932: Stat accepted shares mountpoints, configure existing share updates
+ * Enh #2944: Improve owncloudsql connection management
+ * Enh #2962: Per service TracerProvider
+ * Enh #2911: Allow for dumping and loading shares
+ * Enh #2938: Sharpen tooling
 
 Details
 -------
 
- * Bugfix #2931: Allow listing share jail space
+ * Bugfix #2985: Make stat requests route based on storage providerid
 
-   Clients can now list the share jail content via `PROPFIND /dav/spaces/{sharejailid}`
+   The gateway now uses a filter mask to only fetch the root id of a space for stat requests. This
+   allows the spaces registry to determine the responsible storage provider without querying
+   the storageproviders.
 
-   https://github.com/cs3org/reva/pull/2931
+   https://github.com/cs3org/reva/pull/2985
 
- * Bugfix #3704: Fix propfinds with depth 0
+ * Bugfix #2987: Let archiver handle all error codes
 
-   Fixed the response for propfinds with depth 0. The response now doesn't contain the shares jail
-   anymore.
+   We fixed the archiver handler to handle all error codes
 
-   https://github.com/owncloud/ocis/issues/3704
-   https://github.com/cs3org/reva/pull/2918
+   https://github.com/cs3org/reva/pull/2987
+
+ * Bugfix #2994: Fix errors when loading shares
+
+   We fixed a bug where loading shares and associated received shares ran into issues when
+   handling them simultaneously.
+
+   https://github.com/cs3org/reva/pull/2994
+
+ * Bugfix #2996: Do not close share dump channels
+
+   We no longer close the channels when dumping shares, it's the responsibility of the caller.
+
+   https://github.com/cs3org/reva/pull/2996
+
+ * Bugfix #2993: Remove unused configuration
+
+   We've fixed removed unused configuration:
+
+   - `insecure` from the dataprovider - `timeout` from the dataprovider - `tmp_folder` from the
+   storageprovider
+
+   https://github.com/cs3org/reva/pull/2993
+
+ * Bugfix #2950: Fix sharing with space ref
+
+   We've fixed a bug where share requests with `path` attribute present ignored the `space_ref`
+   attribute. We now give the `space_ref` attribute precedence over the `path` attribute.
+
+   https://github.com/cs3org/reva/pull/2950
+
+ * Bugfix #2991: Make sharesstorageprovider get accepted share
+
+   The sharesstorageprovider now gets an accepted share instead of filtering all shares.
+
+   https://github.com/cs3org/reva/pull/2991
+
+ * Change #2877: Enable resharing
+
+   This will allow resharing of files. - All Viewers and Editors are now able to reshare files and
+   folders - One can still edit their own shares, even when loosing share permissions - Viewers and
+   Editors in a space are not affected
+
+   https://github.com/cs3org/reva/pull/2877
+
+ * Change #2984: Update CS3Apis
+
+   Updated the CS3Apis to make use of field_mask and pagination for list requests.
+
+   https://github.com/cs3org/reva/pull/2984
+
+ * Enhancement #3753: Add executant to the events
+
+   Added the executant field to all events.
+
+   https://github.com/owncloud/ocis/issues/3753
+   https://github.com/cs3org/reva/pull/2945
+
+ * Enhancement #2820: Instrument GRPC and HTTP requests with OTel
+
+   We've added the enduser.id tag to the HTTP and GRPC requests. We've fixed the tracer names.
+   We've decorated the traces with the hostname.
+
+   https://github.com/cs3org/reva/pull/2820
+
+ * Enhancement #2975: Leverage shares space storageid and type when listing shares
+
+   The list shares call now also fills the storageid to allow the space registry to directly route
+   requests to the correct storageprovider. The spaces registry will now also skip
+   storageproviders that are not configured for a requested type, causing type 'personal'
+   requests to skip the sharestorageprovider.
+
+   https://github.com/cs3org/reva/pull/2975
+   https://github.com/cs3org/reva/pull/2980
+
+ * Enhancement #3882: Explicitly return on ocdav move requests with body
+
+   Added a check if a ocdav move request contains a body. If it does a 415 415 (Unsupported Media
+   Type) will be returned.
+
+   https://github.com/owncloud/ocis/issues/3882
+   https://github.com/cs3org/reva/pull/2974
+
+ * Enhancement #2932: Stat accepted shares mountpoints, configure existing share updates
+
+   https://github.com/cs3org/reva/pull/2932
+
+ * Enhancement #2944: Improve owncloudsql connection management
+
+   The owncloudsql storagedriver is now aware of the request context and will close db
+   connections when http connections are closed or time out. We also increased the max number of
+   open connections from 10 to 100 to prevent a corner case where all connections were used but idle
+   connections were not freed.
+
+   https://github.com/cs3org/reva/pull/2944
+
+ * Enhancement #2962: Per service TracerProvider
+
+   To improve tracing we create separate TracerProviders per service now. This is especially
+   helpful when running multiple reva services in a single process (like e.g. oCIS does).
+
+   https://github.com/cs3org/reva/pull/2962
+   https://github.com/cs3org/reva/pull/2978
+
+ * Enhancement #2911: Allow for dumping and loading shares
+
+   We now have interfaces for dumpable and loadable share manages which can be used to migrate
+   shares between share managers
+
+   https://github.com/cs3org/reva/pull/2911
+
+ * Enhancement #2938: Sharpen tooling
+
+   * We increased the linting timeout to 10min which caused some release builds to time out
+
+   https://github.com/cs3org/reva/pull/2938
 
 
diff --git a/docs/content/en/docs/changelog/2.6.0/_index.md b/docs/content/en/docs/changelog/2.6.0/_index.md
new file mode 100644
index 0000000000..d10170676a
--- /dev/null
+++ b/docs/content/en/docs/changelog/2.6.0/_index.md
@@ -0,0 +1,170 @@
+
+---
+title: "v2.6.0"
+linkTitle: "v2.6.0"
+weight: 40
+description: >
+  Changelog for Reva v2.6.0 (2022-06-21)
+---
+
+Changelog for reva 2.6.0 (2022-06-21)
+=======================================
+
+The following sections list the changes in reva 2.6.0 relevant to
+reva users. The changes are ordered by importance.
+
+Summary
+-------
+
+ * Fix #2985: Make stat requests route based on storage providerid
+ * Fix #2987: Let archiver handle all error codes
+ * Fix #2994: Fix errors when loading shares
+ * Fix #2996: Do not close share dump channels
+ * Fix #2993: Remove unused configuration
+ * Fix #2950: Fix sharing with space ref
+ * Fix #2991: Make sharesstorageprovider get accepted share
+ * Chg #2877: Enable resharing
+ * Chg #2984: Update CS3Apis
+ * Enh #3753: Add executant to the events
+ * Enh #2820: Instrument GRPC and HTTP requests with OTel
+ * Enh #2975: Leverage shares space storageid and type when listing shares
+ * Enh #3882: Explicitly return on ocdav move requests with body
+ * Enh #2932: Stat accepted shares mountpoints, configure existing share updates
+ * Enh #2944: Improve owncloudsql connection management
+ * Enh #2962: Per service TracerProvider
+ * Enh #2911: Allow for dumping and loading shares
+ * Enh #2938: Sharpen tooling
+
+Details
+-------
+
+ * Bugfix #2985: Make stat requests route based on storage providerid
+
+   The gateway now uses a filter mask to only fetch the root id of a space for stat requests. This
+   allows the spaces registry to determine the responsible storage provider without querying
+   the storageproviders.
+
+   https://github.com/cs3org/reva/pull/2985
+
+ * Bugfix #2987: Let archiver handle all error codes
+
+   We fixed the archiver handler to handle all error codes
+
+   https://github.com/cs3org/reva/pull/2987
+
+ * Bugfix #2994: Fix errors when loading shares
+
+   We fixed a bug where loading shares and associated received shares ran into issues when
+   handling them simultaneously.
+
+   https://github.com/cs3org/reva/pull/2994
+
+ * Bugfix #2996: Do not close share dump channels
+
+   We no longer close the channels when dumping shares, it's the responsibility of the caller.
+
+   https://github.com/cs3org/reva/pull/2996
+
+ * Bugfix #2993: Remove unused configuration
+
+   We've fixed removed unused configuration:
+
+   - `insecure` from the dataprovider - `timeout` from the dataprovider - `tmp_folder` from the
+   storageprovider
+
+   https://github.com/cs3org/reva/pull/2993
+
+ * Bugfix #2950: Fix sharing with space ref
+
+   We've fixed a bug where share requests with `path` attribute present ignored the `space_ref`
+   attribute. We now give the `space_ref` attribute precedence over the `path` attribute.
+
+   https://github.com/cs3org/reva/pull/2950
+
+ * Bugfix #2991: Make sharesstorageprovider get accepted share
+
+   The sharesstorageprovider now gets an accepted share instead of filtering all shares.
+
+   https://github.com/cs3org/reva/pull/2991
+
+ * Change #2877: Enable resharing
+
+   This will allow resharing of files. - All Viewers and Editors are now able to reshare files and
+   folders - One can still edit their own shares, even when loosing share permissions - Viewers and
+   Editors in a space are not affected
+
+   https://github.com/cs3org/reva/pull/2877
+
+ * Change #2984: Update CS3Apis
+
+   Updated the CS3Apis to make use of field_mask and pagination for list requests.
+
+   https://github.com/cs3org/reva/pull/2984
+
+ * Enhancement #3753: Add executant to the events
+
+   Added the executant field to all events.
+
+   https://github.com/owncloud/ocis/issues/3753
+   https://github.com/cs3org/reva/pull/2945
+
+ * Enhancement #2820: Instrument GRPC and HTTP requests with OTel
+
+   We've added the enduser.id tag to the HTTP and GRPC requests. We've fixed the tracer names.
+   We've decorated the traces with the hostname.
+
+   https://github.com/cs3org/reva/pull/2820
+
+ * Enhancement #2975: Leverage shares space storageid and type when listing shares
+
+   The list shares call now also fills the storageid to allow the space registry to directly route
+   requests to the correct storageprovider. The spaces registry will now also skip
+   storageproviders that are not configured for a requested type, causing type 'personal'
+   requests to skip the sharestorageprovider.
+
+   https://github.com/cs3org/reva/pull/2975
+   https://github.com/cs3org/reva/pull/2980
+
+ * Enhancement #3882: Explicitly return on ocdav move requests with body
+
+   Added a check if a ocdav move request contains a body. If it does a 415 415 (Unsupported Media
+   Type) will be returned.
+
+   https://github.com/owncloud/ocis/issues/3882
+   https://github.com/cs3org/reva/pull/2974
+
+ * Enhancement #2932: Stat accepted shares mountpoints, configure existing share updates
+
+   https://github.com/cs3org/reva/pull/2932
+
+ * Enhancement #2944: Improve owncloudsql connection management
+
+   The owncloudsql storagedriver is now aware of the request context and will close db
+   connections when http connections are closed or time out. We also increased the max number of
+   open connections from 10 to 100 to prevent a corner case where all connections were used but idle
+   connections were not freed.
+
+   https://github.com/cs3org/reva/pull/2944
+
+ * Enhancement #2962: Per service TracerProvider
+
+   To improve tracing we create separate TracerProviders per service now. This is especially
+   helpful when running multiple reva services in a single process (like e.g. oCIS does).
+
+   https://github.com/cs3org/reva/pull/2962
+   https://github.com/cs3org/reva/pull/2978
+
+ * Enhancement #2911: Allow for dumping and loading shares
+
+   We now have interfaces for dumpable and loadable share manages which can be used to migrate
+   shares between share managers
+
+   https://github.com/cs3org/reva/pull/2911
+
+ * Enhancement #2938: Sharpen tooling
+
+   * We increased the linting timeout to 10min which caused some release builds to time out
+
+   https://github.com/cs3org/reva/pull/2938
+
+
diff --git a/docs/content/en/docs/config/grpc/services/storageprovider/_index.md b/docs/content/en/docs/config/grpc/services/storageprovider/_index.md
index 0873933451..272b9fa9e9 100644
--- a/docs/content/en/docs/config/grpc/services/storageprovider/_index.md
+++ b/docs/content/en/docs/config/grpc/services/storageprovider/_index.md
@@ -9,7 +9,7 @@ description: >
 # _struct: config_
 
 {{% dir name="driver" type="string" default="localhome" %}}
-The storage driver to be used. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L58)
+The storage driver to be used. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L61)
 {{< highlight toml >}}
 [grpc.services.storageprovider]
 driver = "localhome"
@@ -17,7 +17,7 @@ driver = "localhome"
 {{% /dir %}}
 
 {{% dir name="drivers" type="map[string]map[string]interface{}" default="localhome" %}}
- [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L59)
+ [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L62)
 {{< highlight toml >}}
 [grpc.services.storageprovider.drivers.localhome]
 root = "/var/tmp/reva/"
@@ -27,16 +27,8 @@ user_layout = "{{.Username}}"
 {{< /highlight >}}
 {{% /dir %}}
 
-{{% dir name="tmp_folder" type="string" default="/var/tmp" %}}
-Path to temporary folder. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L60)
-{{< highlight toml >}}
-[grpc.services.storageprovider]
-tmp_folder = "/var/tmp"
-{{< /highlight >}}
-{{% /dir %}}
-
 {{% dir name="data_server_url" type="string" default="http://localhost/data" %}}
-The URL for the data server. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L61)
+The URL for the data server. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L63)
 {{< highlight toml >}}
 [grpc.services.storageprovider]
 data_server_url = "http://localhost/data"
@@ -44,7 +36,7 @@ data_server_url = "http://localhost/data"
 {{% /dir %}}
 
 {{% dir name="expose_data_server" type="bool" default=false %}}
-Whether to expose data server. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L62)
+Whether to expose data server. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L64)
 {{< highlight toml >}}
 [grpc.services.storageprovider]
 expose_data_server = false
@@ -52,7 +44,7 @@ expose_data_server = false
 {{% /dir %}}
 
 {{% dir name="available_checksums" type="map[string]uint32" default=nil %}}
-List of available checksums. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L63)
+List of available checksums. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L65)
 {{< highlight toml >}}
 [grpc.services.storageprovider]
 available_checksums = nil
@@ -60,7 +52,7 @@ available_checksums = nil
 {{% /dir %}}
 
 {{% dir name="custom_mimetypes_json" type="string" default="nil" %}}
-An optional mapping file with the list of supported custom file extensions and corresponding mime types. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L64)
+An optional mapping file with the list of supported custom file extensions and corresponding mime types. [[Ref]](https://github.com/cs3org/reva/tree/master/internal/grpc/services/storageprovider/storageprovider.go#L66)
 {{< highlight toml >}}
 [grpc.services.storageprovider]
 custom_mimetypes_json = "nil"