diff --git a/docs.it4i/general/barbora-queues.md b/docs.it4i/general/barbora-queues.md
new file mode 100644
index 0000000000000000000000000000000000000000..11f02f01f5c65d35837d16d3ca1b10c12f2839ab
--- /dev/null
+++ b/docs.it4i/general/barbora-queues.md
@@ -0,0 +1,26 @@
+# Barbora Queues
+
+Below is the list of queues available on the Barbora cluster:
+
+| Queue            | Active project | Project resources    | Nodes                                                         | Min ncpus | Priority | Authorization | Walltime (default/max)  |
+| ---------------- | -------------- | -------------------- | -------------------------------- | --------- | -------- | ------------- | ---------------------- |
+| **qcpu**         | yes            | > 0                  | 190 nodes                        | 36        | 0        | no            | 24 / 48h               |
+| **qcpu_biz**     | yes            | > 0                  | 190 nodes                        | 36        | 50       | no            | 24 / 48h               |
+| **qcpu_exp**     | yes            | none required        | 16 nodes                         | 36        | 150      | no            | 1 / 1h                 |
+| **qcpu_free**    | yes            | < 150% of allocation | 124 nodes<br>max 4 nodes per job | 36        | -100     | no            | 12 / 18h               |
+| **qcpu_long**    | yes            | > 0                  | 60 nodes<br>max 20 nodes per job | 36        | 0        | no            | 72 / 144h              |
+| **qcpu_preempt** | yes            | > 0                  | 190 nodes<br>max 4 nodes per job | 36        | -200     | no            | 12 / 12h               |
+| **qgpu**         | yes            | > 0                  | 8 nodes                          | 24        | 0        | yes           | 24 / 48h               |
+| **qgpu_biz**     | yes            | > 0                  | 8 nodes                          | 24        | 50       | yes           | 24 / 48h               |
+| **qgpu_exp**     | yes            | none required        | 4 nodes<br>max 1 node per job    | 24        | 0        | no            | 1 / 1h                 |
+| **qgpu_free**    | yes            | < 150% of allocation | 5 nodes<br>max 2 nodes per job   | 24        | -100     | no            | 12 / 18h               |
+| **qgpu_preempt** | yes            | > 0                  | 4 nodes<br>max 2 nodes per job   | 24        | -200     | no            | 12 / 12h               |
+| **qdgx**         | yes            | > 0                  | cn202                            | 96        | 0        | yes           | 4 / 48h                |
+| **qviz**         | yes            | none required        | 2 nodes with NVIDIA Quadro P6000 | 4         | 0        | no            | 1 / 8h                 |
+| **qfat**         | yes            | > 0                  | 1 fat node                       | 128       | 0        | yes           | 24 / 48h               |
+| **Legacy Queues**                 |
+| **qexp**         | no             | none required        | 16 nodes<br>max 4 nodes per job  | 36        | 150      | no            | 1 / 1h                 |
+| **qprod**        | yes            | > 0                  | 190 nodes w/o accelerator        | 36        | 0        | no            | 24 / 48h               |
+| **qlong**        | yes            | > 0                  | 60 nodes w/o accelerator<br>max 20 nodes per job     | 36        | 0        | no            | 72 / 144h              |
+| **qnvidia**      | yes            | > 0                  | 8 NVIDIA nodes                   | 24        | 0        | yes           | 24 / 48h               |
+| **qfree**        | yes            | < 150% of allocation | 192 w/o accelerator<br>max 32 nodes per job  | 36       | -100    | no            | 12 / 12h     |
diff --git a/docs.it4i/general/karolina-queues.md b/docs.it4i/general/karolina-queues.md
new file mode 100644
index 0000000000000000000000000000000000000000..6c3136d33fbb2da47ba2b99fefa6512740c08bd5
--- /dev/null
+++ b/docs.it4i/general/karolina-queues.md
@@ -0,0 +1,27 @@
+# Karolina Queues
+
+Below is the list of queues available on the Karolina cluster:
+
+| Queue            | Active project | Project resources    | Nodes                                                         | Min ncpus | Priority | Authorization | Walltime (default/max)  |
+| ---------------- | -------------- | -------------------- | ------------------------------------------------------------- | --------- | -------- | ------------- | ----------------------- |
+| **qcpu**         | yes            | > 0                  | 756 nodes                                                     | 128       | 0        | no            | 24 / 48h                |
+| **qcpu_biz**     | yes            | > 0                  | 756 nodes                                                     | 128       | 50       | no            | 24 / 48h                |
+| **qcpu_eurohpc** | yes            | > 0                  | 756 nodes                                                     | 128       | 50       | no            | 24 / 48h                |
+| **qcpu_exp**     | yes            | none required        | 756 nodes<br>max 2 nodes per user                             | 128       | 150      | no            | 1 / 1h                  |
+| **qcpu_free**    | yes            | < 150% of allocation | 756 nodes<br>max 4 nodes per job                              | 128       | -100    | no            | 12 / 12h                |
+| **qcpu_long**    | yes            | > 0                  | 200 nodes<br>max 20 nodes per job, only non-accelerated nodes allowed | 128 | 0        | no            | 72 / 144h               |
+| **qcpu_preempt** | yes            | > 0                  | 756 nodes<br>max 4 nodes per job                              | 128       | -200     | no            | 12 / 12h                |
+| **qgpu**         | yes            | > 0                  | 72 nodes                                                      | 16 cpus<br>1 gpu | 0 | yes           | 24 / 48h                |
+| **qgpu_biz**     | yes            | > 0                  | 70 nodes                                                      | 128       | 50       | yes           | 24 / 48h                |
+| **qgpu_eurohpc** | yes            | > 0                  | 70 nodes                                                      | 128       | 50       | yes           | 24 / 48h                |
+| **qgpu_exp**     | yes            | none required        | 4 nodes<br>max 1 node per job                                 | 16 cpus<br>1 gpu | 0 | no            | 1 / 1h                  |
+| **qgpu_free**    | yes            | < 150% of allocation | 46 nodes<br>max 2 nodes per job                               | 16 cpus<br>1 gpu|-100| no            | 12 / 12h                |
+| **qgpu_preempt** | yes            | > 0                  | 72 nodes<br>max 2 nodes per job                               | 16 cpus<br>1 gpu|-200| no            | 12 / 12h                |
+| **qviz**         | yes            | none required        | 2 nodes (with NVIDIA® Quadro RTX™ 6000)                       | 8         | 0        | no            | 1 / 8h                  |
+| **qfat**         | yes            | > 0                  | 1 (sdf1)                                                      | 24        | 0        | yes           | 24 / 48h                |
+| **Legacy Queues**                 |
+| **qfree**        | yes            | < 150% of allocation | 756 nodes<br>max 4 nodes per job                              | 128       | -100    | no            | 12 / 12h                |
+| **qexp**         | no             | none required        | 756 nodes<br>max 2 nodes per job                             | 128       | 150      | no            | 1 / 1h                  |
+| **qprod**        | yes            | > 0                  | 756 nodes                                                     | 128       | 0        | no            | 24 / 48h                |
+| **qlong**        | yes            | > 0                  | 200 nodes<br>max 20 nodes per job, only non-accelerated nodes allowed | 128 | 0        | no            | 72 / 144h               |
+| **qnvidia**      | yes            | > 0                  | 72 nodes                                                      | 128       | 0        | yes           | 24 / 48h                |
diff --git a/snippets/resource_accounting.md b/docs.it4i/general/resource-accounting.md
similarity index 98%
rename from snippets/resource_accounting.md
rename to docs.it4i/general/resource-accounting.md
index 032b085c80ab60fbcbbbe882c5c5bf3a638cd83d..6952d538ce99b0ee5d5e82853cba48ead0873698 100644
--- a/snippets/resource_accounting.md
+++ b/docs.it4i/general/resource-accounting.md
@@ -1,4 +1,4 @@
-## Resource Accounting Policy
+# Resource Accounting Policy
 
 Starting with the 24<sup>th</sup> open access grant competition, the accounting policy has been changed from [normalized core hours (NCH)][2a] to **node-hours**. This means that it is now required to apply for node hours of the specific cluster and node type:
 
