diff --git a/apis/grpc_apis/ocis/messages/eventhistory/v0/grpc.md b/apis/grpc_apis/ocis/messages/eventhistory/v0/grpc.md
index 184cab9cfb9..af9014155ff 100644
--- a/apis/grpc_apis/ocis/messages/eventhistory/v0/grpc.md
+++ b/apis/grpc_apis/ocis/messages/eventhistory/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.messages.eventhistory.v0"
 url: /apis/grpc_apis/ocis_messages_eventhistory_v0
-date: 2024-10-29T07:39:27Z
+date: 2024-10-29T11:06:58Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---
diff --git a/apis/grpc_apis/ocis/messages/policies/v0/grpc.md b/apis/grpc_apis/ocis/messages/policies/v0/grpc.md
index 825e649d2e6..5fa5af4c18d 100644
--- a/apis/grpc_apis/ocis/messages/policies/v0/grpc.md
+++ b/apis/grpc_apis/ocis/messages/policies/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.messages.policies.v0"
 url: /apis/grpc_apis/ocis_messages_policies_v0
-date: 2024-10-29T07:39:27Z
+date: 2024-10-29T11:06:58Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---
diff --git a/apis/grpc_apis/ocis/messages/search/v0/grpc.md b/apis/grpc_apis/ocis/messages/search/v0/grpc.md
index d7ef3f69058..88e7dac6ed1 100644
--- a/apis/grpc_apis/ocis/messages/search/v0/grpc.md
+++ b/apis/grpc_apis/ocis/messages/search/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.messages.search.v0"
 url: /apis/grpc_apis/ocis_messages_search_v0
-date: 2024-10-29T07:39:27Z
+date: 2024-10-29T11:06:58Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---
diff --git a/apis/grpc_apis/ocis/messages/settings/v0/grpc.md b/apis/grpc_apis/ocis/messages/settings/v0/grpc.md
index 06fe994c7b2..afa5aa9c7c9 100644
--- a/apis/grpc_apis/ocis/messages/settings/v0/grpc.md
+++ b/apis/grpc_apis/ocis/messages/settings/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.messages.settings.v0"
 url: /apis/grpc_apis/ocis_messages_settings_v0
-date: 2024-10-29T07:39:27Z
+date: 2024-10-29T11:06:58Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---
diff --git a/apis/grpc_apis/ocis/messages/store/v0/grpc.md b/apis/grpc_apis/ocis/messages/store/v0/grpc.md
index 3119390085e..dd926582a88 100644
--- a/apis/grpc_apis/ocis/messages/store/v0/grpc.md
+++ b/apis/grpc_apis/ocis/messages/store/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.messages.store.v0"
 url: /apis/grpc_apis/ocis_messages_store_v0
-date: 2024-10-29T07:39:27Z
+date: 2024-10-29T11:06:58Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---
diff --git a/apis/grpc_apis/ocis/messages/thumbnails/v0/grpc.md b/apis/grpc_apis/ocis/messages/thumbnails/v0/grpc.md
index 586e3b472ea..e1a2a67f3f7 100644
--- a/apis/grpc_apis/ocis/messages/thumbnails/v0/grpc.md
+++ b/apis/grpc_apis/ocis/messages/thumbnails/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.messages.thumbnails.v0"
 url: /apis/grpc_apis/ocis_messages_thumbnails_v0
-date: 2024-10-29T07:39:27Z
+date: 2024-10-29T11:06:58Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---
diff --git a/apis/grpc_apis/ocis/services/eventhistory/v0/grpc.md b/apis/grpc_apis/ocis/services/eventhistory/v0/grpc.md
index 205f49dc48b..659be47f498 100644
--- a/apis/grpc_apis/ocis/services/eventhistory/v0/grpc.md
+++ b/apis/grpc_apis/ocis/services/eventhistory/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.services.eventhistory.v0"
 url: /apis/grpc_apis/ocis_services_eventhistory_v0
-date: 2024-10-29T07:39:27Z
+date: 2024-10-29T11:06:58Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---
diff --git a/apis/grpc_apis/ocis/services/policies/v0/grpc.md b/apis/grpc_apis/ocis/services/policies/v0/grpc.md
index b53098a375a..3b953113fc8 100644
--- a/apis/grpc_apis/ocis/services/policies/v0/grpc.md
+++ b/apis/grpc_apis/ocis/services/policies/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.services.policies.v0"
 url: /apis/grpc_apis/ocis_services_policies_v0
-date: 2024-10-29T07:39:27Z
+date: 2024-10-29T11:06:58Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---
diff --git a/apis/grpc_apis/ocis/services/search/v0/grpc.md b/apis/grpc_apis/ocis/services/search/v0/grpc.md
index 1dd36a527d5..23ea3c0b972 100644
--- a/apis/grpc_apis/ocis/services/search/v0/grpc.md
+++ b/apis/grpc_apis/ocis/services/search/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.services.search.v0"
 url: /apis/grpc_apis/ocis_services_search_v0
-date: 2024-10-29T07:39:27Z
+date: 2024-10-29T11:06:58Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---
diff --git a/apis/grpc_apis/ocis/services/settings/v0/grpc.md b/apis/grpc_apis/ocis/services/settings/v0/grpc.md
index 376ba1fda35..b01866c2a43 100644
--- a/apis/grpc_apis/ocis/services/settings/v0/grpc.md
+++ b/apis/grpc_apis/ocis/services/settings/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.services.settings.v0"
 url: /apis/grpc_apis/ocis_services_settings_v0
-date: 2024-10-29T07:39:27Z
+date: 2024-10-29T11:06:58Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---
diff --git a/apis/grpc_apis/ocis/services/store/v0/grpc.md b/apis/grpc_apis/ocis/services/store/v0/grpc.md
index 34ff3ab4686..c0fed13d452 100644
--- a/apis/grpc_apis/ocis/services/store/v0/grpc.md
+++ b/apis/grpc_apis/ocis/services/store/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.services.store.v0"
 url: /apis/grpc_apis/ocis_services_store_v0
-date: 2024-10-29T07:39:27Z
+date: 2024-10-29T11:06:58Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---
diff --git a/apis/grpc_apis/ocis/services/thumbnails/v0/grpc.md b/apis/grpc_apis/ocis/services/thumbnails/v0/grpc.md
index 3e9e0e936fb..4e886036c0b 100644
--- a/apis/grpc_apis/ocis/services/thumbnails/v0/grpc.md
+++ b/apis/grpc_apis/ocis/services/thumbnails/v0/grpc.md
@@ -1,7 +1,7 @@
 ---
 title: "ocis.services.thumbnails.v0"
 url: /apis/grpc_apis/ocis_services_thumbnails_v0
-date: 2024-10-29T07:39:27Z
+date: 2024-10-29T11:06:58Z
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
 ---
diff --git a/helpers/env_vars.yaml b/helpers/env_vars.yaml
index 22766e8ce59..94067e64e0c 100644
--- a/helpers/env_vars.yaml
+++ b/helpers/env_vars.yaml
@@ -6220,10 +6220,10 @@ IDM_ADMIN_USER_ID:
   removalVersion: ""
   deprecationInfo: ""
 IDM_CREATE_DEMO_USERS:
-  name: IDM_CREATE_DEMO_USERS
+  name: SETTINGS_SETUP_DEFAULT_ASSIGNMENTS;IDM_CREATE_DEMO_USERS
   defaultValue: "false"
   type: bool
-  description: Flag to enable or disable the creation of the demo users.
+  description: The default role assignments the demo users should be setup.
   introductionVersion: pre5.0
   deprecationVersion: ""
   removalVersion: ""
@@ -7995,12 +7995,12 @@ OCDAV_WEBDAV_NAMESPACE:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_ADMIN_USER_ID:
-  name: OCIS_ADMIN_USER_ID;STORAGE_USERS_PURGE_TRASH_BIN_USER_ID
+  name: OCIS_ADMIN_USER_ID;SETTINGS_ADMIN_USER_ID
   defaultValue: ""
   type: string
-  description: ID of the user who collects all necessary information for deletion.
-    Consider that the UUID can be encoded in some LDAP deployment configurations like
-    in .ldif files. These need to be decoded beforehand.
+  description: ID of the user that should receive admin privileges. Consider that
+    the UUID can be encoded in some LDAP deployment configurations like in .ldif files.
+    These need to be decoded beforehand.
   introductionVersion: pre5.0
   deprecationVersion: ""
   removalVersion: ""
@@ -8016,7 +8016,7 @@ OCIS_ASSET_THEMES_PATH:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_ASYNC_UPLOADS:
-  name: OCIS_ASYNC_UPLOADS
+  name: OCIS_ASYNC_UPLOADS;SEARCH_EVENTS_ASYNC_UPLOADS
   defaultValue: "true"
   type: bool
   description: Enable asynchronous file uploads.
@@ -8025,20 +8025,20 @@ OCIS_ASYNC_UPLOADS:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_CACHE_AUTH_PASSWORD:
-  name: OCIS_CACHE_AUTH_PASSWORD;PROXY_PRESIGNEDURL_SIGNING_KEYS_STORE_AUTH_PASSWORD
+  name: OCIS_CACHE_AUTH_PASSWORD;SETTINGS_CACHE_AUTH_PASSWORD
   defaultValue: ""
   type: string
