diff --git a/docs/systems.md b/docs/systems.md
index b758006cc1..c9424cbccb 100644
--- a/docs/systems.md
+++ b/docs/systems.md
@@ -126,7 +126,7 @@ MareNostrum 5 is the EuroHPC JU supercomputer hosted by the [Barcelona Supercomp
 
 ### Spain
 
-#### Barcelona Supercomputing Center
+#### Barcelona Supercomputing Center (BSC)
 
 * thunder
 * arriesgado-fedora37: [General documentation](https://repo.hca.bsc.es/gitlab/epi-public/risc-v-software-development-vehicles/-/wikis/HCA-Nodes-and-Queues#commercial-risc-v-nodes)
@@ -138,6 +138,10 @@ This is a RISC-V cluster that uses [`riscv.eessi.io`](https://www.eessi.io/docs/
 
 * FinisTerrae III: [General documentation](https://cesga-docs.gitlab.io/ft3-user-guide/overview.html) | [EESSI @ FinisTerrae III](https://cesga-docs.gitlab.io/ft3-user-guide/compilers_and_dev_tools.html#eessi)
 
+#### Universitat Pompeu Fabra Barcelona (UPF)
+
+* MARVIN II: [General documentation](https://www.upf.edu/web/sct-sit/tutorials) | [EESSI @ MARVIN II](https://www.upf.edu/web/sct-sit/software)
+
 ### Czech Republic
 
 #### Czech Technical University in Prague