diff --git a/doc.zih.tu-dresden.de/docs/data_lifecycle/workspaces.md b/doc.zih.tu-dresden.de/docs/data_lifecycle/workspaces.md
index 6180e5db831c8faf69a8752247ad5b8ee5ef6313..141ccef84a8ffe098e42ab9bea02afd560590901 100644
--- a/doc.zih.tu-dresden.de/docs/data_lifecycle/workspaces.md
+++ b/doc.zih.tu-dresden.de/docs/data_lifecycle/workspaces.md
@@ -99,13 +99,13 @@ days with an email reminder for 7 days before the expiration.
 The lifetime of a workspace is finite. Different filesystems (storage systems) have different
 maximum durations. A workspace can be extended multiple times, depending on the filesystem.
 
-| Filesystem (use with parameter `-F`) | Duration, days | Extensions | Remarks |
-|:------------------------------------:|:----------:|:-------:|:-----------------------------------:|
-| `ssd`                                | 30         | 2       | High-IOPS filesystem (`/lustre/ssd`, symbolic link: `/ssd`) on SSDs. |
-| `beegfs_global0` (deprecated)        | 30         | 2       | High-IOPS filesystem (`/beegfs/global0`) on NVMes. |
-| `beegfs`                             | 30         | 2       | High-IOPS filesystem (`/beegfs`) on NVMes. |
-| `scratch`                            | 100        | 10      | Scratch filesystem (`/lustre/ssd`, symbolic link: `/scratch`) with high streaming bandwidth, based on spinning disks |
-| `warm_archive`                       | 365        | 2       | Capacity filesystem based on spinning disks   |
+| Filesystem (use with parameter `-F`) | Duration, days | Extensions | [Filesystem Feature](../jobs_and_resources/slurm.md#filesystem-features) | Remarks |
+|:-------------------------------------|---------------:|-----------:|:-------------------------------------------------------------------------|:--------|
+| `ssd`                                | 30             | 2          | `fs_lustre_ssd`                                                          | High-IOPS filesystem (`/lustre/ssd`, symbolic link: `/ssd`) on SSDs. |
+| `beegfs_global0` (deprecated)        | 30             | 2          | `fs_beegfs_global0`                                                      | High-IOPS filesystem (`/beegfs/global0`) on NVMes. |
+| `beegfs`                             | 30             | 2          | `fs_beegfs`                                                              | High-IOPS filesystem (`/beegfs`) on NVMes. |
+| `scratch`                            | 100            | 10         | `fs_lustre_scratch2`                                                     | Scratch filesystem (`/lustre/ssd`, symbolic link: `/scratch`) with high streaming bandwidth, based on spinning disks |
+| `warm_archive`                       | 365            | 2          | `fs_warm_archive_ws`                                                     | Capacity filesystem based on spinning disks |
 
 To extent your workspace use the following command:
 
diff --git a/doc.zih.tu-dresden.de/docs/jobs_and_resources/slurm.md b/doc.zih.tu-dresden.de/docs/jobs_and_resources/slurm.md
index f7456662f5ca54887b20b075e58dd25517aa3c96..2ba282a77bff4ff03a0c5ba92e4ef1e19494c669 100644
--- a/doc.zih.tu-dresden.de/docs/jobs_and_resources/slurm.md
+++ b/doc.zih.tu-dresden.de/docs/jobs_and_resources/slurm.md
@@ -428,13 +428,13 @@ constraints, please refer to the [Slurm documentation](https://slurm.schedmd.com
 A feature `fs_*` is active if a certain filesystem is mounted and available on a node. Access to
 these filesystems are tested every few minutes on each node and the Slurm features set accordingly.
 
-| Feature            | Description                                                          |
-|:-------------------|:---------------------------------------------------------------------|
-| `fs_lustre_scratch2` | `/scratch` mounted read-write (mount point is `/lustre/scratch2`)  |
-| `fs_lustre_ssd`      | `/ssd` mounted read-write (mount point is `/lustre/ssd`)           |
-| `fs_warm_archive_ws` | `/warm_archive/ws` mounted read-only                               |
-| `fs_beegfs_global0`  | `/beegfs/global0` mounted read-write                               |
-| `fs_beegfs`          | `/beegfs` mounted read-write                                       |
+| Feature              | Description                                                        | [Workspace Name](../data_lifecycle/workspaces.md#extension-of-a-workspace) |
+|:---------------------|:-------------------------------------------------------------------|:---------------------------------------------------------------------------|
+| `fs_lustre_scratch2` | `/scratch` mounted read-write (mount point is `/lustre/scratch2`)  | `scratch`                                                                  |
+| `fs_lustre_ssd`      | `/ssd` mounted read-write (mount point is `/lustre/ssd`)           | `ssd`                                                                      |
+| `fs_warm_archive_ws` | `/warm_archive/ws` mounted read-only                               | `warm_archive`                                                             |
+| `fs_beegfs_global0`  | `/beegfs/global0` mounted read-write                               | `beegfs_global0`                                                           |
+| `fs_beegfs`          | `/beegfs` mounted read-write                                       | `beegfs`                                                                   |
 
 For certain projects, specific filesystems are provided. For those,
 additional features are available, like `fs_beegfs_<projectname>`.