-  description: The password to authenticate with the store. Only applies when store
+  description: The password to authenticate with the cache. Only applies when store
     type 'nats-js-kv' is configured.
   introductionVersion: "5.0"
   deprecationVersion: ""
   removalVersion: ""
   deprecationInfo: ""
 OCIS_CACHE_AUTH_USERNAME:
-  name: OCIS_CACHE_AUTH_USERNAME;PROXY_PRESIGNEDURL_SIGNING_KEYS_STORE_AUTH_USERNAME
+  name: OCIS_CACHE_AUTH_USERNAME;SETTINGS_CACHE_AUTH_USERNAME
   defaultValue: ""
   type: string
-  description: The username to authenticate with the store. Only applies when store
+  description: The username to authenticate with the cache. Only applies when store
     type 'nats-js-kv' is configured.
   introductionVersion: "5.0"
   deprecationVersion: ""
@@ -8046,7 +8046,7 @@ OCIS_CACHE_AUTH_USERNAME:
   deprecationInfo: ""
 OCIS_CACHE_DATABASE:
   name: OCIS_CACHE_DATABASE
-  defaultValue: cache-userinfo
+  defaultValue: settings-cache
   type: string
   description: The database name the configured store should use.
   introductionVersion: pre5.0
@@ -8054,11 +8054,11 @@ OCIS_CACHE_DATABASE:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_CACHE_DISABLE_PERSISTENCE:
-  name: OCIS_CACHE_DISABLE_PERSISTENCE;PROXY_PRESIGNEDURL_SIGNING_KEYS_STORE_DISABLE_PERSISTENCE
-  defaultValue: "true"
+  name: OCIS_CACHE_DISABLE_PERSISTENCE;SETTINGS_CACHE_DISABLE_PERSISTENCE
+  defaultValue: "false"
   type: bool
-  description: Disables persistence of the store. Only applies when store type 'nats-js-kv'
-    is configured. Defaults to true.
+  description: Disables persistence of the cache. Only applies when store type 'nats-js-kv'
+    is configured. Defaults to false.
   introductionVersion: "5.0"
   deprecationVersion: ""
   removalVersion: ""
@@ -8075,39 +8075,40 @@ OCIS_CACHE_SIZE:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_CACHE_STORE:
-  name: OCIS_CACHE_STORE;PROXY_PRESIGNEDURL_SIGNING_KEYS_STORE
-  defaultValue: nats-js-kv
+  name: OCIS_CACHE_STORE;SETTINGS_CACHE_STORE
+  defaultValue: memory
   type: string
-  description: 'The type of the signing key store. Supported values are: ''redis-sentinel'',
-    ''nats-js-kv'' and ''ocisstoreservice'' (deprecated). See the text description
-    for details.'
-  introductionVersion: "5.0"
+  description: 'The type of the cache store. Supported values are: ''memory'', ''redis-sentinel'',
+    ''nats-js-kv'', ''noop''. See the text description for details.'
+  introductionVersion: pre5.0
   deprecationVersion: ""
   removalVersion: ""
   deprecationInfo: ""
 OCIS_CACHE_STORE_NODES:
-  name: OCIS_CACHE_STORE_NODES;PROXY_PRESIGNEDURL_SIGNING_KEYS_STORE_NODES
+  name: OCIS_CACHE_STORE_NODES;SETTINGS_CACHE_STORE_NODES
   defaultValue: '[127.0.0.1:9233]'
   type: '[]string'
-  description: A list of nodes to access the configured store. Note that the behaviour
-    how nodes are used is dependent on the library of the configured store. See the
-    Environment Variable Types description for more details.
-  introductionVersion: "5.0"
+  description: A list of nodes to access the configured store. This has no effect
+    when 'memory' store is configured. Note that the behaviour how nodes are used
+    is dependent on the library of the configured store. See the Environment Variable
+    Types description for more details.
+  introductionVersion: pre5.0
   deprecationVersion: ""
   removalVersion: ""
   deprecationInfo: ""
 OCIS_CACHE_TTL:
-  name: OCIS_CACHE_TTL;PROXY_PRESIGNEDURL_SIGNING_KEYS_STORE_TTL
-  defaultValue: 12h0m0s
+  name: OCIS_CACHE_TTL;SETTINGS_CACHE_TTL
+  defaultValue: 10m0s
   type: Duration
-  description: Default time to live for signing keys. See the Environment Variable
-    Types description for more details.
-  introductionVersion: "5.0"
+  description: Default time to live for entries in the cache. Only applied when access
+    tokens has no expiration. See the Environment Variable Types description for more
+    details.
+  introductionVersion: pre5.0
   deprecationVersion: ""
   removalVersion: ""
   deprecationInfo: ""
 OCIS_CORS_ALLOW_CREDENTIALS:
-  name: OCIS_CORS_ALLOW_CREDENTIALS;WEBDAV_CORS_ALLOW_CREDENTIALS
+  name: OCIS_CORS_ALLOW_CREDENTIALS;USERLOG_CORS_ALLOW_CREDENTIALS
   defaultValue: "true"
   type: bool
   description: 'Allow credentials for CORS.See following chapter for more details:
@@ -8117,9 +8118,9 @@ OCIS_CORS_ALLOW_CREDENTIALS:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_CORS_ALLOW_HEADERS:
-  name: OCIS_CORS_ALLOW_HEADERS;WEBDAV_CORS_ALLOW_HEADERS
+  name: OCIS_CORS_ALLOW_HEADERS;USERLOG_CORS_ALLOW_HEADERS
   defaultValue: '[Authorization Origin Content-Type Accept X-Requested-With X-Request-Id
-    Cache-Control]'
+    Ocs-Apirequest]'
   type: '[]string'
   description: 'A list of allowed CORS headers. See following chapter for more details:
     *Access-Control-Request-Headers* at https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Request-Headers.
@@ -8129,8 +8130,8 @@ OCIS_CORS_ALLOW_HEADERS:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_CORS_ALLOW_METHODS:
-  name: OCIS_CORS_ALLOW_METHODS;WEBDAV_CORS_ALLOW_METHODS
-  defaultValue: '[GET POST PUT PATCH DELETE OPTIONS]'
+  name: OCIS_CORS_ALLOW_METHODS;USERLOG_CORS_ALLOW_METHODS
+  defaultValue: '[GET]'
   type: '[]string'
   description: 'A list of allowed CORS methods. See following chapter for more details:
     *Access-Control-Request-Method* at https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Request-Method.
@@ -8140,7 +8141,7 @@ OCIS_CORS_ALLOW_METHODS:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_CORS_ALLOW_ORIGINS:
-  name: OCIS_CORS_ALLOW_ORIGINS;WEBDAV_CORS_ALLOW_ORIGINS
+  name: OCIS_CORS_ALLOW_ORIGINS;USERLOG_CORS_ALLOW_ORIGINS
   defaultValue: '[*]'
   type: '[]string'
   description: 'A list of allowed CORS origins. See following chapter for more details:
@@ -8247,7 +8248,7 @@ OCIS_DISABLE_VERSIONING:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_EDITION:
-  name: OCIS_EDITION;FRONTEND_EDITION
+  name: OCIS_EDITION;OCDAV_EDITION
   defaultValue: Community
   type: string
   description: Edition of oCIS. Used for branding purposes.
@@ -8345,11 +8346,11 @@ OCIS_EVENTS_TLS_ROOT_CA_CERTIFICATE:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_GATEWAY_GRPC_ADDR:
-  name: OCIS_GATEWAY_GRPC_ADDR;STORAGE_USERS_GATEWAY_GRPC_ADDR
+  name: OCIS_GATEWAY_GRPC_ADDR;GATEWAY_GRPC_ADDR
   defaultValue: 127.0.0.1:9142
   type: string
-  description: The bind address of the gateway GRPC address.
-  introductionVersion: "5.0"
+  description: The bind address of the GRPC service.
+  introductionVersion: pre5.0
   deprecationVersion: ""
   removalVersion: ""
   deprecationInfo: ""
@@ -8377,11 +8378,11 @@ OCIS_GRPC_CLIENT_TLS_MODE:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_GRPC_PROTOCOL:
-  name: OCIS_GRPC_PROTOCOL;APP_PROVIDER_GRPC_PROTOCOL
+  name: OCIS_GRPC_PROTOCOL;AUTH_SERVICE_GRPC_PROTOCOL
   defaultValue: ""
   type: string
-  description: The transport protocol of the GPRC service.
-  introductionVersion: pre5.0
+  description: The transport protocol of the GRPC service.
+  introductionVersion: "5.0"
   deprecationVersion: ""
   removalVersion: ""
   deprecationInfo: ""
@@ -8426,7 +8427,7 @@ OCIS_INSECURE:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_JWT_SECRET:
-  name: OCIS_JWT_SECRET;APP_PROVIDER_JWT_SECRET
+  name: OCIS_JWT_SECRET;USERLOG_JWT_SECRET
   defaultValue: ""
   type: string
   description: The secret to mint and validate jwt tokens.
@@ -8520,20 +8521,20 @@ OCIS_LDAP_CACERT:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_LDAP_DISABLE_USER_MECHANISM:
-  name: OCIS_LDAP_DISABLE_USER_MECHANISM;GRAPH_DISABLE_USER_MECHANISM
+  name: OCIS_LDAP_DISABLE_USER_MECHANISM;USERS_LDAP_DISABLE_USER_MECHANISM
   defaultValue: attribute
   type: string