@@ -13,7 +13,7 @@ Starting with the 24<sup>th</sup> open access grant competition, the accounting
 The accounting runs whenever the nodes are allocated via the PBS Pro workload manager (the qsub command), regardless of whether
 the nodes are actually used for any calculation.
 
-### Conversion Table
+## Conversion Table
 
 | Resources | Conversion for 1 node-hour |
 | ------------ | ----------------------- | 
diff --git a/docs.it4i/general/resources-allocation-policy.md b/docs.it4i/general/resources-allocation-policy.md
index 4b20841ec3a1134c3f277011c29e1a2bcd638d5f..72387c9bd280cc620496ec72277aa9e91ec2b32d 100644
--- a/docs.it4i/general/resources-allocation-policy.md
+++ b/docs.it4i/general/resources-allocation-policy.md
@@ -10,6 +10,8 @@ Detailed information can be found in the [Job scheduling][1] section.
 Resources are accessible via several queues for queueing the jobs.
 Queues provide prioritized and exclusive access to the computational resources.
 
+Computational resources are subject to [accounting policy][7].
+
 !!! important "Queues update"
     We are introducing updated queues.
     These have the same parameters as the legacy queues but are divided based on resource type (`qcpu_` for non-accelerated nodes and `qgpu_` for accelerated nodes).<br><br>
