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 e13c2f695f803330fac9875715f15b4a17cbf97c..61cde983f6bd1a0305d53c6f3e1395177c3bcd89 100644
--- a/doc.zih.tu-dresden.de/docs/data_lifecycle/workspaces.md
+++ b/doc.zih.tu-dresden.de/docs/data_lifecycle/workspaces.md
@@ -39,9 +39,10 @@ filesystems.
 | `beegfs`                                                    | 30             | 2          | 30       | `fs_beegfs`                                                              |
 {: summary="Settings for Workspace Filesystems."}
 
-!!! warning "End of life filesystems"
+!!! warning "End-of-life filesystems"
 
-    The filesystems `warm_archive`, `ssd` and `scratch` will be switched off end of 2023.
+    The filesystems `warm_archive`, `ssd` and `scratch` will be switched off end of 2023. Do not use
+    them anymore!
 
     | Filesystem (use with parameter `--filesystem=<filesystem>`) | Duration, days | Extensions | [Filesystem Feature](../jobs_and_resources/slurm.md#filesystem-features) | Remarks |
     |:-------------------------------------|---------------:|-----------:|:-------------------------------------------------------------------------|:--------|
@@ -57,23 +58,47 @@ filesystems.
 ### List Available Filesystems
 
 To list all available filesystems for using workspaces, you can either invoke `ws_list -l` or
-`ws_find --list`, e.g.,
+`ws_find --list`. Since not all workspace filesystems are available on all HPC systems, the concrete
+output differs depending on the system you are loged in. The page [Working Filesystems](working.md)
+provides information which filesystem is available on which cluster.
 
-```console
-marie@login$ ws_find --list
-available filesystems:
-scratch (default)
-warm_archive
-ssd
-beegfs_global0
-beegfs
-```
+=== "Barnard"
+
+    ```console
+    marie@login.barnard$ ws_list -l
+    available filesystems:
+    horse (default)
+    walrus
+    ```
+
+=== "Taurus"
+
+    ```console
+    marie@login.taurus$ ws_list -l
+    scratch (default)
+    warm_archive
+    ssd
+    beegfs_global0
+    beegfs
+    ```
+
+=== "Alpha Centauri"
+
+    ```console
+    marie@login.alpha$ ws_list -l
+    available filesystems:
+    ssd
+    beegfs_global0
+    beegfs (default)
+    ```
 
-!!! note "Default is `scratch`"
+!!! note "Default filesystem"
 
-    The default filesystem is `scratch`. If you prefer another filesystem (cf. section
+    The output of the commands `ws_find --list` and `ws_list -l` will indicate the
+    **default filesystem**. If you prefer another filesystem (cf. section
     [List Available Filesystems](#list-available-filesystems)), you have to explictly
-    provide the option `--filesystem=<filesystem>` to the workspace commands.
+    provide the option `--filesystem=<filesystem>` to the workspace commands. If the default
+    filesystems is the one you want to work with, you can omit this option.
 
 ### List Current Workspaces