-  description: An option to control the behavior for disabling users. Supported options
+  description: An option to control the behavior for disabling users. Valid options
     are 'none', 'attribute' and 'group'. If set to 'group', disabling a user via API
     will add the user to the configured group for disabled users, if set to 'attribute'
     this will be done in the ldap user entry, if set to 'none' the disable request
-    is not processed. Default is 'attribute'.
+    is not processed.
   introductionVersion: pre5.0
   deprecationVersion: ""
   removalVersion: ""
   deprecationInfo: ""
 OCIS_LDAP_DISABLED_USERS_GROUP_DN:
-  name: OCIS_LDAP_DISABLED_USERS_GROUP_DN;GRAPH_DISABLED_USERS_GROUP_DN
+  name: OCIS_LDAP_DISABLED_USERS_GROUP_DN;USERS_LDAP_DISABLED_USERS_GROUP_DN
   defaultValue: cn=DisabledUsersGroup,ou=groups,o=libregraph-idm
   type: string
   description: The distinguished name of the group to which added users will be classified
@@ -8543,7 +8544,7 @@ OCIS_LDAP_DISABLED_USERS_GROUP_DN:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_LDAP_GROUP_BASE_DN:
-  name: OCIS_LDAP_GROUP_BASE_DN;GRAPH_LDAP_GROUP_BASE_DN
+  name: OCIS_LDAP_GROUP_BASE_DN;USERS_LDAP_GROUP_BASE_DN
   defaultValue: ou=groups,o=libregraph-idm
   type: string
   description: Search base DN for looking up LDAP groups.
@@ -8552,7 +8553,7 @@ OCIS_LDAP_GROUP_BASE_DN:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_LDAP_GROUP_FILTER:
-  name: OCIS_LDAP_GROUP_FILTER;GRAPH_LDAP_GROUP_FILTER
+  name: OCIS_LDAP_GROUP_FILTER;USERS_LDAP_GROUP_FILTER
   defaultValue: ""
   type: string
   description: LDAP filter to add to the default filters for group searches.
@@ -8561,17 +8562,17 @@ OCIS_LDAP_GROUP_FILTER:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_LDAP_GROUP_OBJECTCLASS:
-  name: OCIS_LDAP_GROUP_OBJECTCLASS;GRAPH_LDAP_GROUP_OBJECTCLASS
+  name: OCIS_LDAP_GROUP_OBJECTCLASS;USERS_LDAP_GROUP_OBJECTCLASS
   defaultValue: groupOfNames
   type: string
   description: The object class to use for groups in the default group search filter
-    ('groupOfNames').
+    like 'groupOfNames'.
   introductionVersion: pre5.0
   deprecationVersion: ""
   removalVersion: ""
   deprecationInfo: ""
 OCIS_LDAP_GROUP_SCHEMA_DISPLAYNAME:
