diff --git a/docs/filesystem_layer.md b/docs/filesystem_layer.md
index d83ffa85f4..3b68452dc6 100644
--- a/docs/filesystem_layer.md
+++ b/docs/filesystem_layer.md
@@ -2,6 +2,8 @@
 
 ![Filesystem layer](img/filesystem_layer.png)
 
+## CernVM File System (CernVM-FS)
+
 The bottom layer of the EESSI project is the **filesystem layer**,
 which is responsible for distributing the software stack.
 
@@ -16,4 +18,8 @@ The hierarchical structure with multiple caching layers (Stratum-0, Stratum-1's
 For a (basic) introduction to CernVM-FS, see [this presentation](https://www.youtube.com/watch?v=MyYx-xaL36k).
 
 Detailed information about how we configure CVMFS is available at
-[https://github.com/EESSI/filesystem-layer](https://github.com/EESSI/filesystem-layer) .
+[https://github.com/EESSI/filesystem-layer](https://github.com/EESSI/filesystem-layer).
+
+## EESSI infrastructure
+
+For both the [pilot](repositories/pilot.md) and [production](repositories/software.eessi.io.md) repositories, EESSI hosts a CernVM-FS Stratum 0 and a number of public Stratum 1 servers. Client systems using EESSI by default connect against the public EESSI CernVM-FS Stratum 1 servers. The status of the infrastructure for the pilot repository is displayed at [http://status.eessi-infra.org](http://status.eessi-infra.org/), while for the production repository it is displayed at [https://status.eessi.io](https://status.eessi.io/).
diff --git a/docs/repositories/pilot.md b/docs/repositories/pilot.md
index 3d8b5f6d14..61f7dd1412 100644
--- a/docs/repositories/pilot.md
+++ b/docs/repositories/pilot.md
@@ -284,3 +284,6 @@ sysroot           (E) = /cvmfs/pilot.eessi-hpc.org/versions/2021.12/compat/linux
 trace             (E) = True
 zip-logs          (E) = bzip2
 ```
+## Infrastructure status
+
+The status of the CernVM-FS infrastructure for the pilot repository is shown [http://status.eessi-infra.org](http://status.eessi-infra.org/).
diff --git a/docs/repositories/software.eessi.io.md b/docs/repositories/software.eessi.io.md
index 8b08c4f203..f1322c2975 100644
--- a/docs/repositories/software.eessi.io.md
+++ b/docs/repositories/software.eessi.io.md
@@ -23,3 +23,6 @@ For now, use `module avail` after [initializing the EESSI environment](../using_
 
 See [cpu_targets](../software_layer/cpu_targets.md)
 
+## Infrastructure status
+
+The status of the CernVM-FS infrastructure for the production repository is shown at [https://status.eessi.io](https://status.eessi.io/).