@@ -44,58 +46,10 @@ Legacy queues stay in production until the end of 2022.
 | `nvidia`     | `qgpu` Note that unlike in new queues, only full nodes can be allocated. |
 | `qfree`      | `qcpu_free` & `qgpu_free` |
 
-The following table provides the queue partitioning per cluster overview:
-
-### Karolina
-
-| Queue            | Active project | Project resources    | Nodes                                                         | Min ncpus | Priority | Authorization | Walltime (default/max)  |
-| ---------------- | -------------- | -------------------- | ------------------------------------------------------------- | --------- | -------- | ------------- | ----------------------- |
-| **qcpu**         | yes            | > 0                  | 756 nodes                                                     | 128       | 0        | no            | 24 / 48h                |
-| **qcpu_biz**     | yes            | > 0                  | 756 nodes                                                     | 128       | 50       | no            | 24 / 48h                |
-| **qcpu_eurohpc** | yes            | > 0                  | 756 nodes                                                     | 128       | 50       | no            | 24 / 48h                |
-| **qcpu_exp**     | yes            | none required        | 756 nodes<br>max 2 nodes per user                             | 128       | 150      | no            | 1 / 1h                  |
-| **qcpu_free**    | yes            | < 150% of allocation | 756 nodes<br>max 4 nodes per job                              | 128       | -100    | no            | 12 / 12h                |
-| **qcpu_long**    | yes            | > 0                  | 200 nodes<br>max 20 nodes per job, only non-accelerated nodes allowed | 128 | 0        | no            | 72 / 144h               |
-| **qcpu_preempt** | yes            | > 0                  | 756 nodes<br>max 4 nodes per job                              | 128       | -200     | no            | 12 / 12h                |
-| **qgpu**         | yes            | > 0                  | 72 nodes                                                      | 16 cpus<br>1 gpu | 0 | yes           | 24 / 48h                |
-| **qgpu_biz**     | yes            | > 0                  | 70 nodes                                                      | 128       | 50       | yes           | 24 / 48h                |
-| **qgpu_eurohpc** | yes            | > 0                  | 70 nodes                                                      | 128       | 50       | yes           | 24 / 48h                |
-| **qgpu_exp**     | yes            | none required        | 4 nodes<br>max 1 node per job                                 | 16 cpus<br>1 gpu | 0 | no            | 1 / 1h                  |
-| **qgpu_free**    | yes            | < 150% of allocation | 46 nodes<br>max 2 nodes per job                               | 16 cpus<br>1 gpu|-100| no            | 12 / 12h                |
-| **qgpu_preempt** | yes            | > 0                  | 72 nodes<br>max 2 nodes per job                               | 16 cpus<br>1 gpu|-200| no            | 12 / 12h                |
-| **qviz**         | yes            | none required        | 2 nodes (with NVIDIA® Quadro RTX™ 6000)                       | 8         | 0        | no            | 1 / 8h                  |
-| **qfat**         | yes            | > 0                  | 1 (sdf1)                                                      | 24        | 0        | yes           | 24 / 48h                |
-| **Legacy Queues**                 |
-| **qfree**        | yes            | < 150% of allocation | 756 nodes<br>max 4 nodes per job                              | 128       | -100    | no            | 12 / 12h                |
-| **qexp**         | no             | none required        | 756 nodes<br>max 2 nodes per job                             | 128       | 150      | no            | 1 / 1h                  |
-| **qprod**        | yes            | > 0                  | 756 nodes                                                     | 128       | 0        | no            | 24 / 48h                |
-| **qlong**        | yes            | > 0                  | 200 nodes<br>max 20 nodes per job, only non-accelerated nodes allowed | 128 | 0        | no            | 72 / 144h               |
-| **qnvidia**      | yes            | > 0                  | 72 nodes                                                      | 128       | 0        | yes           | 24 / 48h                |
-
-### Barbora
-
-| Queue            | Active project | Project resources    | Nodes                                                         | Min ncpus | Priority | Authorization | Walltime (default/max)  |
-| ---------------- | -------------- | -------------------- | -------------------------------- | --------- | -------- | ------------- | ---------------------- |
-| **qcpu**         | yes            | > 0                  | 190 nodes                        | 36        | 0        | no            | 24 / 48h               |
-| **qcpu_biz**     | yes            | > 0                  | 190 nodes                        | 36        | 50       | no            | 24 / 48h               |
-| **qcpu_exp**     | yes            | none required        | 16 nodes                         | 36        | 150      | no            | 1 / 1h                 |
-| **qcpu_free**    | yes            | < 150% of allocation | 124 nodes<br>max 4 nodes per job | 36        | -100     | no            | 12 / 18h               |
-| **qcpu_long**    | yes            | > 0                  | 60 nodes<br>max 20 nodes per job | 36        | 0        | no            | 72 / 144h              |
-| **qcpu_preempt** | yes            | > 0                  | 190 nodes<br>max 4 nodes per job | 36        | -200     | no            | 12 / 12h               |
-| **qgpu**         | yes            | > 0                  | 8 nodes                          | 24        | 0        | yes           | 24 / 48h               |
-| **qgpu_biz**     | yes            | > 0                  | 8 nodes                          | 24        | 50       | yes           | 24 / 48h               |
-| **qgpu_exp**     | yes            | none required        | 4 nodes<br>max 1 node per job    | 24        | 0        | no            | 1 / 1h                 |
-| **qgpu_free**    | yes            | < 150% of allocation | 5 nodes<br>max 2 nodes per job   | 24        | -100     | no            | 12 / 18h               |
-| **qgpu_preempt** | yes            | > 0                  | 4 nodes<br>max 2 nodes per job   | 24        | -200     | no            | 12 / 12h               |
-| **qdgx**         | yes            | > 0                  | cn202                            | 96        | 0        | yes           | 4 / 48h                |
-| **qviz**         | yes            | none required        | 2 nodes with NVIDIA Quadro P6000 | 4         | 0        | no            | 1 / 8h                 |
-| **qfat**         | yes            | > 0                  | 1 fat node                       | 128       | 0        | yes           | 24 / 48h               |
-| **Legacy Queues**                 |
-| **qexp**         | no             | none required        | 16 nodes<br>max 4 nodes per job  | 36        | 150      | no            | 1 / 1h                 |
-| **qprod**        | yes            | > 0                  | 190 nodes w/o accelerator        | 36        | 0        | no            | 24 / 48h               |
-| **qlong**        | yes            | > 0                  | 60 nodes w/o accelerator<br>max 20 nodes per job     | 36        | 0        | no            | 72 / 144h              |
-| **qnvidia**      | yes            | > 0                  | 8 NVIDIA nodes                   | 24        | 0        | yes           | 24 / 48h               |
-| **qfree**        | yes            | < 150% of allocation | 192 w/o accelerator<br>max 32 nodes per job  | 36       | -100    | no            | 12 / 12h     |
+See the following subsections for the list of queues:
+
+* [Karolina queues][5]
+* [Barbora queues][6]
 
 ## Queue Notes
 