-  name: OCIS_LDAP_GROUP_SCHEMA_DISPLAYNAME;GROUPS_LDAP_GROUP_SCHEMA_DISPLAYNAME
+  name: OCIS_LDAP_GROUP_SCHEMA_DISPLAYNAME;USERS_LDAP_GROUP_SCHEMA_DISPLAYNAME
   defaultValue: cn
   type: string
   description: LDAP Attribute to use for the displayname of groups (often the same
@@ -8581,7 +8582,7 @@ OCIS_LDAP_GROUP_SCHEMA_DISPLAYNAME:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_LDAP_GROUP_SCHEMA_GROUPNAME:
-  name: OCIS_LDAP_GROUP_SCHEMA_GROUPNAME;GRAPH_LDAP_GROUP_NAME_ATTRIBUTE
+  name: OCIS_LDAP_GROUP_SCHEMA_GROUPNAME;USERS_LDAP_GROUP_SCHEMA_GROUPNAME
   defaultValue: cn
   type: string
   description: LDAP Attribute to use for the name of groups.
@@ -8590,28 +8591,28 @@ OCIS_LDAP_GROUP_SCHEMA_GROUPNAME:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_LDAP_GROUP_SCHEMA_ID:
-  name: OCIS_LDAP_GROUP_SCHEMA_ID;GRAPH_LDAP_GROUP_ID_ATTRIBUTE
-  defaultValue: owncloudUUID
+  name: OCIS_LDAP_GROUP_SCHEMA_ID;USERS_LDAP_GROUP_SCHEMA_ID
+  defaultValue: ownclouduuid
   type: string
-  description: LDAP Attribute to use as the unique id for groups. This should be a
+  description: LDAP Attribute to use as the unique ID for groups. This should be a
     stable globally unique ID like a UUID.
   introductionVersion: pre5.0
   deprecationVersion: ""
   removalVersion: ""
   deprecationInfo: ""
 OCIS_LDAP_GROUP_SCHEMA_ID_IS_OCTETSTRING:
-  name: OCIS_LDAP_GROUP_SCHEMA_ID_IS_OCTETSTRING;GRAPH_LDAP_GROUP_SCHEMA_ID_IS_OCTETSTRING
+  name: OCIS_LDAP_GROUP_SCHEMA_ID_IS_OCTETSTRING;USERS_LDAP_GROUP_SCHEMA_ID_IS_OCTETSTRING
   defaultValue: "false"
   type: bool
-  description: Set this to true if the defined 'ID' attribute for groups is of the
-    'OCTETSTRING' syntax. This is required when using the 'objectGUID' attribute of
-    Active Directory for the group ID's.
+  description: Set this to true if the defined 'id' attribute for groups is of the
+    'OCTETSTRING' syntax. This is e.g. required when using the 'objectGUID' attribute
+    of Active Directory for the group ID's.
   introductionVersion: pre5.0
   deprecationVersion: ""
   removalVersion: ""
   deprecationInfo: ""
 OCIS_LDAP_GROUP_SCHEMA_MAIL:
-  name: OCIS_LDAP_GROUP_SCHEMA_MAIL;GROUPS_LDAP_GROUP_SCHEMA_MAIL
+  name: OCIS_LDAP_GROUP_SCHEMA_MAIL;USERS_LDAP_GROUP_SCHEMA_MAIL
   defaultValue: mail
   type: string
   description: LDAP Attribute to use for the email address of groups (can be empty).
@@ -8620,7 +8621,7 @@ OCIS_LDAP_GROUP_SCHEMA_MAIL:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_LDAP_GROUP_SCHEMA_MEMBER:
-  name: OCIS_LDAP_GROUP_SCHEMA_MEMBER;GRAPH_LDAP_GROUP_MEMBER_ATTRIBUTE
+  name: OCIS_LDAP_GROUP_SCHEMA_MEMBER;USERS_LDAP_GROUP_SCHEMA_MEMBER
   defaultValue: member
   type: string
   description: LDAP Attribute that is used for group members.
@@ -8629,10 +8630,10 @@ OCIS_LDAP_GROUP_SCHEMA_MEMBER:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_LDAP_GROUP_SCOPE:
-  name: OCIS_LDAP_GROUP_SCOPE;GRAPH_LDAP_GROUP_SEARCH_SCOPE
+  name: OCIS_LDAP_GROUP_SCOPE;USERS_LDAP_GROUP_SCOPE
   defaultValue: sub
   type: string
-  description: LDAP search scope to use when looking up groups. Supported scopes are
+  description: LDAP search scope to use when looking up groups. Supported values are
     'base', 'one' and 'sub'.
   introductionVersion: pre5.0
   deprecationVersion: ""
@@ -8706,10 +8707,10 @@ OCIS_LDAP_USER_OBJECTCLASS:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_LDAP_USER_SCHEMA_DISPLAYNAME:
-  name: OCIS_LDAP_USER_SCHEMA_DISPLAYNAME;LDAP_USER_SCHEMA_DISPLAY_NAME;GRAPH_LDAP_USER_DISPLAYNAME_ATTRIBUTE
-  defaultValue: displayName
+  name: OCIS_LDAP_USER_SCHEMA_DISPLAYNAME;USERS_LDAP_USER_SCHEMA_DISPLAYNAME
+  defaultValue: displayname
   type: string
-  description: LDAP Attribute to use for the display name of users.
+  description: LDAP Attribute to use for the displayname of users.
   introductionVersion: pre5.0
   deprecationVersion: ""
   removalVersion: ""
@@ -8724,12 +8725,12 @@ OCIS_LDAP_USER_SCHEMA_ID:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_LDAP_USER_SCHEMA_ID_IS_OCTETSTRING:
-  name: OCIS_LDAP_USER_SCHEMA_ID_IS_OCTETSTRING;GRAPH_LDAP_USER_SCHEMA_ID_IS_OCTETSTRING
+  name: OCIS_LDAP_USER_SCHEMA_ID_IS_OCTETSTRING;USERS_LDAP_USER_SCHEMA_ID_IS_OCTETSTRING
   defaultValue: "false"
   type: bool
   description: Set this to true if the defined 'ID' attribute for users is of the
-    'OCTETSTRING' syntax. This is required when using the 'objectGUID' attribute of
-    Active Directory for the user ID's.
+    'OCTETSTRING' syntax. This is e.g. required when using the 'objectGUID' attribute
+    of Active Directory for the user ID's.
   introductionVersion: pre5.0
   deprecationVersion: ""
   removalVersion: ""
@@ -8744,7 +8745,7 @@ OCIS_LDAP_USER_SCHEMA_MAIL:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_LDAP_USER_SCHEMA_USER_TYPE:
-  name: OCIS_LDAP_USER_SCHEMA_USER_TYPE;GRAPH_LDAP_USER_TYPE_ATTRIBUTE
+  name: OCIS_LDAP_USER_SCHEMA_USER_TYPE;USERS_LDAP_USER_TYPE_ATTRIBUTE
   defaultValue: ownCloudUserType
   type: string
   description: LDAP Attribute to distinguish between 'Member' and 'Guest' users. Default
@@ -8773,7 +8774,7 @@ OCIS_LDAP_USER_SCOPE:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_LOG_COLOR:
-  name: OCIS_LOG_COLOR;APP_PROVIDER_LOG_COLOR
+  name: OCIS_LOG_COLOR;USERLOG_LOG_COLOR
   defaultValue: "false"
   type: bool
   description: Activates colorized log output.
@@ -8782,7 +8783,7 @@ OCIS_LOG_COLOR:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_LOG_FILE:
-  name: OCIS_LOG_FILE;APP_PROVIDER_LOG_FILE
+  name: OCIS_LOG_FILE;USERLOG_LOG_FILE
   defaultValue: ""
   type: string
   description: The path to the log file. Activates logging to this file if set.
@@ -8791,7 +8792,7 @@ OCIS_LOG_FILE:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_LOG_LEVEL:
-  name: OCIS_LOG_LEVEL;APP_PROVIDER_LOG_LEVEL
+  name: OCIS_LOG_LEVEL;USERLOG_LOG_LEVEL
   defaultValue: ""
   type: string
   description: 'The log level. Valid values are: ''panic'', ''fatal'', ''error'',
@@ -8801,7 +8802,7 @@ OCIS_LOG_LEVEL:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_LOG_PRETTY:
-  name: OCIS_LOG_PRETTY;APP_PROVIDER_LOG_PRETTY
+  name: OCIS_LOG_PRETTY;USERLOG_LOG_PRETTY
   defaultValue: "false"
   type: bool
   description: Activates pretty log output.
@@ -8982,7 +8983,7 @@ OCIS_REVA_GATEWAY:
   name: OCIS_REVA_GATEWAY
   defaultValue: com.owncloud.api.gateway
   type: string
-  description: The CS3 gateway endpoint.
+  description: CS3 gateway used to look up user metadata
   introductionVersion: pre5.0
   deprecationVersion: ""
   removalVersion: ""
@@ -9072,7 +9073,7 @@ OCIS_SPACES_MAX_QUOTA:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_SYSTEM_USER_API_KEY:
-  name: OCIS_SYSTEM_USER_API_KEY;SHARING_PUBLIC_CS3_SYSTEM_USER_API_KEY
+  name: OCIS_SYSTEM_USER_API_KEY
   defaultValue: ""
   type: string
   description: API key for the STORAGE-SYSTEM system user.
@@ -9081,7 +9082,7 @@ OCIS_SYSTEM_USER_API_KEY:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_SYSTEM_USER_ID:
-  name: OCIS_SYSTEM_USER_ID;SHARING_PUBLIC_CS3_SYSTEM_USER_ID
+  name: OCIS_SYSTEM_USER_ID;SETTINGS_SYSTEM_USER_ID
   defaultValue: ""
   type: string
   description: ID of the oCIS STORAGE-SYSTEM system user. Admins need to set the ID
@@ -9093,7 +9094,7 @@ OCIS_SYSTEM_USER_ID:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_SYSTEM_USER_IDP:
-  name: OCIS_SYSTEM_USER_IDP;SHARING_PUBLIC_CS3_SYSTEM_USER_IDP
+  name: OCIS_SYSTEM_USER_IDP;SETTINGS_SYSTEM_USER_IDP
   defaultValue: internal
   type: string
   description: IDP of the oCIS STORAGE-SYSTEM system user.
@@ -9102,7 +9103,7 @@ OCIS_SYSTEM_USER_IDP:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_TRACING_COLLECTOR:
-  name: OCIS_TRACING_COLLECTOR;APP_PROVIDER_TRACING_COLLECTOR
+  name: OCIS_TRACING_COLLECTOR;USERLOG_TRACING_COLLECTOR
   defaultValue: ""
   type: string
   description: The HTTP endpoint for sending spans directly to a collector, i.e. http://jaeger-collector:14268/api/traces.
@@ -9112,7 +9113,7 @@ OCIS_TRACING_COLLECTOR:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_TRACING_ENABLED:
-  name: OCIS_TRACING_ENABLED;APP_PROVIDER_TRACING_ENABLED
+  name: OCIS_TRACING_ENABLED;USERLOG_TRACING_ENABLED
   defaultValue: "false"
   type: bool
   description: Activates tracing.
@@ -9121,7 +9122,7 @@ OCIS_TRACING_ENABLED:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_TRACING_ENDPOINT:
-  name: OCIS_TRACING_ENDPOINT;APP_PROVIDER_TRACING_ENDPOINT
+  name: OCIS_TRACING_ENDPOINT;USERLOG_TRACING_ENDPOINT
   defaultValue: ""
   type: string
   description: The endpoint of the tracing agent.
@@ -9130,7 +9131,7 @@ OCIS_TRACING_ENDPOINT:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_TRACING_TYPE:
-  name: OCIS_TRACING_TYPE;APP_PROVIDER_TRACING_TYPE
+  name: OCIS_TRACING_TYPE;USERLOG_TRACING_TYPE
   defaultValue: ""
   type: string
   description: The type of tracing. Defaults to '', which is the same as 'jaeger'.
@@ -9143,7 +9144,7 @@ OCIS_TRANSFER_SECRET:
   name: OCIS_TRANSFER_SECRET
   defaultValue: ""
   type: string
-  description: Transfer secret for signing file up- and download requests.
+  description: The storage transfer secret.
   introductionVersion: pre5.0
   deprecationVersion: ""
   removalVersion: ""
@@ -9160,11 +9161,10 @@ OCIS_TRANSLATION_PATH:
   removalVersion: ""
   deprecationInfo: ""
 OCIS_URL:
-  name: OCIS_URL;APP_PROVIDER_WOPI_FOLDER_URL_BASE_URL
-  defaultValue: https://localhost:9200/
+  name: OCIS_URL;OCIS_OIDC_ISSUER;IDP_ISS
+  defaultValue: https://localhost:9200
   type: string
-  description: Base url to navigate back from the app to the containing folder in
-    the file list.
+  description: The OIDC issuer URL to use.
   introductionVersion: pre5.0
   deprecationVersion: ""
   removalVersion: ""
diff --git a/services/_includes/adoc/activitylog_configvars.adoc b/services/_includes/adoc/activitylog_configvars.adoc
index 18fa58c5359..bd2db7aa51c 100644
--- a/services/_includes/adoc/activitylog_configvars.adoc
+++ b/services/_includes/adoc/activitylog_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the activitylog service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/antivirus_configvars.adoc b/services/_includes/adoc/antivirus_configvars.adoc
index b2afa0897d9..372371360c0 100644
--- a/services/_includes/adoc/antivirus_configvars.adoc
+++ b/services/_includes/adoc/antivirus_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the antivirus service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/app-provider_configvars.adoc b/services/_includes/adoc/app-provider_configvars.adoc
index 040ea113262..a590edec5bf 100644
--- a/services/_includes/adoc/app-provider_configvars.adoc
+++ b/services/_includes/adoc/app-provider_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the app-provider service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/app-registry_configvars.adoc b/services/_includes/adoc/app-registry_configvars.adoc
index 3e69e70dd56..700d9994f6f 100644
--- a/services/_includes/adoc/app-registry_configvars.adoc
+++ b/services/_includes/adoc/app-registry_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the app-registry service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/audit_configvars.adoc b/services/_includes/adoc/audit_configvars.adoc
index f3933117489..964c0096642 100644
--- a/services/_includes/adoc/audit_configvars.adoc
+++ b/services/_includes/adoc/audit_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the audit service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/auth-app_configvars.adoc b/services/_includes/adoc/auth-app_configvars.adoc
index 99c548bcc88..f3e2a1edf30 100644
--- a/services/_includes/adoc/auth-app_configvars.adoc
+++ b/services/_includes/adoc/auth-app_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the auth-app service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/auth-basic_configvars.adoc b/services/_includes/adoc/auth-basic_configvars.adoc
index bd5cc080d4b..f996741497f 100644
--- a/services/_includes/adoc/auth-basic_configvars.adoc
+++ b/services/_includes/adoc/auth-basic_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the auth-basic service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/auth-bearer_configvars.adoc b/services/_includes/adoc/auth-bearer_configvars.adoc
index 09c6edf78fd..04a6b72e8d5 100644
--- a/services/_includes/adoc/auth-bearer_configvars.adoc
+++ b/services/_includes/adoc/auth-bearer_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the auth-bearer service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/auth-machine_configvars.adoc b/services/_includes/adoc/auth-machine_configvars.adoc
index 93a7821f9fe..a4866b05e1b 100644
--- a/services/_includes/adoc/auth-machine_configvars.adoc
+++ b/services/_includes/adoc/auth-machine_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the auth-machine service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/auth-service_configvars.adoc b/services/_includes/adoc/auth-service_configvars.adoc
index fef014b0f8a..bde10df27ec 100644
--- a/services/_includes/adoc/auth-service_configvars.adoc
+++ b/services/_includes/adoc/auth-service_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the auth-service service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/clientlog_configvars.adoc b/services/_includes/adoc/clientlog_configvars.adoc
index d01455e1434..fd16705240e 100644
--- a/services/_includes/adoc/clientlog_configvars.adoc
+++ b/services/_includes/adoc/clientlog_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the clientlog service
 [width="100%",cols="~,~,~,~",options="header"]
@@ -190,7 +190,7 @@ The secret to mint and validate jwt tokens.
 
 a|`OCIS_REVA_GATEWAY` +
 `CLIENTLOG_REVA_GATEWAY` +
-xref:deprecation-note-2024-10-29-07-39-42[Deprecation Note]
+xref:deprecation-note-2024-10-29-11-07-12[Deprecation Note]
 a| [subs=-attributes]
 ++5.0 ++
 a| [subs=-attributes]
diff --git a/services/_includes/adoc/collaboration_configvars.adoc b/services/_includes/adoc/collaboration_configvars.adoc
index 711c48f8208..54c0be972e9 100644
--- a/services/_includes/adoc/collaboration_configvars.adoc
+++ b/services/_includes/adoc/collaboration_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the collaboration service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/eventhistory_configvars.adoc b/services/_includes/adoc/eventhistory_configvars.adoc
index d8d41af1f1c..66c88680b8c 100644
--- a/services/_includes/adoc/eventhistory_configvars.adoc
+++ b/services/_includes/adoc/eventhistory_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the eventhistory service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/frontend_configvars.adoc b/services/_includes/adoc/frontend_configvars.adoc
index 3934587f3a6..47777fae290 100644
--- a/services/_includes/adoc/frontend_configvars.adoc
+++ b/services/_includes/adoc/frontend_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the frontend service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/gateway_configvars.adoc b/services/_includes/adoc/gateway_configvars.adoc
index c1bbe475b4e..e5e27388d3b 100644
--- a/services/_includes/adoc/gateway_configvars.adoc
+++ b/services/_includes/adoc/gateway_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the gateway service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/global_configvars.adoc b/services/_includes/adoc/global_configvars.adoc
index 80c95afcd24..6aa2a360c88 100644
--- a/services/_includes/adoc/global_configvars.adoc
+++ b/services/_includes/adoc/global_configvars.adoc
@@ -90,7 +90,7 @@ a| [subs=-attributes]
 ++ ++
 
 a| [subs=-attributes]
-The password to authenticate with the store. Only applies when store type 'nats-js-kv' is configured.
+The password to authenticate with the cache. Only applies when store type 'nats-js-kv' is configured.
 a| `OCIS_CACHE_AUTH_USERNAME`
 
 a| [subs=-attributes]
@@ -116,7 +116,7 @@ a| [subs=-attributes]
 ++ ++
 
 a| [subs=-attributes]
-The username to authenticate with the store. Only applies when store type 'nats-js-kv' is configured.
+The username to authenticate with the cache. Only applies when store type 'nats-js-kv' is configured.
 a| `OCIS_CACHE_DATABASE`
 
 a| [subs=-attributes]
@@ -168,7 +168,7 @@ Disables persistence of the cache. Only applies when store type 'nats-js-kv' is
 a| `OCIS_CACHE_STORE`
 
 a| [subs=-attributes]
-++5.0 ++
+++pre5.0 ++
 
 a| [subs=attributes+]
 * xref:{s-path}/frontend.adoc[frontend] +
@@ -187,14 +187,14 @@ a| [subs=-attributes]
 ++string ++
 
 a| [subs=-attributes]
-++nats-js-kv ++
+++memory ++
 
 a| [subs=-attributes]
-The type of the signing key store. Supported values are: 'redis-sentinel' and 'nats-js-kv'. See the text description for details.
+The type of the cache store. Supported values are: 'memory', 'redis-sentinel', 'nats-js-kv', 'noop'. See the text description for details.
 a| `OCIS_CACHE_STORE_NODES`
 
 a| [subs=-attributes]
-++5.0 ++
+++pre5.0 ++
 
 a| [subs=attributes+]
 * xref:{s-path}/frontend.adoc[frontend] +
@@ -216,11 +216,11 @@ a| [subs=-attributes]
 ++[127.0.0.1:9233] ++
 
 a| [subs=-attributes]
-A list of nodes to access the configured store. Note that the behaviour how nodes are used is dependent on the library of the configured store. See the Environment Variable Types description for more details.
+A list of nodes to access the configured store. This has no effect when 'memory' store is configured. Note that the behaviour how nodes are used is dependent on the library of the configured store. See the Environment Variable Types description for more details.
 a| `OCIS_CACHE_TTL`
 
 a| [subs=-attributes]
-++5.0 ++
+++pre5.0 ++
 
 a| [subs=attributes+]
 * xref:{s-path}/frontend.adoc[frontend] +
@@ -239,10 +239,10 @@ a| [subs=-attributes]
 ++Duration ++
 
 a| [subs=-attributes]
-++12h0m0s ++
+++10m0s ++
 
 a| [subs=-attributes]
-Default time to live for signing keys. See the Environment Variable Types description for more details.
+Default time to live for entries in the cache. Only applied when access tokens has no expiration. See the Environment Variable Types description for more details.
 a| `OCIS_CORS_ALLOW_CREDENTIALS`
 
 a| [subs=-attributes]
@@ -301,7 +301,7 @@ a| [subs=-attributes]
 ++[]string ++
 
 a| [subs=-attributes]
-++[Authorization Origin Content-Type Accept X-Requested-With X-Request-Id Cache-Control] ++
+++[Authorization Origin Content-Type Accept X-Requested-With X-Request-Id] ++
 
 a| [subs=-attributes]
 A list of allowed CORS headers. See following chapter for more details: *Access-Control-Request-Headers* at \https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Request-Headers. See the Environment Variable Types description for more details.
@@ -441,7 +441,7 @@ Edition of oCIS. Used for branding purposes.
 a| `OCIS_ENABLE_OCM`
 
 a| [subs=-attributes]
-++5.0 ++
+++pre5.0 ++
 
 a| [subs=attributes+]
 * xref:{s-path}/frontend.adoc[frontend] +
@@ -457,7 +457,7 @@ a| [subs=-attributes]
 ++false ++
 
 a| [subs=-attributes]
-Include OCM sharees when listing users.
+Changing this value is NOT supported. Enables support for incoming federated sharing for clients. The backend behaviour is not changed.
 a| `OCIS_EVENTS_AUTH_PASSWORD`
 
 a| [subs=-attributes]
@@ -489,7 +489,7 @@ a| [subs=-attributes]
 ++ ++
 
 a| [subs=-attributes]
-The password to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services.
+Password for the events broker.
 a| `OCIS_EVENTS_AUTH_USERNAME`
 
 a| [subs=-attributes]
@@ -521,7 +521,7 @@ a| [subs=-attributes]
 ++ ++
 
 a| [subs=-attributes]
-The username to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services.
+Username for the events broker.
 a| `OCIS_EVENTS_CLUSTER`
 
 a| [subs=-attributes]
@@ -649,11 +649,11 @@ a| [subs=-attributes]
 ++ ++
 
 a| [subs=-attributes]
-The root CA certificate used to validate the server's TLS certificate. If provided POLICIES_EVENTS_TLS_INSECURE will be seen as false.
+The root CA certificate used to validate the server's TLS certificate. If provided SHARING_EVENTS_TLS_INSECURE will be seen as false.
 a| `OCIS_GATEWAY_GRPC_ADDR`
 
 a| [subs=-attributes]
-++pre5.0 ++
+++5.0 ++
 
 a| [subs=attributes+]
 * xref:{s-path}/gateway.adoc[gateway] +
@@ -666,7 +666,7 @@ a| [subs=-attributes]
 ++127.0.0.1:9142 ++
 
 a| [subs=-attributes]
-The bind address of the GRPC service.
+The bind address of the gateway GRPC address.
 a| `OCIS_GRPC_CLIENT_TLS_CACERT`
 
 a| [subs=-attributes]
@@ -774,7 +774,7 @@ a| [subs=-attributes]
 ++tcp ++
 
 a| [subs=-attributes]
-The transport protocol of the GPRC service.
+The transport protocol of the GRPC service.
 a| `OCIS_HTTP_TLS_CERTIFICATE`
 
 a| [subs=-attributes]
@@ -900,7 +900,7 @@ a| [subs=-attributes]
 ++false ++
 
 a| [subs=-attributes]
-Whether the server should skip the client certificate verification during the TLS handshake.
+Whether to verify the server TLS certificates.
 a| `OCIS_JWT_SECRET`
 
 a| [subs=-attributes]
@@ -978,7 +978,7 @@ a| [subs=-attributes]
 ++ ++
 
 a| [subs=-attributes]
-The client id to authenticate with keycloak.
+The client ID to authenticate with keycloak.
 a| `OCIS_KEYCLOAK_CLIENT_REALM`
 
 a| [subs=-attributes]
@@ -1199,7 +1199,7 @@ a| [subs=-attributes]
 ++groupOfNames ++
 
 a| [subs=-attributes]
-The object class to use for groups in the default group search filter like 'groupOfNames'.
+The object class to use for groups in the default group search filter ('groupOfNames').
 a| `OCIS_LDAP_GROUP_SCHEMA_DISPLAYNAME`
 
 a| [subs=-attributes]
@@ -1255,7 +1255,7 @@ a| [subs=-attributes]
 ++ownclouduuid ++
 
 a| [subs=-attributes]
-LDAP Attribute to use as the unique ID for groups. This should be a stable globally unique ID like a UUID.
+LDAP Attribute to use as the unique id for groups. This should be a stable globally unique id (e.g. a UUID).
 a| `OCIS_LDAP_GROUP_SCHEMA_ID_IS_OCTETSTRING`
 
 a| [subs=-attributes]
@@ -1274,7 +1274,7 @@ a| [subs=-attributes]
 ++false ++
 
 a| [subs=-attributes]
-Set this to true if the defined 'id' attribute for groups is of the 'OCTETSTRING' syntax. This is e.g. required when using the 'objectGUID' attribute of Active Directory for the group ID's.
+Set this to true if the defined 'id' attribute for groups is of the 'OCTETSTRING' syntax. This is e.g. required when using the 'objectGUID' attribute of Active Directory for the group IDs.
 a| `OCIS_LDAP_GROUP_SCHEMA_MAIL`
 
 a| [subs=-attributes]
@@ -1466,7 +1466,7 @@ a| [subs=-attributes]
 ++inetOrgPerson ++
 
 a| [subs=-attributes]
-The object class to use for users in the default user search filter like 'inetOrgPerson'.
+The object class to use for users in the default user search filter ('inetOrgPerson').
 a| `OCIS_LDAP_USER_SCHEMA_DISPLAYNAME`
 
 a| [subs=-attributes]
@@ -1524,7 +1524,7 @@ a| [subs=-attributes]
 ++false ++
 
 a| [subs=-attributes]
-Set this to true if the defined 'ID' attribute for users is of the 'OCTETSTRING' syntax. This is e.g. required when using the 'objectGUID' attribute of Active Directory for the user ID's.
+Set this to true if the defined 'ID' attribute for users is of the 'OCTETSTRING' syntax. This is e.g. required when using the 'objectGUID' attribute of Active Directory for the user IDs.
 a| `OCIS_LDAP_USER_SCHEMA_MAIL`
 
 a| [subs=-attributes]
@@ -1833,7 +1833,7 @@ Activates pretty log output.
 a| `OCIS_MACHINE_AUTH_API_KEY`
 
 a| [subs=-attributes]
-++7.0.0 ++
+++pre5.0 ++
 
 a| [subs=attributes+]
 * xref:{s-path}/auth-app.adoc[auth-app] +
@@ -1851,7 +1851,7 @@ a| [subs=-attributes]
 ++ ++
 
 a| [subs=-attributes]
-The machine auth API key used to validate internal requests necessary to access resources from other services.
+Machine auth API key used to validate internal requests necessary for the access to resources from other services.
 a| `OCIS_OIDC_ISSUER`
 
 a| [subs=-attributes]
@@ -1998,7 +1998,7 @@ Define the minimum number of lowercase letters. Defaults to 1 if not set.
 a| `OCIS_PERSISTENT_STORE`
 
 a| [subs=-attributes]
-++pre5.0 ++
+++7.0.0 ++
 
 a| [subs=attributes+]
 * xref:{s-path}/activitylog.adoc[activitylog] +
@@ -2011,14 +2011,14 @@ a| [subs=-attributes]
 ++string ++
 
 a| [subs=-attributes]
-++memory ++
+++nats-js-kv ++
 
 a| [subs=-attributes]
 The type of the store. Supported values are: 'memory', 'nats-js-kv', 'redis-sentinel', 'noop'. See the text description for details.
 a| `OCIS_PERSISTENT_STORE_AUTH_PASSWORD`
 
 a| [subs=-attributes]
-++5.0 ++
+++7.0.0 ++
 
 a| [subs=attributes+]
 * xref:{s-path}/activitylog.adoc[activitylog] +
@@ -2038,7 +2038,7 @@ The password to authenticate with the store. Only applies when store type 'nats-
 a| `OCIS_PERSISTENT_STORE_AUTH_USERNAME`
 
 a| [subs=-attributes]
-++5.0 ++
+++7.0.0 ++
 
 a| [subs=attributes+]
 * xref:{s-path}/activitylog.adoc[activitylog] +
@@ -2058,7 +2058,7 @@ The username to authenticate with the store. Only applies when store type 'nats-
 a| `OCIS_PERSISTENT_STORE_NODES`
 
 a| [subs=-attributes]
-++pre5.0 ++
+++7.0.0 ++
 
 a| [subs=attributes+]
 * xref:{s-path}/activitylog.adoc[activitylog] +
@@ -2071,14 +2071,14 @@ a| [subs=-attributes]
 ++[]string ++
 
 a| [subs=-attributes]
-++[] ++
+++[127.0.0.1:9233] ++
 
 a| [subs=-attributes]
 A list of nodes to access the configured store. This has no effect when 'memory' store is configured. Note that the behaviour how nodes are used is dependent on the library of the configured store. See the Environment Variable Types description for more details.
 a| `OCIS_PERSISTENT_STORE_TTL`
 
 a| [subs=-attributes]
-++pre5.0 ++
+++7.0.0 ++
 
 a| [subs=attributes+]
 * xref:{s-path}/activitylog.adoc[activitylog] +
@@ -2091,10 +2091,10 @@ a| [subs=-attributes]
 ++Duration ++
 
 a| [subs=-attributes]
-++336h0m0s ++
+++30m0s ++
 
 a| [subs=-attributes]
-Time to live for events in the store. Defaults to '336h' (2 weeks). See the Environment Variable Types description for more details.
+Time to live for events in the store. Defaults to '30m' (30 minutes). See the Environment Variable Types description for more details.
 a| `OCIS_REVA_GATEWAY`
 
 a| [subs=-attributes]
@@ -2159,13 +2159,13 @@ a| [subs=attributes+]
 * xref:{s-path}/userlog.adoc[userlog] +
 
 a| [subs=-attributes]
-++string ++
+++[]string ++
 
 a| [subs=-attributes]
-++ ++
+++[service-user-id] ++
 
 a| [subs=-attributes]
-The ID of the service account the service should use. See the 'auth-service' service description for more details.
+The list of all service account IDs. These will be assigned the hidden 'service-account' role. Note: When using 'OCIS_SERVICE_ACCOUNT_ID' this will contain only one value while 'SETTINGS_SERVICE_ACCOUNT_IDS' can have multiple. See the 'auth-service' service description for more details about service accounts.
 a| `OCIS_SERVICE_ACCOUNT_SECRET`
 
 a| [subs=-attributes]
@@ -2259,7 +2259,7 @@ a| [subs=-attributes]
 ++0 ++
 
 a| [subs=-attributes]
-Set the global max quota value in bytes. A value of 0 equals unlimited. The value is provided via capabilities.
+Set a global max quota for spaces in bytes. A value of 0 equals unlimited. If not using the global OCIS_SPACES_MAX_QUOTA, you must define the FRONTEND_MAX_QUOTA in the frontend service.
 a| `OCIS_SYSTEM_USER_API_KEY`
 
 a| [subs=-attributes]
diff --git a/services/_includes/adoc/graph_configvars.adoc b/services/_includes/adoc/graph_configvars.adoc
index 828fe3b972d..e3d73d0238f 100644
--- a/services/_includes/adoc/graph_configvars.adoc
+++ b/services/_includes/adoc/graph_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the graph service
 [width="100%",cols="~,~,~,~",options="header"]
@@ -786,7 +786,7 @@ LDAP Attribute to use for the email address of users.
 a|`OCIS_LDAP_USER_SCHEMA_DISPLAYNAME` +
 `LDAP_USER_SCHEMA_DISPLAY_NAME` +
 `GRAPH_LDAP_USER_DISPLAYNAME_ATTRIBUTE` +
-xref:deprecation-note-2024-10-29-07-39-42[Deprecation Note]
+xref:deprecation-note-2024-10-29-11-07-12[Deprecation Note]
 a| [subs=-attributes]
 ++pre5.0 ++
 a| [subs=-attributes]
diff --git a/services/_includes/adoc/groups_configvars.adoc b/services/_includes/adoc/groups_configvars.adoc
index 0a8900bc7e6..382f1f90c71 100644
--- a/services/_includes/adoc/groups_configvars.adoc
+++ b/services/_includes/adoc/groups_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the groups service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/idm_configvars.adoc b/services/_includes/adoc/idm_configvars.adoc
index 5b475eb8031..c6b0b7c27dc 100644
--- a/services/_includes/adoc/idm_configvars.adoc
+++ b/services/_includes/adoc/idm_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the idm service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/idp_configvars.adoc b/services/_includes/adoc/idp_configvars.adoc
index bd496fcd69c..4a8191b48b4 100644
--- a/services/_includes/adoc/idp_configvars.adoc
+++ b/services/_includes/adoc/idp_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the idp service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/invitations_configvars.adoc b/services/_includes/adoc/invitations_configvars.adoc
index 96d053b6621..870162c9bfa 100644
--- a/services/_includes/adoc/invitations_configvars.adoc
+++ b/services/_includes/adoc/invitations_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the invitations service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/nats_configvars.adoc b/services/_includes/adoc/nats_configvars.adoc
index ffbdcfe0ec9..4d7052b08eb 100644
--- a/services/_includes/adoc/nats_configvars.adoc
+++ b/services/_includes/adoc/nats_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the nats service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/notifications_configvars.adoc b/services/_includes/adoc/notifications_configvars.adoc
index a76473a7eb9..e3c03279b7e 100644
--- a/services/_includes/adoc/notifications_configvars.adoc
+++ b/services/_includes/adoc/notifications_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the notifications service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/ocdav_configvars.adoc b/services/_includes/adoc/ocdav_configvars.adoc
index 995ca14e576..c7f0c3366d3 100644
--- a/services/_includes/adoc/ocdav_configvars.adoc
+++ b/services/_includes/adoc/ocdav_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the ocdav service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/ocm_configvars.adoc b/services/_includes/adoc/ocm_configvars.adoc
index deb9d2985d7..f4b79377e6b 100644
--- a/services/_includes/adoc/ocm_configvars.adoc
+++ b/services/_includes/adoc/ocm_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the ocm service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/ocs_configvars.adoc b/services/_includes/adoc/ocs_configvars.adoc
index 8f96f28db03..46e25573692 100644
--- a/services/_includes/adoc/ocs_configvars.adoc
+++ b/services/_includes/adoc/ocs_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the ocs service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/policies_configvars.adoc b/services/_includes/adoc/policies_configvars.adoc
index 32b8b389d13..690f473a4a5 100644
--- a/services/_includes/adoc/policies_configvars.adoc
+++ b/services/_includes/adoc/policies_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the policies service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/postprocessing_configvars.adoc b/services/_includes/adoc/postprocessing_configvars.adoc
index cacfd72aac9..2c963116411 100644
--- a/services/_includes/adoc/postprocessing_configvars.adoc
+++ b/services/_includes/adoc/postprocessing_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the postprocessing service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/proxy_configvars.adoc b/services/_includes/adoc/proxy_configvars.adoc
index 9a3d1eaf901..6bbca7e9c59 100644
--- a/services/_includes/adoc/proxy_configvars.adoc
+++ b/services/_includes/adoc/proxy_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the proxy service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/search_configvars.adoc b/services/_includes/adoc/search_configvars.adoc
index f64955c607e..53af3bfebbf 100644
--- a/services/_includes/adoc/search_configvars.adoc
+++ b/services/_includes/adoc/search_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the search service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/settings_configvars.adoc b/services/_includes/adoc/settings_configvars.adoc
index 7e8bb874c1c..6202b639841 100644
--- a/services/_includes/adoc/settings_configvars.adoc
+++ b/services/_includes/adoc/settings_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the settings service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/sharing_configvars.adoc b/services/_includes/adoc/sharing_configvars.adoc
index 3b844f6d133..446abc879f0 100644
--- a/services/_includes/adoc/sharing_configvars.adoc
+++ b/services/_includes/adoc/sharing_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the sharing service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/sse_configvars.adoc b/services/_includes/adoc/sse_configvars.adoc
index 16ab573984d..1163620b95c 100644
--- a/services/_includes/adoc/sse_configvars.adoc
+++ b/services/_includes/adoc/sse_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the sse service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/storage-publiclink_configvars.adoc b/services/_includes/adoc/storage-publiclink_configvars.adoc
index 977e97db032..30b2299f1eb 100644
--- a/services/_includes/adoc/storage-publiclink_configvars.adoc
+++ b/services/_includes/adoc/storage-publiclink_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the storage-publiclink service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/storage-shares_configvars.adoc b/services/_includes/adoc/storage-shares_configvars.adoc
index 37e1272c814..8e9c40af059 100644
--- a/services/_includes/adoc/storage-shares_configvars.adoc
+++ b/services/_includes/adoc/storage-shares_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the storage-shares service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/storage-system_configvars.adoc b/services/_includes/adoc/storage-system_configvars.adoc
index 35ba5accede..385494caf57 100644
--- a/services/_includes/adoc/storage-system_configvars.adoc
+++ b/services/_includes/adoc/storage-system_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the storage-system service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/storage-users_configvars.adoc b/services/_includes/adoc/storage-users_configvars.adoc
index fac23ed7db5..0c1cfc9e70e 100644
--- a/services/_includes/adoc/storage-users_configvars.adoc
+++ b/services/_includes/adoc/storage-users_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the storage-users service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/thumbnails_configvars.adoc b/services/_includes/adoc/thumbnails_configvars.adoc
index 2e87a87a270..19077f563c8 100644
--- a/services/_includes/adoc/thumbnails_configvars.adoc
+++ b/services/_includes/adoc/thumbnails_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the thumbnails service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/userlog_configvars.adoc b/services/_includes/adoc/userlog_configvars.adoc
index a016558ca2d..6ffb290d178 100644
--- a/services/_includes/adoc/userlog_configvars.adoc
+++ b/services/_includes/adoc/userlog_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the userlog service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/users_configvars.adoc b/services/_includes/adoc/users_configvars.adoc
index d2eec968ba9..1c6303c8bf7 100644
--- a/services/_includes/adoc/users_configvars.adoc
+++ b/services/_includes/adoc/users_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the users service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/web_configvars.adoc b/services/_includes/adoc/web_configvars.adoc
index f9b94086090..22217c5ea86 100644
--- a/services/_includes/adoc/web_configvars.adoc
+++ b/services/_includes/adoc/web_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the web service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/webdav_configvars.adoc b/services/_includes/adoc/webdav_configvars.adoc
index 11060eaa363..1901078cc14 100644
--- a/services/_includes/adoc/webdav_configvars.adoc
+++ b/services/_includes/adoc/webdav_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the webdav service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/_includes/adoc/webfinger_configvars.adoc b/services/_includes/adoc/webfinger_configvars.adoc
index 620573f3bc6..0deaf9386d8 100644
--- a/services/_includes/adoc/webfinger_configvars.adoc
+++ b/services/_includes/adoc/webfinger_configvars.adoc
@@ -6,7 +6,7 @@
 
 ifeval::[{show-deprecation} == true]
 
-[#deprecation-note-2024-10-29-07-39-42]
+[#deprecation-note-2024-10-29-11-07-12]
 [caption=]
 .Deprecation notes for the webfinger service
 [width="100%",cols="~,~,~,~",options="header"]
diff --git a/services/activitylog/_index.md b/services/activitylog/_index.md
index e3d979c3de7..4792d013cb1 100755
--- a/services/activitylog/_index.md
+++ b/services/activitylog/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Activitylog
-date: 2024-10-29T07:39:48.700739265Z
+date: 2024-10-29T11:07:18.546213873Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/activitylog
diff --git a/services/antivirus/_index.md b/services/antivirus/_index.md
index 080b3344a88..2df3fe2d694 100644
--- a/services/antivirus/_index.md
+++ b/services/antivirus/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Antivirus
-date: 2024-10-29T07:39:48.701118636Z
+date: 2024-10-29T11:07:18.546584518Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/antivirus
diff --git a/services/app-registry/_index.md b/services/app-registry/_index.md
index f530b79f128..f55edad3c1e 100644
--- a/services/app-registry/_index.md
+++ b/services/app-registry/_index.md
@@ -1,6 +1,6 @@
 ---
 title: App Registry
-date: 2024-10-29T07:39:48.701400855Z
+date: 2024-10-29T11:07:18.546958559Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/app-registry
diff --git a/services/audit/_index.md b/services/audit/_index.md
index 57632b2e6f9..f58ac0e9f42 100644
--- a/services/audit/_index.md
+++ b/services/audit/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Audit
-date: 2024-10-29T07:39:48.70168058Z
+date: 2024-10-29T11:07:18.547209169Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/audit
diff --git a/services/auth-app/_index.md b/services/auth-app/_index.md
index 274bce37eb7..9befdcf1829 100755
--- a/services/auth-app/_index.md
+++ b/services/auth-app/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Auth-App
-date: 2024-10-29T07:39:48.701821313Z
+date: 2024-10-29T11:07:18.547323493Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/auth-app
diff --git a/services/auth-basic/_index.md b/services/auth-basic/_index.md
index 482a8ff693a..8c689acdb93 100644
--- a/services/auth-basic/_index.md
+++ b/services/auth-basic/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Auth-Basic
-date: 2024-10-29T07:39:48.702039572Z
+date: 2024-10-29T11:07:18.547498071Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/auth-basic
diff --git a/services/auth-bearer/_index.md b/services/auth-bearer/_index.md
index 3618555cd9b..267e40b9c2e 100644
--- a/services/auth-bearer/_index.md
+++ b/services/auth-bearer/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Auth-Bearer
-date: 2024-10-29T07:39:48.702437567Z
+date: 2024-10-29T11:07:18.547629728Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/auth-bearer
diff --git a/services/auth-machine/_index.md b/services/auth-machine/_index.md
index 4b5326fbd4f..9cb966e0790 100644
--- a/services/auth-machine/_index.md
+++ b/services/auth-machine/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Auth-Machine
-date: 2024-10-29T07:39:48.702613257Z
+date: 2024-10-29T11:07:18.547754251Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/auth-machine
diff --git a/services/auth-service/_index.md b/services/auth-service/_index.md
index 1c3bbfb8f7b..ac1a90542b9 100755
--- a/services/auth-service/_index.md
+++ b/services/auth-service/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Auth-Service
-date: 2024-10-29T07:39:48.702775572Z
+date: 2024-10-29T11:07:18.547883754Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/auth-service
diff --git a/services/clientlog/_index.md b/services/clientlog/_index.md
index 792162ff0be..cb1e8e31eb8 100755
--- a/services/clientlog/_index.md
+++ b/services/clientlog/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Clientlog Service
-date: 2024-10-29T07:39:48.702968282Z
+date: 2024-10-29T11:07:18.548085121Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/clientlog
diff --git a/services/collaboration/_index.md b/services/collaboration/_index.md
index 79d3fc70540..845b0e8e8ee 100755
--- a/services/collaboration/_index.md
+++ b/services/collaboration/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Collaboration
-date: 2024-10-29T07:39:48.703168477Z
+date: 2024-10-29T11:07:18.548269898Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/collaboration
diff --git a/services/eventhistory/_index.md b/services/eventhistory/_index.md
index f9c48d95a7a..f2cb682465d 100644
--- a/services/eventhistory/_index.md
+++ b/services/eventhistory/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Eventhistory
-date: 2024-10-29T07:39:48.703445767Z
+date: 2024-10-29T11:07:18.548454464Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/eventhistory
diff --git a/services/frontend/_index.md b/services/frontend/_index.md
index f0ac069ee80..eef8004d908 100644
--- a/services/frontend/_index.md
+++ b/services/frontend/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Frontend
-date: 2024-10-29T07:39:48.703653907Z
+date: 2024-10-29T11:07:18.548689886Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/frontend
diff --git a/services/gateway/_index.md b/services/gateway/_index.md
index ad8a6af6f9c..236fb169d1b 100644
--- a/services/gateway/_index.md
+++ b/services/gateway/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Gateway
-date: 2024-10-29T07:39:48.703954901Z
+date: 2024-10-29T11:07:18.548980632Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/gateway
diff --git a/services/graph/_index.md b/services/graph/_index.md
index 737d7baf538..d385e40f0fe 100644
--- a/services/graph/_index.md
+++ b/services/graph/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Graph
-date: 2024-10-29T07:39:48.704201974Z
+date: 2024-10-29T11:07:18.549244767Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/graph
diff --git a/services/idm/_index.md b/services/idm/_index.md
index 0d7317f82c5..5ade2191a5e 100644
--- a/services/idm/_index.md
+++ b/services/idm/_index.md
@@ -1,6 +1,6 @@
 ---
 title: IDM
-date: 2024-10-29T07:39:48.704482791Z
+date: 2024-10-29T11:07:18.549462746Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/idm
diff --git a/services/idp/_index.md b/services/idp/_index.md
index b9e7cd94060..f065848f144 100644
--- a/services/idp/_index.md
+++ b/services/idp/_index.md
@@ -1,6 +1,6 @@
 ---
 title: IDP
-date: 2024-10-29T07:39:48.704627492Z
+date: 2024-10-29T11:07:18.54957679Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/idp
diff --git a/services/invitations/_index.md b/services/invitations/_index.md
index 232524fcce3..ec81d5e3999 100644
--- a/services/invitations/_index.md
+++ b/services/invitations/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Invitations
-date: 2024-10-29T07:39:48.704786249Z
+date: 2024-10-29T11:07:18.549711843Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/invitations
diff --git a/services/nats/_index.md b/services/nats/_index.md
index 409eff3bcc1..69852dc4e57 100644
--- a/services/nats/_index.md
+++ b/services/nats/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Nats
-date: 2024-10-29T07:39:48.704961167Z
+date: 2024-10-29T11:07:18.551826188Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/nats
diff --git a/services/notifications/_index.md b/services/notifications/_index.md
index 1d43106db44..b21adffd2c3 100644
--- a/services/notifications/_index.md
+++ b/services/notifications/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Notification
-date: 2024-10-29T07:39:48.705159128Z
+date: 2024-10-29T11:07:18.552111082Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/notifications
diff --git a/services/ocdav/_index.md b/services/ocdav/_index.md
index f777736d163..138ce4a1a38 100644
--- a/services/ocdav/_index.md
+++ b/services/ocdav/_index.md
@@ -1,6 +1,6 @@
 ---
 title: ocDAV
-date: 2024-10-29T07:39:48.705328164Z
+date: 2024-10-29T11:07:18.552245724Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/ocdav
diff --git a/services/ocm/_index.md b/services/ocm/_index.md
index 1a379a3ad4d..514ca9c040a 100755
--- a/services/ocm/_index.md
+++ b/services/ocm/_index.md
@@ -1,6 +1,6 @@
 ---
 title: OCM
-date: 2024-10-29T07:39:48.70548028Z
+date: 2024-10-29T11:07:18.552329833Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/ocm
diff --git a/services/ocs/_index.md b/services/ocs/_index.md
index d33097a6cac..4e314e2214d 100644
--- a/services/ocs/_index.md
+++ b/services/ocs/_index.md
@@ -1,6 +1,6 @@
 ---
 title: OCS Service
-date: 2024-10-29T07:39:48.708543029Z
+date: 2024-10-29T11:07:18.55241943Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/ocs
diff --git a/services/policies/_index.md b/services/policies/_index.md
index 5984c15feaa..02c45827d21 100644
--- a/services/policies/_index.md
+++ b/services/policies/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Policies
-date: 2024-10-29T07:39:48.708752291Z
+date: 2024-10-29T11:07:18.552513126Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/policies
diff --git a/services/postprocessing/_index.md b/services/postprocessing/_index.md
index 592a121b17d..3282f44cad4 100644
--- a/services/postprocessing/_index.md
+++ b/services/postprocessing/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Postprocessing
-date: 2024-10-29T07:39:48.708994395Z
+date: 2024-10-29T11:07:18.552630165Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/postprocessing
diff --git a/services/proxy/_index.md b/services/proxy/_index.md
index 4d3a90afa29..d58a3e2e243 100644
--- a/services/proxy/_index.md
+++ b/services/proxy/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Proxy
-date: 2024-10-29T07:39:48.709321748Z
+date: 2024-10-29T11:07:18.552770148Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/proxy
diff --git a/services/search/_index.md b/services/search/_index.md
index 55cbdb89ef8..f08713a427e 100644
--- a/services/search/_index.md
+++ b/services/search/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Search
-date: 2024-10-29T07:39:48.70972853Z
+date: 2024-10-29T11:07:18.552939917Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/search
diff --git a/services/settings/_index.md b/services/settings/_index.md
index 41ba89414fd..f42e64f0b07 100644
--- a/services/settings/_index.md
+++ b/services/settings/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Settings
-date: 2024-10-29T07:39:48.710141715Z
+date: 2024-10-29T11:07:18.553087603Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/settings
diff --git a/services/sse/_index.md b/services/sse/_index.md
index f4e0e3649b1..48f5bc71bec 100644
--- a/services/sse/_index.md
+++ b/services/sse/_index.md
@@ -1,6 +1,6 @@
 ---
 title: SSE
-date: 2024-10-29T07:39:48.710528209Z
+date: 2024-10-29T11:07:18.553188773Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/sse
diff --git a/services/storage-system/_index.md b/services/storage-system/_index.md
index f6033d291c0..e131bd921c7 100644
--- a/services/storage-system/_index.md
+++ b/services/storage-system/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Storage-System
-date: 2024-10-29T07:39:48.710674533Z
+date: 2024-10-29T11:07:18.553259626Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/storage-system
diff --git a/services/storage-users/_index.md b/services/storage-users/_index.md
index 395ff3b973e..9a8b19c43f7 100644
--- a/services/storage-users/_index.md
+++ b/services/storage-users/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Storage-Users
-date: 2024-10-29T07:39:48.710914192Z
+date: 2024-10-29T11:07:18.553366266Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/storage-users
diff --git a/services/thumbnails/_index.md b/services/thumbnails/_index.md
index 3649e824cfb..74ede254028 100644
--- a/services/thumbnails/_index.md
+++ b/services/thumbnails/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Thumbnails
-date: 2024-10-29T07:39:48.711182555Z
+date: 2024-10-29T11:07:18.55348603Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/thumbnails
diff --git a/services/userlog/_index.md b/services/userlog/_index.md
index 6ab4fc7f329..e9911e83fd9 100644
--- a/services/userlog/_index.md
+++ b/services/userlog/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Userlog
-date: 2024-10-29T07:39:48.711626807Z
+date: 2024-10-29T11:07:18.553607508Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/userlog
diff --git a/services/web/_index.md b/services/web/_index.md
index a42e413744d..4e1a59cddfd 100644
--- a/services/web/_index.md
+++ b/services/web/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Web
-date: 2024-10-29T07:39:48.712063496Z
+date: 2024-10-29T11:07:18.55374162Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/web
diff --git a/services/webdav/_index.md b/services/webdav/_index.md
index d8657bdb786..7ccb885ab3c 100644
--- a/services/webdav/_index.md
+++ b/services/webdav/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Webdav
-date: 2024-10-29T07:39:48.712399035Z
+date: 2024-10-29T11:07:18.553843461Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/webdav
diff --git a/services/webfinger/_index.md b/services/webfinger/_index.md
index e8308cafda0..eac2aaa61c9 100644
--- a/services/webfinger/_index.md
+++ b/services/webfinger/_index.md
@@ -1,6 +1,6 @@
 ---
 title: Webfinger
-date: 2024-10-29T07:39:48.712559405Z
+date: 2024-10-29T11:07:18.553942877Z
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
 geekdocEditPath: edit/master/services/webfinger