diff --git a/DEPRECATION.md b/DEPRECATION.md
index 3c3268d637fd0..a66d5d6a1282f 100644
--- a/DEPRECATION.md
+++ b/DEPRECATION.md
@@ -64,6 +64,7 @@ features:
 | Removed    | [`initApp` hook](#initapp-hook)                                                                                                   | v0.35.0    | v0.35.0   |
 | Removed    | [`/v1/run-scheduled-refresh` REST API endpoint](#v1run-scheduled-refresh-rest-api-endpoint)                                       | v0.35.0    | v0.36.0   |
 | Deprecated | [Node.js 18](#nodejs-18)                                                                                                          | v0.36.0    |           |
+| Deprecated | [`CUBEJS_SCHEDULED_REFRESH_CONCURRENCY`](#cubejs_scheduled_refresh_concurrency) | v1.2.7 | |
 
 ### Node.js 8
 
@@ -391,3 +392,9 @@ API](https://cube.dev/docs/product/apis-integrations/orchestration-api) and
 
 Node.js 18 reaches [End of Life on April 30, 2025][link-nodejs-eol]. This means
 no more updates. Please upgrade to Node.js 20 or higher.
+
+### `CUBEJS_SCHEDULED_REFRESH_CONCURRENCY`
+
+**Deprecated in Release: v1.2.7**
+
+This environment variable was renamed to [`CUBEJS_SCHEDULED_REFRESH_QUERIES_PER_APP_ID`](https://cube.dev/docs/reference/configuration/environment-variables#cubejs_scheduled_refresh_queries_per_app_id). Please use the new name.
\ No newline at end of file
diff --git a/docs/pages/product/caching/_meta.js b/docs/pages/product/caching/_meta.js
index 1d8700a1c1376..2d7b0cafbb8a3 100644
--- a/docs/pages/product/caching/_meta.js
+++ b/docs/pages/product/caching/_meta.js
@@ -2,6 +2,7 @@ module.exports = {
   "getting-started-pre-aggregations": "Getting started with pre-aggregations",
   "using-pre-aggregations": "Using pre-aggregations",
   "matching-pre-aggregations": "Matching pre-aggregations",
+  "refreshing-pre-aggregations": "Refreshing pre-aggregations",
   "lambda-pre-aggregations": "Lambda pre-aggregations",
   "running-in-production": "Running in production"
 }
\ No newline at end of file
diff --git a/docs/pages/product/caching/refreshing-pre-aggregations.mdx b/docs/pages/product/caching/refreshing-pre-aggregations.mdx
new file mode 100644
index 0000000000000..f8e248f1402ea
--- /dev/null
+++ b/docs/pages/product/caching/refreshing-pre-aggregations.mdx
@@ -0,0 +1,21 @@
+# Refreshing pre-aggregations
+
+_Pre-aggregation refresh_ is the process of building pre-aggregations and updating
+them with new data. Pre-aggregation refresh is the responsibility of the _refresh
+worker_.
+
+## Configuration
+
+You can use the following environment variables to configure the refresh worker
+behavior:
+
+- `CUBEJS_REFRESH_WORKER` (see also `CUBEJS_PRE_AGGREGATIONS_BUILDER`)
+- `CUBEJS_PRE_AGGREGATIONS_SCHEMA`
+- `CUBEJS_SCHEDULED_REFRESH_TIMEZONES`
+- `CUBEJS_DB_QUERY_TIMEOUT`
+- `CUBEJS_REFRESH_WORKER_CONCURRENCY` (see also `CUBEJS_CONCURRENCY`)
+- `CUBEJS_SCHEDULED_REFRESH_QUERIES_PER_APP_ID`
+- `CUBEJS_DROP_PRE_AGG_WITHOUT_TOUCH`
+
+
+[ref-multitenancy]: /product/configuration/advanced/multitenancy
\ No newline at end of file
diff --git a/docs/pages/product/configuration/_meta.js b/docs/pages/product/configuration/_meta.js
index e6485428a4797..a183902a526e3 100644
--- a/docs/pages/product/configuration/_meta.js
+++ b/docs/pages/product/configuration/_meta.js
@@ -1,5 +1,7 @@
 module.exports = {
   "data-sources": "Data sources",
   "visualization-tools": "Visualization tools",
-  "advanced": "Advanced"
+  "multiple-data-sources": "Multiple data sources",
+  "concurrency": "Concurrency",
+  "multitenancy": "Multitenancy"
 }
\ No newline at end of file
diff --git a/docs/pages/product/configuration/concurrency.mdx b/docs/pages/product/configuration/concurrency.mdx
new file mode 100644
index 0000000000000..2b23880fac625
--- /dev/null
+++ b/docs/pages/product/configuration/concurrency.mdx
@@ -0,0 +1,90 @@
+# Querying concurrency
+
+All queries to [data APIs][ref-data-apis] are processed asynchronously via a _query
+queue_. It allows to optimize the load and increase querying performance.
+
+## Query queue
+
+The query queue allows to deduplicate queries to API instances and insulate upstream
+data sources from query spikes. It also allows to execute queries to data sources
+concurrently for increased performance.
+
+By default, Cube uses a _single_ query queue for queries from all API instances and
+the refresh worker to all configured data sources.
+
+<ReferenceBox>
+
+You can read more about the query queue in the [this blog post](https://cube.dev/blog/how-you-win-by-using-cube-store-part-1#query-queue-in-cube).
+
+</ReferenceBox>
+
+### Multiple query queues
+
+You can use the [`context_to_orchestrator_id`][ref-context-to-orchestrator-id]
+configuration option to route queries to multiple queues based on the security
+context.
+
+<WarningBox>
+
+If you're configuring multiple connections to data sources via the [`driver_factory`
+configuration option][ref-driver-factory], you __must__ also configure
+`context_to_orchestrator_id` to ensure that queries are routed to correct queues.
+
+</WarningBox>
+
+## Data sources
+
+Cube supports various kinds of [data sources][ref-data-sources], ranging from cloud
+data warehouses to embedded databases. Each data source scales differently,
+therefore Cube provides sound defaults for each kind of data source out-of-the-box.
+
+### Data source concurrency
+
+By default, Cube uses the following concurrency settings for data sources:
+
+| Data source | Default concurrency |
+| --- | --- |
+| [Amazon Athena][ref-athena] | 10 |
+| [Amazon Redshift][ref-redshift] | 5 |
+| [Apache Pinot][ref-pinot] | 10 |
+| [ClickHouse][ref-clickhouse] | 10 |
+| [Databricks][ref-databricks] | 10 |
+| [Firebolt][ref-firebolt] | 10 |
+| [Google BigQuery][ref-bigquery] | 10 |
+| [Snowflake][ref-snowflake] | 8 |
+| All other data sources | 5 or [less, if specified in the driver][link-github-data-source-concurrency] |
+
+You can use the `CUBEJS_CONCURRENCY` environment variable to adjust the maximum
+number of concurrent queries to a data source. It's recommended to use the default
+configuration unless you're sure that your data source can handle more concurrent
+queries.
+
+### Connection pooling
+
+For data sources that support connection pooling, the maximum number of concurrent
+connections to the database can also be set by using the `CUBEJS_DB_MAX_POOL`
+environment variable. If changing this from the default, you must ensure that the
+new value is greater than the number of concurrent connections used by Cube's query
+queues and the refresh worker.
+
+## Refresh worker
+
+By default, the refresh worker uses the same concurrency settings as API instances.
+However, you can override this behvaior in the refresh worker
+[configuration][ref-preagg-refresh].
+
+
+[ref-data-apis]: /product/apis-integrations
+[ref-data-sources]: /product/configuration/data-sources
+[ref-context-to-orchestrator-id]: /reference/configuration/config#context_to_orchestrator_id
+[ref-driver-factory]: /reference/configuration/config#driver_factory
+[ref-preagg-refresh]: /product/caching/refreshing-pre-aggregations#configuration
+[ref-athena]: /product/configuration/data-sources/aws-athena
+[ref-clickhouse]: /product/configuration/data-sources/clickhouse
+[ref-databricks]: /product/configuration/data-sources/databricks-jdbc
+[ref-firebolt]: /product/configuration/data-sources/firebolt
+[ref-pinot]: /product/configuration/data-sources/pinot
+[ref-redshift]: /product/configuration/data-sources/aws-redshift
+[ref-snowflake]: /product/configuration/data-sources/snowflake
+[ref-bigquery]: /product/configuration/data-sources/google-bigquery
+[link-github-data-source-concurrency]: https://github.com/search?q=repo%3Acube-js%2Fcube+getDefaultConcurrency+path%3Apackages%2Fcubejs-&type=code
\ No newline at end of file
diff --git a/docs/pages/product/configuration/data-sources.mdx b/docs/pages/product/configuration/data-sources.mdx
index d884d6a5b4047..3ec81c2d7b0bc 100644
--- a/docs/pages/product/configuration/data-sources.mdx
+++ b/docs/pages/product/configuration/data-sources.mdx
@@ -8,8 +8,9 @@ redirect_from:
 
 Choose a data source to get started with below.
 
-Note that Cube also supports connecting to [multiple data
-sources][ref-config-multi-data-src] out of the box.
+You can also connect [multiple data sources][ref-config-multi-data-src] at the same
+time and adjust the [concurrency settings][ref-data-source-concurrency] for data
+sources.
 
 ## Data warehouses
 
@@ -251,28 +252,9 @@ users on the [Enterprise Premier](https://cube.dev/pricing) product tier.
 
 </InfoBox>
 
-## Concurrency and pooling
-
-<InfoBox>
-
-All Cube database drivers come with presets for concurrency and pooling that
-work out-of-the-box. The following information is included as a reference.
-
-</InfoBox>
-
-For increased performance, Cube uses multiple concurrent connections to
-configured data sources. The `CUBEJS_CONCURRENCY` environment variable controls
-concurrency settings for query queues and the refresh scheduler as well as the
-maximum concurrent connections.
-
-For databases that support connection pooling,
-the maximum number of concurrent connections to the database can also be set by
-using the `CUBEJS_DB_MAX_POOL` environment variable; if changing this from the
-default, you must ensure that the new value is greater than the number of
-concurrent connections used by Cube's query queues and refresh scheduler.
-
 
 [ref-config-multi-data-src]: /product/configuration/advanced/multiple-data-sources
 [ref-driver-factory]: /reference/configuration/config#driver_factory
 [ref-duckdb]: /product/configuration/data-sources/duckdb
-[link-github-packages]: https://github.com/cube-js/cube/tree/master/packages
\ No newline at end of file
+[link-github-packages]: https://github.com/cube-js/cube/tree/master/packages
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-sources
\ No newline at end of file
diff --git a/docs/pages/product/configuration/data-sources/aws-athena.mdx b/docs/pages/product/configuration/data-sources/aws-athena.mdx
index 7a24fa4fb7cd9..82bc6036288fb 100644
--- a/docs/pages/product/configuration/data-sources/aws-athena.mdx
+++ b/docs/pages/product/configuration/data-sources/aws-athena.mdx
@@ -1,9 +1,4 @@
----
-redirect_from:
-  - /config/databases/aws-athena
----
-
-# AWS Athena
+# Amazon Athena
 
 ## Prerequisites
 
@@ -39,7 +34,7 @@ Configuration</Btn> in your deployment.
 
 </InfoBox>
 
-In Cube Cloud, select **AWS Athena** when creating a new deployment and fill in
+In Cube Cloud, select AWS Athena** when creating a new deployment and fill in
 the required fields:
 
 <Screenshot
@@ -65,7 +60,9 @@ if [dedicated infrastructure][ref-dedicated-infra] is used. Check out the
 | `CUBEJS_AWS_ATHENA_WORKGROUP`   | The name of the workgroup in which the query is being started                                                          | [A valid Athena Workgroup][aws-athena-workgroup] |    ❌    |
 | `CUBEJS_AWS_ATHENA_CATALOG`     | The name of the catalog to use by default                                                                              | [A valid Athena Catalog name][awsdatacatalog]    |    ❌    |
 | `CUBEJS_DB_SCHEMA`              | The name of the schema to use as `information_schema` filter. Reduces count of tables loaded during schema generation. | A valid schema name                              |    ❌    |
-| `CUBEJS_CONCURRENCY`            | The number of concurrent connections each queue has to the database. Default is `5`                                    | A valid number                                   |    ❌    |
+| `CUBEJS_CONCURRENCY` | The number of [concurrent queries][ref-data-source-concurrency] to the data source | A valid number |    ❌    |
+
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-source-concurrency
 
 ## Pre-Aggregation Feature Support
 
@@ -151,4 +148,4 @@ connections are made over HTTPS.
 [ref-caching-using-preaggs-build-strats]:
   /product/caching/using-pre-aggregations#pre-aggregation-build-strategies
 [ref-schema-ref-types-formats-countdistinctapprox]: /reference/data-model/types-and-formats#count_distinct_approx
-[self-preaggs-batching]: #batching
+[self-preaggs-batching]: #batching
\ No newline at end of file
diff --git a/docs/pages/product/configuration/data-sources/aws-redshift.mdx b/docs/pages/product/configuration/data-sources/aws-redshift.mdx
index 53595eaf7369d..2e1f41db413cf 100644
--- a/docs/pages/product/configuration/data-sources/aws-redshift.mdx
+++ b/docs/pages/product/configuration/data-sources/aws-redshift.mdx
@@ -70,9 +70,11 @@ if [dedicated infrastructure][ref-dedicated-infra] is used. Check out the
 | `CUBEJS_DB_USER`                       | The username used to connect to the database                                        | A valid database username |    ✅    |
 | `CUBEJS_DB_PASS`                       | The password used to connect to the database                                        | A valid database password |    ✅    |
 | `CUBEJS_DB_SSL`                        | If `true`, enables SSL encryption for database connections from Cube                | `true`, `false`           |    ❌    |
-| `CUBEJS_CONCURRENCY`                   | The number of concurrent connections each queue has to the database. Default is `4` | A valid number            |    ❌    |
 | `CUBEJS_DB_MAX_POOL`                   | The maximum number of concurrent database connections to pool. Default is `16`      | A valid number            |    ❌    |
 | `CUBEJS_DB_EXPORT_BUCKET_REDSHIFT_ARN` |                                                                                     |                           |    ❌    |
+| `CUBEJS_CONCURRENCY` | The number of [concurrent queries][ref-data-source-concurrency] to the data source | A valid number |    ❌    |
+
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-source-concurrency
 
 ## Pre-Aggregation Feature Support
 
diff --git a/docs/pages/product/configuration/data-sources/clickhouse.mdx b/docs/pages/product/configuration/data-sources/clickhouse.mdx
index 7057c3945dc4a..5c839ce73f2a1 100644
--- a/docs/pages/product/configuration/data-sources/clickhouse.mdx
+++ b/docs/pages/product/configuration/data-sources/clickhouse.mdx
@@ -39,8 +39,10 @@ CUBEJS_DB_PASS=**********
 | `CUBEJS_DB_USER`                | The username used to connect to the database                                        | A valid database username |    ✅    |
 | `CUBEJS_DB_PASS`                | The password used to connect to the database                                        | A valid database password |    ✅    |
 | `CUBEJS_DB_CLICKHOUSE_READONLY` | Whether the ClickHouse user has read-only access or not                             | `true`, `false`           |    ❌    |
-| `CUBEJS_CONCURRENCY`            | The number of concurrent connections each queue has to the database. Default is `5` | A valid number            |    ❌    |
 | `CUBEJS_DB_MAX_POOL`            | The maximum number of concurrent database connections to pool. Default is `20`      | A valid number            |    ❌    |
+| `CUBEJS_CONCURRENCY` | The number of [concurrent queries][ref-data-source-concurrency] to the data source | A valid number |    ❌    |
+
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-source-concurrency
 
 ## Pre-Aggregation Feature Support
 
diff --git a/docs/pages/product/configuration/data-sources/databricks-jdbc.mdx b/docs/pages/product/configuration/data-sources/databricks-jdbc.mdx
index 94e05cef63ce7..e0f676024356d 100644
--- a/docs/pages/product/configuration/data-sources/databricks-jdbc.mdx
+++ b/docs/pages/product/configuration/data-sources/databricks-jdbc.mdx
@@ -60,8 +60,10 @@ docker run -it -p 4000:4000 --env-file=.env cube-jdk
 | `CUBEJS_DB_DATABRICKS_TOKEN`         | The [personal access token][databricks-docs-pat] used to authenticate the Databricks connection | A valid token         |    ✅    |
 | `CUBEJS_DB_DATABRICKS_CATALOG`       | The name of the [Databricks catalog][databricks-catalog] to connect to                                                | A valid catalog name  |    ❌    |
 | `CUBEJS_DB_EXPORT_BUCKET_MOUNT_DIR`  | The path for the [Databricks DBFS mount][databricks-docs-dbfs] (Not needed if using Unity Catalog connection)         | A valid mount path    |    ❌    |
-| `CUBEJS_CONCURRENCY`                 | The number of concurrent connections each queue has to the database. Default is `2`             | A valid number        |    ❌    |
 | `CUBEJS_DB_MAX_POOL`                 | The maximum number of concurrent database connections to pool. Default is `8`                   | A valid number        |    ❌    |
+| `CUBEJS_CONCURRENCY` | The number of [concurrent queries][ref-data-source-concurrency] to the data source | A valid number |    ❌    |
+
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-source-concurrency
 
 ## Pre-Aggregation Feature Support
 
diff --git a/docs/pages/product/configuration/data-sources/druid.mdx b/docs/pages/product/configuration/data-sources/druid.mdx
index 56e86a16bdca0..0eea27a5cf053 100644
--- a/docs/pages/product/configuration/data-sources/druid.mdx
+++ b/docs/pages/product/configuration/data-sources/druid.mdx
@@ -32,8 +32,10 @@ CUBEJS_DB_PASS=**********
 | `CUBEJS_DB_URL`      | The URL for a database                                                              | A valid database URL for Druid |    ✅    |
 | `CUBEJS_DB_USER`     | The username used to connect to the database                                        | A valid database username      |    ✅    |
 | `CUBEJS_DB_PASS`     | The password used to connect to the database                                        | A valid database password      |    ✅    |
-| `CUBEJS_CONCURRENCY` | The number of concurrent connections each queue has to the database. Default is `2` | A valid number                 |    ❌    |
 | `CUBEJS_DB_MAX_POOL` | The maximum number of concurrent database connections to pool. Default is `8`       | A valid number                 |    ❌    |
+| `CUBEJS_CONCURRENCY` | The number of [concurrent queries][ref-data-source-concurrency] to the data source | A valid number |    ❌    |
+
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-source-concurrency
 
 ## SSL
 
diff --git a/docs/pages/product/configuration/data-sources/duckdb.mdx b/docs/pages/product/configuration/data-sources/duckdb.mdx
index 1478383721718..7f9daa2cb3bdb 100644
--- a/docs/pages/product/configuration/data-sources/duckdb.mdx
+++ b/docs/pages/product/configuration/data-sources/duckdb.mdx
@@ -69,11 +69,13 @@ deployment][ref-demo-deployment] in Cube Cloud.
 | `CUBEJS_DB_DUCKDB_S3_SECRET_ACCESS_KEY` | The Secret Access Key to use for database connections                                                                 | A valid Secret Access Key                                     |    ❌    |                                    ✅                                     |
 | `CUBEJS_DB_DUCKDB_S3_ENDPOINT`          | The S3 endpoint                                                                                                       | A valid [S3 endpoint][duckdb-docs-s3-import]                  |    ❌    |                                    ✅                                     |
 | `CUBEJS_DB_DUCKDB_S3_REGION`            | The [region of the bucket][duckdb-docs-s3-import]                                                                     | A valid AWS region                                            |    ❌    |                                    ✅                                     |
-| `CUBEJS_CONCURRENCY`                    | The number of concurrent connections each queue has to the database. Default is `2`                                   | A valid number                                                |    ❌    |                                    ✅                                     |
 | `CUBEJS_DB_DUCKDB_S3_USE_SSL`           | Use SSL for connection                                                                                                | A boolean                                                     |    ❌    |                                    ❌                                     |
 | `CUBEJS_DB_DUCKDB_S3_URL_STYLE`         | To choose the S3 URL style(vhost or path)                                                                             | 'vhost' or 'path'                                             |    ❌    |                                    ❌                                     |
 | `CUBEJS_DB_DUCKDB_S3_SESSION_TOKEN`     | The token for the S3 session                                                                                          | A valid Session Token                                         |    ❌    |                                    ✅                                     |
 | `CUBEJS_DB_DUCKDB_EXTENSIONS`           | A comma-separated list of DuckDB extensions	to install and load                                                       | A comma-separated list of DuckDB extensions                   |    ❌    |                                    ✅                                     |
+| `CUBEJS_CONCURRENCY` | The number of [concurrent queries][ref-data-source-concurrency] to the data source | A valid number |    ❌    |
+
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-source-concurrency
 
 ## Pre-Aggregation Feature Support
 
diff --git a/docs/pages/product/configuration/data-sources/elasticsearch.mdx b/docs/pages/product/configuration/data-sources/elasticsearch.mdx
index 849cc6895f241..81ab0d2ace6ec 100644
--- a/docs/pages/product/configuration/data-sources/elasticsearch.mdx
+++ b/docs/pages/product/configuration/data-sources/elasticsearch.mdx
@@ -59,8 +59,10 @@ CUBEJS_DB_ELASTIC_APIKEY_KEY=ui2lp2axTNmsyakw9tvNnw
 | `CUBEJS_DB_ELASTIC_OPENDISTRO`   | If `true`, then use the Open Distro for Elasticsearch                                                                                                                                    | `true`, `false`                        |    ❌    |
 | `CUBEJS_DB_ELASTIC_APIKEY_ID`    | [ID of the API key from elastic.co][elastic-docs-api-keys]                                                                                                                               | A valid Elastic.co API key ID          |    ❌    |
 | `CUBEJS_DB_ELASTIC_APIKEY_KEY`   | [Value of the API key from elastic.co][elastic-docs-api-keys]                                                                                                                            | A valid Elastic.co API key value       |    ❌    |
-| `CUBEJS_CONCURRENCY`             | The number of concurrent connections each queue has to the database. Default is `2`                                                                                                      | A valid number                         |    ❌    |
 | `CUBEJS_DB_MAX_POOL`             | The maximum number of concurrent database connections to pool. Default is `8`                                                                                                            | A valid number                         |    ❌    |
+| `CUBEJS_CONCURRENCY` | The number of [concurrent queries][ref-data-source-concurrency] to the data source | A valid number |    ❌    |
+
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-source-concurrency
 
 ## SSL
 
diff --git a/docs/pages/product/configuration/data-sources/firebolt.mdx b/docs/pages/product/configuration/data-sources/firebolt.mdx
index 3d9a92a2217ec..5dc1f1e1cc5c8 100644
--- a/docs/pages/product/configuration/data-sources/firebolt.mdx
+++ b/docs/pages/product/configuration/data-sources/firebolt.mdx
@@ -40,8 +40,10 @@ CUBEJS_FIREBOLT_ENGINE_NAME=engine_name
 | `CUBEJS_FIREBOLT_ACCOUNT`      | Account name                                                                        | An account name                                                         |    ✅    |
 | `CUBEJS_FIREBOLT_ENGINE_NAME`  | Engine name to connect to                                                           | A valid engine name                                                     |    ✅    |
 | `CUBEJS_FIREBOLT_API_ENDPOINT` | Firebolt API endpoint. Used for authentication                                      | `api.dev.firebolt.io`, `api.staging.firebolt.io`, `api.app.firebolt.io` |    -     |
-| `CUBEJS_CONCURRENCY`           | The number of concurrent connections each queue has to the database. Default is `5` | A valid number                                                          |    ❌    |
 | `CUBEJS_DB_MAX_POOL`           | The maximum number of concurrent database connections to pool. Default is `20`      | A valid number                                                          |    ❌    |
+| `CUBEJS_CONCURRENCY` | The number of [concurrent queries][ref-data-source-concurrency] to the data source | A valid number |    ❌    |
+
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-source-concurrency
 
 [firebolt]: https://www.firebolt.io/
 [firebolt-help]: https://help.firebolt.io/
diff --git a/docs/pages/product/configuration/data-sources/google-bigquery.mdx b/docs/pages/product/configuration/data-sources/google-bigquery.mdx
index bf46494007de1..267618f144120 100644
--- a/docs/pages/product/configuration/data-sources/google-bigquery.mdx
+++ b/docs/pages/product/configuration/data-sources/google-bigquery.mdx
@@ -79,8 +79,10 @@ if [dedicated infrastructure][ref-dedicated-infra] is used. Check out the
 | `CUBEJS_DB_BQ_LOCATION`        | The Google BigQuery dataset location to connect to. Required if used with pre-aggregations outside of US. If not set then BQ driver will fail with `Dataset was not found in location US` error | [A valid Google BigQuery regional location][bq-docs-regional-locations] |    ⚠️    |
 | `CUBEJS_DB_EXPORT_BUCKET`      | The name of a bucket in cloud storage                                                                                                                                                           | A valid bucket name from cloud storage                                  |    ❌    |
 | `CUBEJS_DB_EXPORT_BUCKET_TYPE` | The cloud provider where the bucket is hosted                                                                                                                                                   | `gcp`                                                                   |    ❌    |
-| `CUBEJS_CONCURRENCY`           | The number of concurrent connections each queue has to the database. Default is `10`                                                                                                            | A valid number                                                          |    ❌    |
 | `CUBEJS_DB_MAX_POOL`           | The maximum number of concurrent database connections to pool. Default is `40`                                                                                                                  | A valid number                                                          |    ❌    |
+| `CUBEJS_CONCURRENCY` | The number of [concurrent queries][ref-data-source-concurrency] to the data source | A valid number |    ❌    |
+
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-source-concurrency
 
 ## Pre-Aggregation Feature Support
 
diff --git a/docs/pages/product/configuration/data-sources/hive.mdx b/docs/pages/product/configuration/data-sources/hive.mdx
index 6870122bd5cdc..a4482dc4141d2 100644
--- a/docs/pages/product/configuration/data-sources/hive.mdx
+++ b/docs/pages/product/configuration/data-sources/hive.mdx
@@ -39,7 +39,9 @@ CUBEJS_DB_PASS=**********
 | `CUBEJS_DB_HIVE_VER`        |                                                                                     |                           |    ❌    |
 | `CUBEJS_DB_HIVE_THRIFT_VER` |                                                                                     |                           |    ❌    |
 | `CUBEJS_DB_HIVE_CDH_VER`    |                                                                                     |                           |    ❌    |
-| `CUBEJS_CONCURRENCY`        | The number of concurrent connections each queue has to the database. Default is `2` | A valid number            |    ❌    |
 | `CUBEJS_DB_MAX_POOL`        | The maximum number of concurrent database connections to pool. Default is `8`       | A valid number            |    ❌    |
+| `CUBEJS_CONCURRENCY` | The number of [concurrent queries][ref-data-source-concurrency] to the data source | A valid number |    ❌    |
+
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-source-concurrency
 
 [hive]: https://hive.apache.org/
diff --git a/docs/pages/product/configuration/data-sources/ksqldb.mdx b/docs/pages/product/configuration/data-sources/ksqldb.mdx
index 6aa71bbac319e..014084f7aae04 100644
--- a/docs/pages/product/configuration/data-sources/ksqldb.mdx
+++ b/docs/pages/product/configuration/data-sources/ksqldb.mdx
@@ -67,7 +67,9 @@ CUBEJS_DB_PASS=password
 | `CUBEJS_DB_URL`      | The host URL for ksqlDB with port                                             | A valid database host URL |    ✅    |
 | `CUBEJS_DB_USER`     | The username used to connect to the ksqlDB. API key for Confluent Cloud.      | A valid port number       |    ✅    |
 | `CUBEJS_DB_PASS`     | The password used to connect to the ksqlDB. API secret for Confluent Cloud.   | A valid database name     |    ✅    |
-| `CUBEJS_CONCURRENCY` | The number of concurrent connections each queue has to the DB. Default is `1` | A valid number            |    ❌    |
+| `CUBEJS_CONCURRENCY` | The number of [concurrent queries][ref-data-source-concurrency] to the data source | A valid number |    ❌    |
+
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-source-concurrency
 
 ## Pre-Aggregations Support
 
diff --git a/docs/pages/product/configuration/data-sources/materialize.mdx b/docs/pages/product/configuration/data-sources/materialize.mdx
index 2cc27019d88df..4534d9fdf2917 100644
--- a/docs/pages/product/configuration/data-sources/materialize.mdx
+++ b/docs/pages/product/configuration/data-sources/materialize.mdx
@@ -41,9 +41,11 @@ CUBEJS_DB_MATERIALIZE_CLUSTER=quickstart
 | `CUBEJS_DB_NAME`                 | The name of the database to connect to                                              | A valid database name     |    ✅    |
 | `CUBEJS_DB_USER`                 | The username used to connect to the database                                        | A valid database username |    ✅    |
 | `CUBEJS_DB_PASS`                 | The password used to connect to the database                                        | A valid database password |    ✅    |
-| `CUBEJS_CONCURRENCY`             | The number of concurrent connections each queue has to the database. Default is `2` | A valid number            |    ❌    |
 | `CUBEJS_DB_MAX_POOL`             | The maximum number of concurrent database connections to pool. Default is `8`       | A valid number            |    ❌    |
 | `CUBEJS_DB_MATERIALIZE_CLUSTER`  | The name of the Materialize cluster to connect to                                   | A valid cluster name      |    ❌    |
+| `CUBEJS_CONCURRENCY` | The number of [concurrent queries][ref-data-source-concurrency] to the data source | A valid number |    ❌    |
+
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-source-concurrency
 
 ## SSL
 
diff --git a/docs/pages/product/configuration/data-sources/mongodb.mdx b/docs/pages/product/configuration/data-sources/mongodb.mdx
index 4f4ee7fb7fe8f..6a71981a466a7 100644
--- a/docs/pages/product/configuration/data-sources/mongodb.mdx
+++ b/docs/pages/product/configuration/data-sources/mongodb.mdx
@@ -68,8 +68,10 @@ file][mongobi-with-remote-db].
 | `CUBEJS_DB_USER`     | The username used to connect to the database                                        | A valid database username |    ✅    |
 | `CUBEJS_DB_PASS`     | The password used to connect to the database                                        | A valid database password |    ✅    |
 | `CUBEJS_DB_SSL`      | If `true`, enables SSL encryption for database connections from Cube                | `true`, `false`           |    ✅    |
-| `CUBEJS_CONCURRENCY` | The number of concurrent connections each queue has to the database. Default is `2` | A valid number            |    ❌    |
 | `CUBEJS_DB_MAX_POOL` | The maximum number of concurrent database connections to pool. Default is `8`       | A valid number            |    ❌    |
+| `CUBEJS_CONCURRENCY` | The number of [concurrent queries][ref-data-source-concurrency] to the data source | A valid number |    ❌    |
+
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-source-concurrency
 
 ## Pre-Aggregation Feature Support
 
diff --git a/docs/pages/product/configuration/data-sources/ms-sql.mdx b/docs/pages/product/configuration/data-sources/ms-sql.mdx
index b87bf79949441..298f1d75bef4a 100644
--- a/docs/pages/product/configuration/data-sources/ms-sql.mdx
+++ b/docs/pages/product/configuration/data-sources/ms-sql.mdx
@@ -32,8 +32,10 @@ CUBEJS_DB_PASS=**********
 | `CUBEJS_DB_PASS`     | The password used to connect to the database                                        | A valid database password                                  |    ✅    |
 | `CUBEJS_DB_DOMAIN`   | A domain name within the database to connect to                                     | A valid domain name within a Microsoft SQL Server database |    ❌    |
 | `CUBEJS_DB_SSL`      | If `true`, enables SSL encryption for database connections from Cube                | `true`, `false`                                            |    ❌    |
-| `CUBEJS_CONCURRENCY` | The number of concurrent connections each queue has to the database. Default is `2` | A valid number                                             |    ❌    |
 | `CUBEJS_DB_MAX_POOL` | The maximum number of concurrent database connections to pool. Default is `8`       | A valid number                                             |    ❌    |
+| `CUBEJS_CONCURRENCY` | The number of [concurrent queries][ref-data-source-concurrency] to the data source | A valid number |    ❌    |
+
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-source-concurrency
 
 ## Pre-Aggregation Feature Support
 
diff --git a/docs/pages/product/configuration/data-sources/mysql.mdx b/docs/pages/product/configuration/data-sources/mysql.mdx
index 3d0b1c21a5630..c45db1a192630 100644
--- a/docs/pages/product/configuration/data-sources/mysql.mdx
+++ b/docs/pages/product/configuration/data-sources/mysql.mdx
@@ -36,9 +36,11 @@ CUBEJS_DB_PASS=**********
 | `CUBEJS_DB_USER`        | The username used to connect to the database                                        | A valid database username |    ✅    |
 | `CUBEJS_DB_PASS`        | The password used to connect to the database                                        | A valid database password |    ✅    |
 | `CUBEJS_DB_SSL`         | If `true`, enables SSL encryption for database connections from Cube                | `true`, `false`           |    ❌    |
-| `CUBEJS_CONCURRENCY`    | The number of concurrent connections each queue has to the database. Default is `2` | A valid number            |    ❌    |
 | `CUBEJS_DB_MAX_POOL`    | The maximum number of concurrent database connections to pool. Default is `8`       | A valid number            |    ❌    |
 | `CUBEJS_DB_MYSQL_USE_NAMED_TIMEZONES` | The flag to use time zone names or numeric offsets for time zone conversion. Default is `false` | `true`, `false` | ❌ |
+| `CUBEJS_CONCURRENCY` | The number of [concurrent queries][ref-data-source-concurrency] to the data source | A valid number |    ❌    |
+
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-source-concurrency
 
 ## Pre-Aggregation Feature Support
 
diff --git a/docs/pages/product/configuration/data-sources/oracle.mdx b/docs/pages/product/configuration/data-sources/oracle.mdx
index 96769c9b74555..8561b59d2d472 100644
--- a/docs/pages/product/configuration/data-sources/oracle.mdx
+++ b/docs/pages/product/configuration/data-sources/oracle.mdx
@@ -37,8 +37,10 @@ CUBEJS_DB_PASS=**********
 | `CUBEJS_DB_USER`     | The username used to connect to the database                                        | A valid database username |    ✅    |
 | `CUBEJS_DB_PASS`     | The password used to connect to the database                                        | A valid database password |    ✅    |
 | `CUBEJS_DB_SSL`      | If `true`, enables SSL encryption for database connections from Cube                | `true`, `false`           |    ❌    |
-| `CUBEJS_CONCURRENCY` | The number of concurrent connections each queue has to the database. Default is `2` | A valid number            |    ❌    |
 | `CUBEJS_DB_MAX_POOL` | The maximum number of concurrent database connections to pool. Default is `8`       | A valid number            |    ❌    |
+| `CUBEJS_CONCURRENCY` | The number of [concurrent queries][ref-data-source-concurrency] to the data source | A valid number |    ❌    |
+
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-source-concurrency
 
 ## SSL
 
diff --git a/docs/pages/product/configuration/data-sources/pinot.mdx b/docs/pages/product/configuration/data-sources/pinot.mdx
index 6b8eb052cf488..6331bade4644f 100644
--- a/docs/pages/product/configuration/data-sources/pinot.mdx
+++ b/docs/pages/product/configuration/data-sources/pinot.mdx
@@ -51,6 +51,9 @@ CUBEJS_DB_PASS=**********
 | `CUBEJS_DB_NAME`                | The database name for StarTree                        | A valid name        |    ❌    |
 | `CUBEJS_DB_PINOT_NULL_HANDLING` | If `true`, enables null handling. Default is `false`  | `true`, `false`     |    ❌    |
 | `CUBEJS_DB_PINOT_AUTH_TOKEN`    | The authentication token for StarTree                 | A valid token       |    ❌    |
+| `CUBEJS_CONCURRENCY` | The number of [concurrent queries][ref-data-source-concurrency] to the data source | A valid number |    ❌    |
+
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-source-concurrency
 
 ## Pre-Aggregation Feature Support
 
diff --git a/docs/pages/product/configuration/data-sources/postgres.mdx b/docs/pages/product/configuration/data-sources/postgres.mdx
index 3460bdd1b1c4f..f0010e4f7f804 100644
--- a/docs/pages/product/configuration/data-sources/postgres.mdx
+++ b/docs/pages/product/configuration/data-sources/postgres.mdx
@@ -36,8 +36,10 @@ CUBEJS_DB_PASS=**********
 | `CUBEJS_DB_USER`     | The username used to connect to the database                                        | A valid database username |    ✅    |
 | `CUBEJS_DB_PASS`     | The password used to connect to the database                                        | A valid database password |    ✅    |
 | `CUBEJS_DB_SSL`      | If `true`, enables SSL encryption for database connections from Cube                | `true`, `false`           |    ❌    |
-| `CUBEJS_CONCURRENCY` | The number of concurrent connections each queue has to the database. Default is `2` | A valid number            |    ❌    |
 | `CUBEJS_DB_MAX_POOL` | The maximum number of concurrent database connections to pool. Default is `8`       | A valid number            |    ❌    |
+| `CUBEJS_CONCURRENCY` | The number of [concurrent queries][ref-data-source-concurrency] to the data source | A valid number |    ❌    |
+
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-source-concurrency
 
 ## Pre-Aggregation Feature Support
 
diff --git a/docs/pages/product/configuration/data-sources/presto.mdx b/docs/pages/product/configuration/data-sources/presto.mdx
index 7a53fe4f0dae9..a889013134c58 100644
--- a/docs/pages/product/configuration/data-sources/presto.mdx
+++ b/docs/pages/product/configuration/data-sources/presto.mdx
@@ -38,8 +38,10 @@ CUBEJS_DB_SCHEMA=my_presto_schema
 | `CUBEJS_DB_PRESTO_CATALOG` | The catalog within Presto to connect to                                             | A valid catalog name within a Presto database |    ✅    |
 | `CUBEJS_DB_SCHEMA`         | The schema within the database to connect to                                        | A valid schema name within a Presto database  |    ✅    |
 | `CUBEJS_DB_SSL`            | If `true`, enables SSL encryption for database connections from Cube                | `true`, `false`                               |    ❌    |
-| `CUBEJS_CONCURRENCY`       | The number of concurrent connections each queue has to the database. Default is `2` | A valid number                                |    ❌    |
 | `CUBEJS_DB_MAX_POOL`       | The maximum number of concurrent database connections to pool. Default is `8`       | A valid number                                |    ❌    |
+| `CUBEJS_CONCURRENCY` | The number of [concurrent queries][ref-data-source-concurrency] to the data source | A valid number |    ❌    |
+
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-source-concurrency
 
 ## Pre-Aggregation Feature Support
 
diff --git a/docs/pages/product/configuration/data-sources/questdb.mdx b/docs/pages/product/configuration/data-sources/questdb.mdx
index c3b0d6a7820f6..b628a7b60c63e 100644
--- a/docs/pages/product/configuration/data-sources/questdb.mdx
+++ b/docs/pages/product/configuration/data-sources/questdb.mdx
@@ -74,8 +74,10 @@ Access Cube at http://localhost:4000 & QuestDB at http://localhost:9000
 | `CUBEJS_DB_USER`     | The username used to connect to the database                                        | A valid database username |    ✅    |
 | `CUBEJS_DB_PASS`     | The password used to connect to the database                                        | A valid database password |    ✅    |
 | `CUBEJS_DB_SSL`      | If `true`, enables SSL encryption for database connections from Cube                | `true`, `false`           |    ❌    |
-| `CUBEJS_CONCURRENCY` | The number of concurrent connections each queue has to the database. Default is `2` | A valid number            |    ❌    |
 | `CUBEJS_DB_MAX_POOL` | The maximum number of concurrent database connections to pool. Default is `8`       | A valid number            |    ❌    |
+| `CUBEJS_CONCURRENCY` | The number of [concurrent queries][ref-data-source-concurrency] to the data source | A valid number |    ❌    |
+
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-source-concurrency
 
 [questdb]: https://questdb.io/
 [questdb-slack]: https://slack.questdb.io/
diff --git a/docs/pages/product/configuration/data-sources/risingwave.mdx b/docs/pages/product/configuration/data-sources/risingwave.mdx
index 712f0df6a25bb..5195deb65e6a2 100644
--- a/docs/pages/product/configuration/data-sources/risingwave.mdx
+++ b/docs/pages/product/configuration/data-sources/risingwave.mdx
@@ -37,8 +37,10 @@ CUBEJS_DB_PASS=risingwave_password
 | `CUBEJS_DB_USER`     | The username used to connect to the database                                        | A valid database username |    ✅    |
 | `CUBEJS_DB_PASS`     | The password used to connect to the database                                        | A valid database password |    ✅    |
 | `CUBEJS_DB_SSL`      | If `true`, enables [SSL encryption](https://docs.risingwave.com/docs/current/secure-connections-with-ssl-tls/) for database connections from Cube | `true`, `false`           |    ❌    |
-| `CUBEJS_CONCURRENCY` | The number of concurrent connections each queue has to the database. Default is `2` | A valid number            |    ❌    |
 | `CUBEJS_DB_MAX_POOL` | The maximum number of concurrent database connections to pool. Default is `8`       | A valid number            |    ❌    |
+| `CUBEJS_CONCURRENCY` | The number of [concurrent queries][ref-data-source-concurrency] to the data source | A valid number |    ❌    |
+
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-source-concurrency
 
 ## Pre-aggregation feature support
 
diff --git a/docs/pages/product/configuration/data-sources/snowflake.mdx b/docs/pages/product/configuration/data-sources/snowflake.mdx
index d27de799c56dd..5297d07e69400 100644
--- a/docs/pages/product/configuration/data-sources/snowflake.mdx
+++ b/docs/pages/product/configuration/data-sources/snowflake.mdx
@@ -78,8 +78,10 @@ if [dedicated infrastructure][ref-dedicated-infra] is used. Check out the
 | `CUBEJS_DB_SNOWFLAKE_AUTHENTICATOR`             | The type of authenticator to use with Snowflake. Use `SNOWFLAKE` with username/password, or `SNOWFLAKE_JWT` with key pairs. Defaults to `SNOWFLAKE` | `SNOWFLAKE`, `SNOWFLAKE_JWT`                                           |    ❌    |
 | `CUBEJS_DB_SNOWFLAKE_PRIVATE_KEY_PATH`          | The path to the private RSA key folder                                                                                                              | A valid path to the private RSA key                                    |    ❌    |
 | `CUBEJS_DB_SNOWFLAKE_PRIVATE_KEY_PASS`          | The password for the private RSA key. Only required for encrypted keys                                                                              | A valid password for the encrypted private RSA key                     |    ❌    |
-| `CUBEJS_CONCURRENCY`                            | The number of concurrent connections each queue has to the database. Default is `5`                                                                 | A valid number                                                         |    ❌    |
 | `CUBEJS_DB_MAX_POOL`                            | The maximum number of concurrent database connections to pool. Default is `20`                                                                      | A valid number                                                         |    ❌    |
+| `CUBEJS_CONCURRENCY` | The number of [concurrent queries][ref-data-source-concurrency] to the data source | A valid number |    ❌    |
+
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-source-concurrency
 
 ## Pre-Aggregation Feature Support
 
diff --git a/docs/pages/product/configuration/data-sources/sqlite.mdx b/docs/pages/product/configuration/data-sources/sqlite.mdx
index 9aa1fc450d49b..f955aaa2bd64e 100644
--- a/docs/pages/product/configuration/data-sources/sqlite.mdx
+++ b/docs/pages/product/configuration/data-sources/sqlite.mdx
@@ -25,8 +25,10 @@ CUBEJS_DB_NAME=my_sqlite_database
 | Environment Variable | Description                                                                         | Possible Values       | Required |
 | -------------------- | ----------------------------------------------------------------------------------- | --------------------- | :------: |
 | `CUBEJS_DB_NAME`     | The name of the database to connect to                                              | A valid database name |    ✅    |
-| `CUBEJS_CONCURRENCY` | The number of concurrent connections each queue has to the database. Default is `2` | A valid number        |    ❌    |
 | `CUBEJS_DB_MAX_POOL` | The maximum number of concurrent database connections to pool. Default is `8`       | A valid number        |    ❌    |
+| `CUBEJS_CONCURRENCY` | The number of [concurrent queries][ref-data-source-concurrency] to the data source | A valid number |    ❌    |
+
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-source-concurrency
 
 ## SSL
 
diff --git a/docs/pages/product/configuration/data-sources/trino.mdx b/docs/pages/product/configuration/data-sources/trino.mdx
index 83a5f7450f689..816d01455f958 100644
--- a/docs/pages/product/configuration/data-sources/trino.mdx
+++ b/docs/pages/product/configuration/data-sources/trino.mdx
@@ -37,8 +37,10 @@ CUBEJS_DB_SCHEMA=my_trino_schema
 | `CUBEJS_DB_PRESTO_CATALOG` | The catalog within Presto to connect to                                             | A valid catalog name within a Presto database |    ✅    |
 | `CUBEJS_DB_SCHEMA`         | The schema within the database to connect to                                        | A valid schema name within a Presto database  |    ✅    |
 | `CUBEJS_DB_SSL`            | If `true`, enables SSL encryption for database connections from Cube                | `true`, `false`                               |    ❌    |
-| `CUBEJS_CONCURRENCY`       | The number of concurrent connections each queue has to the database. Default is `2` | A valid number                                |    ❌    |
 | `CUBEJS_DB_MAX_POOL`       | The maximum number of concurrent database connections to pool. Default is `8`       | A valid number                                |    ❌    |
+| `CUBEJS_CONCURRENCY` | The number of [concurrent queries][ref-data-source-concurrency] to the data source | A valid number |    ❌    |
+
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-source-concurrency
 
 ## Pre-Aggregation Feature Support
 
diff --git a/docs/pages/product/configuration/data-sources/vertica.mdx b/docs/pages/product/configuration/data-sources/vertica.mdx
index de4151e9bf1d8..f7a9fb5f19001 100644
--- a/docs/pages/product/configuration/data-sources/vertica.mdx
+++ b/docs/pages/product/configuration/data-sources/vertica.mdx
@@ -33,8 +33,10 @@ CUBEJS_DB_SCHEMA=my_vertica_schema
 | `CUBEJS_DB_PASS`           | The password used to connect to the database                                        | A valid database password                     |    ✅    |
 | `CUBEJS_DB_SCHEMA`         | The schema within the database to connect to                                        | A valid schema name within a Presto database  |    ✅    |
 | `CUBEJS_DB_SSL`            | If `true`, enables SSL encryption for database connections from Cube                | `true`, `false`                               |    ❌    |
-| `CUBEJS_CONCURRENCY`       | The number of concurrent connections each queue has to the database. Default is `2` | A valid number                                |    ❌    |
 | `CUBEJS_DB_MAX_POOL`       | The maximum number of concurrent database connections to pool. Default is `8`       | A valid number                                |    ❌    |
+| `CUBEJS_CONCURRENCY` | The number of [concurrent queries][ref-data-source-concurrency] to the data source | A valid number |    ❌    |
+
+[ref-data-source-concurrency]: /product/configuration/concurrency#data-source-concurrency
 
 
 ## SSL
diff --git a/docs/pages/product/configuration/advanced/multiple-data-sources.mdx b/docs/pages/product/configuration/multiple-data-sources.mdx
similarity index 97%
rename from docs/pages/product/configuration/advanced/multiple-data-sources.mdx
rename to docs/pages/product/configuration/multiple-data-sources.mdx
index 02ce03d32f4f8..56e11f610a2a4 100644
--- a/docs/pages/product/configuration/advanced/multiple-data-sources.mdx
+++ b/docs/pages/product/configuration/multiple-data-sources.mdx
@@ -1,9 +1,4 @@
----
-redirect_from:
-  - /config/multiple-data-sources
----
-
-# Multiple Data Sources
+# Connecting to multiple data sources
 
 Cube supports connecting to multiple data sources, so that different
 [cubes](/reference/data-model/cube) reference data from different
diff --git a/docs/pages/product/configuration/advanced/multitenancy.mdx b/docs/pages/product/configuration/multitenancy.mdx
similarity index 100%
rename from docs/pages/product/configuration/advanced/multitenancy.mdx
rename to docs/pages/product/configuration/multitenancy.mdx
diff --git a/docs/pages/reference/configuration/environment-variables.mdx b/docs/pages/reference/configuration/environment-variables.mdx
index 5f9047f7be553..2a957a893acc4 100644
--- a/docs/pages/reference/configuration/environment-variables.mdx
+++ b/docs/pages/reference/configuration/environment-variables.mdx
@@ -113,6 +113,38 @@ The number of concurrent connections each query queue has to the database.
 It can be also set as `concurrency` in the [`orchestrator_options` configuration
 option](/reference/configuration/config#orchestrator_options).
 
+If you'd like to adjust the concurrency for the refresh worker, use
+`CUBEJS_REFRESH_WORKER_CONCURRENCY`.
+
+## `CUBEJS_REFRESH_WORKER_CONCURRENCY`
+
+The number of concurrent connections each query queue of the refresh worker
+has to the database.
+
+| Possible Values | Default in Development       | Default in Production        |
+| --------------- | ---------------------------- | ---------------------------- |
+| A valid number  | Same as `CUBEJS_CONCURRENCY` | Same as `CUBEJS_CONCURRENCY` |
+
+## `CUBEJS_SCHEDULED_REFRESH_QUERIES_PER_APP_ID`
+
+How many pre-aggregations the refresh worker will build in parallel for each
+application id as determined by the [`context_to_app_id`](#context_to_app_id)
+configuration option.
+
+Note that this parameter doesn't override the overall refresh worker concurrency,
+configured via the `CUBEJS_REFRESH_WORKER_CONCURRENCY` environment variable, and
+it should be adjusted accordingly.
+
+| Possible Values                      | Default in Development | Default in Production |
+| ------------------------------------ | ---------------------- | --------------------- |
+| A valid number of concurrent queries | 10                     | 10                    |
+
+<InfoBox>
+
+Previously, this environment variable was named `CUBEJS_SCHEDULED_REFRESH_CONCURRENCY`.
+
+</InfoBox>
+
 ## `CUBEJS_CUBESTORE_HOST`
 
 The hostname of the Cube Store deployment
@@ -1038,15 +1070,7 @@ mode](/product/caching/using-pre-aggregations#rollup-only-mode) for details.
 It can be also set using the [`orchestrator_options.rollupOnlyMode` configuration
 option](/reference/configuration/config#orchestrator_options).
 
-## `CUBEJS_SCHEDULED_REFRESH_CONCURRENCY`
-
-How many pre-aggregations refresh worker will build in parallel. Please note
-changing this param doesn't change queue concurrency and it should be adjusted
-accordingly
 
-| Possible Values                                | Default in Development | Default in Production |
-| ---------------------------------------------- | ---------------------- | --------------------- |
-| A valid number of concurrent refresh processes | 10                     | 10                    |
 
 ## `CUBEJS_SCHEDULED_REFRESH_TIMEZONES`
 
diff --git a/docs/redirects.json b/docs/redirects.json
index 6155b8fb3a157..0eb1d477a6b3b 100644
--- a/docs/redirects.json
+++ b/docs/redirects.json
@@ -1,4 +1,14 @@
 [
+  {
+    "source": "/product/configuration/advanced/multiple-data-sources",
+    "destination": "/product/configuration/multiple-data-sources",
+    "permanent": true
+  },
+  {
+    "source": "/product/configuration/advanced/multitenancy",
+    "destination": "/product/configuration/multitenancy",
+    "permanent": true
+  },
   {
     "source": "/product/workspace/visual-modeler",
     "destination": "/product/workspace/visual-model",
@@ -901,12 +911,12 @@
   },
   {
     "source": "/config/multitenancy",
-    "destination": "/product/configuration/advanced/multitenancy",
+    "destination": "/product/configuration/multitenancy",
     "permanent": true
   },
   {
     "source": "/config/multiple-data-sources",
-    "destination": "/product/configuration/advanced/multiple-data-sources",
+    "destination": "/product/configuration/multiple-data-sources",
     "permanent": true
   },
   {