@@ -136,14 +90,15 @@ Options:
   .
 ```
 
----8<--- "resource_accounting.md"
-
 ---8<--- "mathjax.md"
 
 [1]: job-priority.md
 [2]: #resource-accounting-policy
 [3]: job-submission-and-execution.md
 [4]: ./vnode-allocation.md
+[5]: ./karolina-queues.md
+[6]: ./barbora-queues.md
+[7]: ./resource-accounting.md
 
 [a]: https://support.it4i.cz/rt/
 [c]: https://extranet.it4i.cz/rsweb
diff --git a/mkdocs.yml b/mkdocs.yml
index 9a5eb22b96fba717f4bf06b33fabc28cbd505472..a38b2085fa28b9273e54af4b0acf1412235cba0b 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -73,7 +73,11 @@ nav:
       - VPN Access: general/accessing-the-clusters/vpn-access.md
     - Run Jobs:
       - Introduction: general/resource_allocation_and_job_execution.md
-      - Resources Allocation Policy: general/resources-allocation-policy.md
+      - Resources Allocation:
+        - Resources Allocation Policy: general/resources-allocation-policy.md
+        - Karolina Queues: general/karolina-queues.md
+        - Barbora Queues: general/barbora-queues.md
+        - Resource Accounting Policy: general/resource-accounting.md
       - Job Priority: general/job-priority.md
       - Job Submission and Execution: general/job-submission-and-execution.md
       - Capacity Computing: general/capacity-computing.md