diff --git a/docs/tutorial/access/alternatives.md b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/access/alternatives.md
similarity index 93%
rename from docs/tutorial/access/alternatives.md
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/access/alternatives.md
index f81e0df235..7f1c3faaf2 100644
--- a/docs/tutorial/access/alternatives.md
+++ b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/access/alternatives.md
@@ -1,14 +1,3 @@
-!!! danger "Work in progress"
-
- *(30 April 2025)*
-
- The contents of this tutorial are currently being reworked to be up-to-date with recent developments in CernVM-FS,
- and to be well integrated in the EESSI documentation.
-
- It is based on the *"Best Practices for CernVM-FS in HPC"* tutorial that was held on
- 4 Dec 2023, see also https://multixscale.github.io/cvmfs-tutorial-hpc-best-practices.
-
-
# Alternative ways to access CernVM-FS repositories
While a [native installation of CernVM-FS on the client system](client.md),
diff --git a/docs/tutorial/access/client.md b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/access/client.md
similarity index 97%
rename from docs/tutorial/access/client.md
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/access/client.md
index 1dd211a0f2..a1f4ef414f 100644
--- a/docs/tutorial/access/client.md
+++ b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/access/client.md
@@ -1,14 +1,3 @@
-!!! danger "Work in progress"
-
- *(30 April 2025)*
-
- The contents of this tutorial are currently being reworked to be up-to-date with recent developments in CernVM-FS,
- and to be well integrated in the EESSI documentation.
-
- It is based on the *"Best Practices for CernVM-FS in HPC"* tutorial that was held on
- 4 Dec 2023, see also https://multixscale.github.io/cvmfs-tutorial-hpc-best-practices.
-
-
# CernVM-FS client system
The recommended way to gain access to CernVM-FS repositories is to set up
diff --git a/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/access/index.md b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/access/index.md
new file mode 100644
index 0000000000..33d2896c0b
--- /dev/null
+++ b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/access/index.md
@@ -0,0 +1,6 @@
+# Accessing CernVM-FS repositories
+
+- [Setting up a CernVM-FS client system](client.md)
+- [Setting up a proxy server](proxy.md)
+- [Setting up a Stratum 1 replica server](stratum1.md)
+- [Alternative ways to access CernVM-FS repositories](alternatives.md)
diff --git a/docs/tutorial/access/proxy.md b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/access/proxy.md
similarity index 94%
rename from docs/tutorial/access/proxy.md
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/access/proxy.md
index 54226a611b..50f21bac5c 100644
--- a/docs/tutorial/access/proxy.md
+++ b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/access/proxy.md
@@ -1,14 +1,3 @@
-!!! danger "Work in progress"
-
- *(30 April 2025)*
-
- The contents of this tutorial are currently being reworked to be up-to-date with recent developments in CernVM-FS,
- and to be well integrated in the EESSI documentation.
-
- It is based on the *"Best Practices for CernVM-FS in HPC"* tutorial that was held on
- 4 Dec 2023, see also https://multixscale.github.io/cvmfs-tutorial-hpc-best-practices.
-
-
# Squid proxy server
As a first step towards a production-ready CernVM-FS setup
diff --git a/docs/tutorial/access/stratum1.md b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/access/stratum1.md
similarity index 97%
rename from docs/tutorial/access/stratum1.md
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/access/stratum1.md
index ffbb84a2b9..84fe4b47bc 100644
--- a/docs/tutorial/access/stratum1.md
+++ b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/access/stratum1.md
@@ -1,14 +1,3 @@
-!!! danger "Work in progress"
-
- *(30 April 2025)*
-
- The contents of this tutorial are currently being reworked to be up-to-date with recent developments in CernVM-FS,
- and to be well integrated in the EESSI documentation.
-
- It is based on the *"Best Practices for CernVM-FS in HPC"* tutorial that was held on
- 4 Dec 2023, see also https://multixscale.github.io/cvmfs-tutorial-hpc-best-practices.
-
-
# Private Stratum 1 replica server
In this section of the tutorial, we will set up a [Stratum 1 replica server](
diff --git a/docs/tutorial/appendix/terminology.md b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/appendix/terminology.md
similarity index 93%
rename from docs/tutorial/appendix/terminology.md
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/appendix/terminology.md
index ec29806778..e0212a2212 100644
--- a/docs/tutorial/appendix/terminology.md
+++ b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/appendix/terminology.md
@@ -1,14 +1,3 @@
-!!! danger "Work in progress"
-
- *(30 April 2025)*
-
- The contents of this tutorial are currently being reworked to be up-to-date with recent developments in CernVM-FS,
- and to be well integrated in the EESSI documentation.
-
- It is based on the *"Best Practices for CernVM-FS in HPC"* tutorial that was held on
- 4 Dec 2023, see also https://multixscale.github.io/cvmfs-tutorial-hpc-best-practices.
-
-
# CernVM-FS Terminology
An overview of terms used in the context of CernVM-FS, in alphabetical order.
diff --git a/docs/tutorial/configuration_hpc.md b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/configuration_hpc.md
similarity index 96%
rename from docs/tutorial/configuration_hpc.md
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/configuration_hpc.md
index 7bc91bde88..0ae304caa5 100644
--- a/docs/tutorial/configuration_hpc.md
+++ b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/configuration_hpc.md
@@ -1,14 +1,3 @@
-!!! danger "Work in progress"
-
- *(30 April 2025)*
-
- The contents of this tutorial are currently being reworked to be up-to-date with recent developments in CernVM-FS,
- and to be well integrated in the EESSI documentation.
-
- It is based on the *"Best Practices for CernVM-FS in HPC"* tutorial that was held on
- 4 Dec 2023, see also https://multixscale.github.io/cvmfs-tutorial-hpc-best-practices.
-
-
# Configuring CernVM-FS on HPC infrastructure
In the [previous section](access/index.md) we have outlined how to set up a robust CernVM-FS infrastructure, by having a private Stratum 1 replica server and/or dedicated Squid proxy servers. While this approach will work for many HPC systems, some may have slightly more esoteric setups that require specific solutions, which we will discuss in this section.
diff --git a/docs/tutorial/containers.md b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/containers.md
similarity index 88%
rename from docs/tutorial/containers.md
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/containers.md
index 678cb2c1a7..70e53440ee 100644
--- a/docs/tutorial/containers.md
+++ b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/containers.md
@@ -1,14 +1,3 @@
-!!! danger "Work in progress"
-
- *(30 April 2025)*
-
- The contents of this tutorial are currently being reworked to be up-to-date with recent developments in CernVM-FS,
- and to be well integrated in the EESSI documentation.
-
- It is based on the *"Best Practices for CernVM-FS in HPC"* tutorial that was held on
- 4 Dec 2023, see also https://multixscale.github.io/cvmfs-tutorial-hpc-best-practices.
-
-
# Containers and CernVM-FS
CernVM-FS can also be used to distribute container images, providing many of the same benefits that come with any CernVM-FS installation. Especially the on-demand download of accessed files means that containers start nearly instantly, and are more efficient for large images when only a fraction of the files are read, which is typically the case.
diff --git a/docs/tutorial/creating-repo.md b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/creating-repo.md
similarity index 84%
rename from docs/tutorial/creating-repo.md
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/creating-repo.md
index ac6cbed2bf..24cbd78475 100644
--- a/docs/tutorial/creating-repo.md
+++ b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/creating-repo.md
@@ -1,14 +1,3 @@
-!!! danger "Work in progress"
-
- *(30 April 2025)*
-
- The contents of this tutorial are currently being reworked to be up-to-date with recent developments in CernVM-FS,
- and to be well integrated in the EESSI documentation.
-
- It is based on the *"Best Practices for CernVM-FS in HPC"* tutorial that was held on
- 4 Dec 2023, see also https://multixscale.github.io/cvmfs-tutorial-hpc-best-practices.
-
-
# Creating a CernVM-FS repository
Although creating a new CernVM-FS repository and making it available to the world is not in scope for this
diff --git a/docs/tutorial/cvmfs/flagship-repositories.md b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/cvmfs/flagship-repositories.md
similarity index 89%
rename from docs/tutorial/cvmfs/flagship-repositories.md
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/cvmfs/flagship-repositories.md
index 0b281359ec..9ab1e89f08 100644
--- a/docs/tutorial/cvmfs/flagship-repositories.md
+++ b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/cvmfs/flagship-repositories.md
@@ -1,14 +1,3 @@
-!!! danger "Work in progress"
-
- *(30 April 2025)*
-
- The contents of this tutorial are currently being reworked to be up-to-date with recent developments in CernVM-FS,
- and to be well integrated in the EESSI documentation.
-
- It is based on the *"Best Practices for CernVM-FS in HPC"* tutorial that was held on
- 4 Dec 2023, see also https://multixscale.github.io/cvmfs-tutorial-hpc-best-practices.
-
-
# Flagship CernVM-FS repositories
Here we list a couple of flagship CernVM-FS repositories, all of which are **publicly available**.
diff --git a/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/cvmfs/index.md b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/cvmfs/index.md
new file mode 100644
index 0000000000..460091a728
--- /dev/null
+++ b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/cvmfs/index.md
@@ -0,0 +1,9 @@
+# Introduction to CernVM-FS
+
+
+
+
+
+- [What is CernVM-FS?](what-is-cvmfs.md)
+- [Technical details](technical-details.md)
+- [Flagship repositories](flagship-repositories.md)
diff --git a/docs/tutorial/cvmfs/technical-details.md b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/cvmfs/technical-details.md
similarity index 85%
rename from docs/tutorial/cvmfs/technical-details.md
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/cvmfs/technical-details.md
index 7d9e66be42..c849d980d0 100644
--- a/docs/tutorial/cvmfs/technical-details.md
+++ b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/cvmfs/technical-details.md
@@ -1,14 +1,3 @@
-!!! danger "Work in progress"
-
- *(30 April 2025)*
-
- The contents of this tutorial are currently being reworked to be up-to-date with recent developments in CernVM-FS,
- and to be well integrated in the EESSI documentation.
-
- It is based on the *"Best Practices for CernVM-FS in HPC"* tutorial that was held on
- 4 Dec 2023, see also https://multixscale.github.io/cvmfs-tutorial-hpc-best-practices.
-
-
# Technical details of CernVM-FS
CernVM-FS is implemented as a *POSIX read-only [filesystem in user space (FUSE)](https://en.wikipedia.org/wiki/Filesystem_in_Userspace)*
diff --git a/docs/tutorial/cvmfs/what-is-cvmfs.md b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/cvmfs/what-is-cvmfs.md
similarity index 94%
rename from docs/tutorial/cvmfs/what-is-cvmfs.md
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/cvmfs/what-is-cvmfs.md
index c2662cdce4..aed237940b 100644
--- a/docs/tutorial/cvmfs/what-is-cvmfs.md
+++ b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/cvmfs/what-is-cvmfs.md
@@ -1,14 +1,3 @@
-!!! danger "Work in progress"
-
- *(30 April 2025)*
-
- The contents of this tutorial are currently being reworked to be up-to-date with recent developments in CernVM-FS,
- and to be well integrated in the EESSI documentation.
-
- It is based on the *"Best Practices for CernVM-FS in HPC"* tutorial that was held on
- 4 Dec 2023, see also https://multixscale.github.io/cvmfs-tutorial-hpc-best-practices.
-
-
# What is CernVM-FS?
diff --git a/docs/tutorial/eessi/high-level-design.md b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/eessi/high-level-design.md
similarity index 96%
rename from docs/tutorial/eessi/high-level-design.md
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/eessi/high-level-design.md
index bb4623946f..918a95a026 100644
--- a/docs/tutorial/eessi/high-level-design.md
+++ b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/eessi/high-level-design.md
@@ -1,14 +1,3 @@
-!!! danger "Work in progress"
-
- *(30 April 2025)*
-
- The contents of this tutorial are currently being reworked to be up-to-date with recent developments in CernVM-FS,
- and to be well integrated in the EESSI documentation.
-
- It is based on the *"Best Practices for CernVM-FS in HPC"* tutorial that was held on
- 4 Dec 2023, see also https://multixscale.github.io/cvmfs-tutorial-hpc-best-practices.
-
-
# High-level design of EESSI
The design of EESSI is very similar to that of the [Compute Canada software stack](inspiration.md) it is inspired by,
diff --git a/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/eessi/index.md b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/eessi/index.md
new file mode 100644
index 0000000000..84e539c773
--- /dev/null
+++ b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/eessi/index.md
@@ -0,0 +1,14 @@
+# EESSI
+
+## European Environment for Scientific Software Installations
+
+
+
+
+
+* [What is EESSI?](what-is-eessi.md)
+* [Motivation & Goals](motivation-goals.md)
+* [Inspiration](inspiration.md)
+* [High-level design](high-level-design.md)
+* [Using EESSI](using-eessi.md)
+* [Getting support](support.md)
diff --git a/docs/tutorial/eessi/inspiration.md b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/eessi/inspiration.md
similarity index 84%
rename from docs/tutorial/eessi/inspiration.md
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/eessi/inspiration.md
index 1a71853a97..63d9b2ad89 100644
--- a/docs/tutorial/eessi/inspiration.md
+++ b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/eessi/inspiration.md
@@ -1,14 +1,3 @@
-!!! danger "Work in progress"
-
- *(30 April 2025)*
-
- The contents of this tutorial are currently being reworked to be up-to-date with recent developments in CernVM-FS,
- and to be well integrated in the EESSI documentation.
-
- It is based on the *"Best Practices for CernVM-FS in HPC"* tutorial that was held on
- 4 Dec 2023, see also https://multixscale.github.io/cvmfs-tutorial-hpc-best-practices.
-
-
# Inspiration for EESSI
The EESSI concept is heavily inspired by software stack provided by the
diff --git a/docs/tutorial/eessi/motivation-goals.md b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/eessi/motivation-goals.md
similarity index 88%
rename from docs/tutorial/eessi/motivation-goals.md
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/eessi/motivation-goals.md
index 1c0e441bba..253babc939 100644
--- a/docs/tutorial/eessi/motivation-goals.md
+++ b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/eessi/motivation-goals.md
@@ -1,14 +1,3 @@
-!!! danger "Work in progress"
-
- *(30 April 2025)*
-
- The contents of this tutorial are currently being reworked to be up-to-date with recent developments in CernVM-FS,
- and to be well integrated in the EESSI documentation.
-
- It is based on the *"Best Practices for CernVM-FS in HPC"* tutorial that was held on
- 4 Dec 2023, see also https://multixscale.github.io/cvmfs-tutorial-hpc-best-practices.
-
-
# Motivation & Goals of EESSI
## Motivation
diff --git a/docs/tutorial/eessi/support.md b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/eessi/support.md
similarity index 65%
rename from docs/tutorial/eessi/support.md
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/eessi/support.md
index 20ddc7a8bd..b88ad5e8d7 100644
--- a/docs/tutorial/eessi/support.md
+++ b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/eessi/support.md
@@ -1,14 +1,3 @@
-!!! danger "Work in progress"
-
- *(30 April 2025)*
-
- The contents of this tutorial are currently being reworked to be up-to-date with recent developments in CernVM-FS,
- and to be well integrated in the EESSI documentation.
-
- It is based on the *"Best Practices for CernVM-FS in HPC"* tutorial that was held on
- 4 Dec 2023, see also https://multixscale.github.io/cvmfs-tutorial-hpc-best-practices.
-
-
# Getting support for EESSI
diff --git a/docs/tutorial/eessi/using-eessi.md b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/eessi/using-eessi.md
similarity index 93%
rename from docs/tutorial/eessi/using-eessi.md
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/eessi/using-eessi.md
index 7ccf8b879c..557d14ef8c 100644
--- a/docs/tutorial/eessi/using-eessi.md
+++ b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/eessi/using-eessi.md
@@ -1,14 +1,3 @@
-!!! danger "Work in progress"
-
- *(30 April 2025)*
-
- The contents of this tutorial are currently being reworked to be up-to-date with recent developments in CernVM-FS,
- and to be well integrated in the EESSI documentation.
-
- It is based on the *"Best Practices for CernVM-FS in HPC"* tutorial that was held on
- 4 Dec 2023, see also https://multixscale.github.io/cvmfs-tutorial-hpc-best-practices.
-
-
# Using EESSI
Using the software installations provided by the EESSI CernVM-FS repository `software.eessi.io`
diff --git a/docs/tutorial/eessi/what-is-eessi.md b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/eessi/what-is-eessi.md
similarity index 62%
rename from docs/tutorial/eessi/what-is-eessi.md
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/eessi/what-is-eessi.md
index 92747d2995..5135796949 100644
--- a/docs/tutorial/eessi/what-is-eessi.md
+++ b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/eessi/what-is-eessi.md
@@ -1,14 +1,3 @@
-!!! danger "Work in progress"
-
- *(30 April 2025)*
-
- The contents of this tutorial are currently being reworked to be up-to-date with recent developments in CernVM-FS,
- and to be well integrated in the EESSI documentation.
-
- It is based on the *"Best Practices for CernVM-FS in HPC"* tutorial that was held on
- 4 Dec 2023, see also https://multixscale.github.io/cvmfs-tutorial-hpc-best-practices.
-
-
# What is EESSI?
The [European Environment for Scientific Software Installations](https://www.eessi.io) (EESSI, pronounced as "easy")
diff --git a/docs/tutorial/img/WLCG_Aug2017_globe.png b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/WLCG_Aug2017_globe.png
similarity index 100%
rename from docs/tutorial/img/WLCG_Aug2017_globe.png
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/WLCG_Aug2017_globe.png
diff --git a/docs/tutorial/img/cvmfs-stratum1.png b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/cvmfs-stratum1.png
similarity index 100%
rename from docs/tutorial/img/cvmfs-stratum1.png
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/cvmfs-stratum1.png
diff --git a/docs/tutorial/img/cvmfs_hpc.png b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/cvmfs_hpc.png
similarity index 100%
rename from docs/tutorial/img/cvmfs_hpc.png
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/cvmfs_hpc.png
diff --git a/docs/tutorial/img/eessi-high-level-design.png b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/eessi-high-level-design.png
similarity index 100%
rename from docs/tutorial/img/eessi-high-level-design.png
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/eessi-high-level-design.png
diff --git a/docs/tutorial/img/logos/CernVM-FS_logo_with_name.png b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/logos/CernVM-FS_logo_with_name.png
similarity index 100%
rename from docs/tutorial/img/logos/CernVM-FS_logo_with_name.png
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/logos/CernVM-FS_logo_with_name.png
diff --git a/docs/tutorial/img/logos/EESSI.png b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/logos/EESSI.png
similarity index 100%
rename from docs/tutorial/img/logos/EESSI.png
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/logos/EESSI.png
diff --git a/docs/tutorial/img/logos/EESSI_logo_horizontal.png b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/logos/EESSI_logo_horizontal.png
similarity index 100%
rename from docs/tutorial/img/logos/EESSI_logo_horizontal.png
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/logos/EESSI_logo_horizontal.png
diff --git a/docs/tutorial/img/logos/cvmfs_logo.png b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/logos/cvmfs_logo.png
similarity index 100%
rename from docs/tutorial/img/logos/cvmfs_logo.png
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/logos/cvmfs_logo.png
diff --git a/docs/tutorial/img/logos/cvmfs_logo_vertical.png b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/logos/cvmfs_logo_vertical.png
similarity index 100%
rename from docs/tutorial/img/logos/cvmfs_logo_vertical.png
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/logos/cvmfs_logo_vertical.png
diff --git a/docs/tutorial/img/logos/multixscale_logo.png b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/logos/multixscale_logo.png
similarity index 100%
rename from docs/tutorial/img/logos/multixscale_logo.png
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/logos/multixscale_logo.png
diff --git a/docs/tutorial/img/off_and_on.png b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/off_and_on.png
similarity index 100%
rename from docs/tutorial/img/off_and_on.png
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/off_and_on.png
diff --git a/docs/tutorial/img/overview_layers.png b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/overview_layers.png
similarity index 100%
rename from docs/tutorial/img/overview_layers.png
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/overview_layers.png
diff --git a/docs/tutorial/img/perf/tensorflow-startup-cvmfs-cold.png b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/perf/tensorflow-startup-cvmfs-cold.png
similarity index 100%
rename from docs/tutorial/img/perf/tensorflow-startup-cvmfs-cold.png
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/perf/tensorflow-startup-cvmfs-cold.png
diff --git a/docs/tutorial/img/perf/tensorflow-startup-cvmfs-hot-warm.png b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/perf/tensorflow-startup-cvmfs-hot-warm.png
similarity index 100%
rename from docs/tutorial/img/perf/tensorflow-startup-cvmfs-hot-warm.png
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/perf/tensorflow-startup-cvmfs-hot-warm.png
diff --git a/docs/tutorial/img/perf/tensorflow-startup-gpfs.png b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/perf/tensorflow-startup-gpfs.png
similarity index 100%
rename from docs/tutorial/img/perf/tensorflow-startup-gpfs.png
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/perf/tensorflow-startup-gpfs.png
diff --git a/docs/tutorial/img/perf/tensorflow-startup-local-fs-cold-vs-hot.png b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/perf/tensorflow-startup-local-fs-cold-vs-hot.png
similarity index 100%
rename from docs/tutorial/img/perf/tensorflow-startup-local-fs-cold-vs-hot.png
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/perf/tensorflow-startup-local-fs-cold-vs-hot.png
diff --git a/docs/tutorial/img/perf/tensorflow-startup-lustre.png b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/perf/tensorflow-startup-lustre.png
similarity index 100%
rename from docs/tutorial/img/perf/tensorflow-startup-lustre.png
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/perf/tensorflow-startup-lustre.png
diff --git a/docs/tutorial/img/perf/tensorflow-startup-nfs.png b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/perf/tensorflow-startup-nfs.png
similarity index 100%
rename from docs/tutorial/img/perf/tensorflow-startup-nfs.png
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/img/perf/tensorflow-startup-nfs.png
diff --git a/docs/tutorial/index.md b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/index.md
similarity index 76%
rename from docs/tutorial/index.md
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/index.md
index 515566d2c9..c7219c39fa 100644
--- a/docs/tutorial/index.md
+++ b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/index.md
@@ -1,14 +1,3 @@
-!!! danger "Work in progress"
-
- *(30 April 2025)*
-
- The contents of this tutorial are currently being reworked to be up-to-date with recent developments in CernVM-FS,
- and to be well integrated in the EESSI documentation.
-
- It is based on the *"Best Practices for CernVM-FS in HPC"* tutorial that was held on
- 4 Dec 2023, see also https://multixscale.github.io/cvmfs-tutorial-hpc-best-practices.
-
-
# Best Practices for CernVM-FS in HPC
@@ -28,6 +17,26 @@ on HPC infrastructure.
+## Recording
+
+A first long-form (~3h15min) virtual edition of this tutorial was held on 4 December 2023,
+see [here](https://multixscale.github.io/cvmfs-tutorial-hpc-best-practices/) (recording available)
+
+A slightly shorter (~2h) updated version of this tutorial was presented as a part of the
+[EESSI webinar series in May 2025](../webinar-series-2025Q2.md).
+
+The recording of this session is embedded below:
+
+
+
+
+
+
+## Slides
+
+[Available for download here](../EESSI-webinars-MayJune-2025-002-Introduction-to-CernVM-FS-20250512.pdf)
+
+
## Contents
- [Home](index.md)
@@ -55,23 +64,6 @@ on HPC infrastructure.
- [Creating a CernVM-FS repository](creating-repo.md)
- [Appendix: Terminology](appendix/terminology.md)
-
-## Recording
-
-A first virtual edition of this tutorial was held on 4 December 2023,
-the recording is available here:
-
-
-
-### Slides
-
-[Available for download here](https://raw.githubusercontent.com/multixscale/cvmfs-tutorial-hpc-best-practices/main/files/Best-Practices-for-CernVM-FS-in-HPC-20231204.pdf)
-
## Intended audience
This tutorial is intended for people with a background in HPC (system administrators, support team members,
@@ -92,12 +84,6 @@ CernVM-FS repositories on HPC infrastructure.
## Practical information
-### Registration
-
-Attendance is free, but **registration is required**: .
-
-Registration for online tutorial on Mon 4 Dec 2023 is **closed** *(since Sun 3 Dec 2023)*
-
### Slack channel
Dedicated channel in EESSI Slack: [`#cvmfs-best-practices-hpc`](https://eessi-hpc.slack.com/archives/C068DV7GY3V)
diff --git a/docs/tutorial/monitoring.md b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/monitoring.md
similarity index 86%
rename from docs/tutorial/monitoring.md
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/monitoring.md
index ff1096ab3e..7351ddcf46 100644
--- a/docs/tutorial/monitoring.md
+++ b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/monitoring.md
@@ -1,14 +1,3 @@
-!!! danger "Work in progress"
-
- *(30 April 2025)*
-
- The contents of this tutorial are currently being reworked to be up-to-date with recent developments in CernVM-FS,
- and to be well integrated in the EESSI documentation.
-
- It is based on the *"Best Practices for CernVM-FS in HPC"* tutorial that was held on
- 4 Dec 2023, see also https://multixscale.github.io/cvmfs-tutorial-hpc-best-practices.
-
-
# Monitoring CernVM-FS
There are multiple options available to automate the monitoring of CernVM-FS clients (see [CernVM-FS documentation](https://cvmfs.readthedocs.io/en/stable/cpt-configure.html#monitoring) ):
diff --git a/docs/tutorial/performance.md b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/performance.md
similarity index 98%
rename from docs/tutorial/performance.md
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/performance.md
index b424e602be..2b3d048a5c 100644
--- a/docs/tutorial/performance.md
+++ b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/performance.md
@@ -1,14 +1,3 @@
-!!! danger "Work in progress"
-
- *(30 April 2025)*
-
- The contents of this tutorial are currently being reworked to be up-to-date with recent developments in CernVM-FS,
- and to be well integrated in the EESSI documentation.
-
- It is based on the *"Best Practices for CernVM-FS in HPC"* tutorial that was held on
- 4 Dec 2023, see also https://multixscale.github.io/cvmfs-tutorial-hpc-best-practices.
-
-
# Performance aspects of CernVM-FS
One aspect we can not ignore in the context of software on HPC infrastructure is *performance* (the P in HPC).
diff --git a/docs/tutorial/stylesheets/extra.css b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/stylesheets/extra.css
similarity index 100%
rename from docs/tutorial/stylesheets/extra.css
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/stylesheets/extra.css
diff --git a/docs/tutorial/troubleshooting.md b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/troubleshooting.md
similarity index 97%
rename from docs/tutorial/troubleshooting.md
rename to docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/troubleshooting.md
index f704a4e553..990e2274f1 100644
--- a/docs/tutorial/troubleshooting.md
+++ b/docs/training-events/2025/tutorial-best-practices-cvmfs-hpc/troubleshooting.md
@@ -1,14 +1,3 @@
-!!! danger "Work in progress"
-
- *(30 April 2025)*
-
- The contents of this tutorial are currently being reworked to be up-to-date with recent developments in CernVM-FS,
- and to be well integrated in the EESSI documentation.
-
- It is based on the *"Best Practices for CernVM-FS in HPC"* tutorial that was held on
- 4 Dec 2023, see also https://multixscale.github.io/cvmfs-tutorial-hpc-best-practices.
-
-
# Troubleshooting for CernVM-FS
When you experience problems with getting access to a CernVM-FS repository,
diff --git a/docs/training-events/2025/webinar-series-2025Q2.md b/docs/training-events/2025/webinar-series-2025Q2.md
index 3585976a9f..26822a9cbb 100644
--- a/docs/training-events/2025/webinar-series-2025Q2.md
+++ b/docs/training-events/2025/webinar-series-2025Q2.md
@@ -121,6 +121,7 @@ no specific prior knowledge or experience with it is required.
- [slides (PDF)](EESSI-webinars-MayJune-2025-002-Introduction-to-CernVM-FS-20250512.pdf)
- [recording (YouTube)](https://www.youtube.com/watch?v=5-IYnxCz_aQ)
+- [tutorial website](tutorial-best-practices-cvmfs-hpc/index.md)
diff --git a/docs/training-events/index.md b/docs/training-events/index.md
index e78a76c176..aa37703fa5 100644
--- a/docs/training-events/index.md
+++ b/docs/training-events/index.md
@@ -8,5 +8,9 @@
* [*EESSI CI/CD Hackathon*](2025/hackathon-eurohpc-user-days.md) (hybrid event, 2 October 2025)
* [*EESSI happy hour sessions 2025*](2025/happy-hours-previous-sessions.md) (online sessions every Monday, starting 18 August 2025)
-* [*EESSI webinar series (May-June 2025)*](2025/webinar-series-2025Q2.md) (online tutorials, 5/12/19/26 May & 2 June)
-
+* [*EESSI webinar series (May-June 2025)*](2025/webinar-series-2025Q2.md) (online tutorials)
+ * [**Introduction to EESSI** *(5 May 2025)*](2025/webinar-series-2025Q2.md#introduction-to-eessi)
+ * [**Introduction to CernVM-FS** *(12 May 2025)*](2025/webinar-series-2025Q2.md#introduction-to-cernvm-fs)
+ * [**Introduction to EasyBuild** *(19 May 2025)*](2025/webinar-series-2025Q2.md#introduction-to-easybuild)
+ * [**EESSI for CI/CD** *(26 May 2025)*](2025/webinar-series-2025Q2.md#eessi-for-cicd)
+ * [**Using EESSI as the base for a system stack** *(2 June 2025)*](2025/webinar-series-2025Q2.md#using-eessi-as-the-base-for-a-system-stack)
diff --git a/docs/tutorial/access/index.md b/docs/tutorial/access/index.md
deleted file mode 100644
index 92fcd091b3..0000000000
--- a/docs/tutorial/access/index.md
+++ /dev/null
@@ -1,17 +0,0 @@
-!!! danger "Work in progress"
-
- *(30 April 2025)*
-
- The contents of this tutorial are currently being reworked to be up-to-date with recent developments in CernVM-FS,
- and to be well integrated in the EESSI documentation.
-
- It is based on the *"Best Practices for CernVM-FS in HPC"* tutorial that was held on
- 4 Dec 2023, see also https://multixscale.github.io/cvmfs-tutorial-hpc-best-practices.
-
-
-# Accessing CernVM-FS repositories
-
-- [Setting up a CernVM-FS client system](client.md)
-- [Setting up a proxy server](proxy.md)
-- [Setting up a Stratum 1 replica server](stratum1.md)
-- [Alternative ways to access CernVM-FS repositories](alternatives.md)
diff --git a/docs/tutorial/cvmfs/index.md b/docs/tutorial/cvmfs/index.md
deleted file mode 100644
index 6b6ccd3240..0000000000
--- a/docs/tutorial/cvmfs/index.md
+++ /dev/null
@@ -1,20 +0,0 @@
-!!! danger "Work in progress"
-
- *(30 April 2025)*
-
- The contents of this tutorial are currently being reworked to be up-to-date with recent developments in CernVM-FS,
- and to be well integrated in the EESSI documentation.
-
- It is based on the *"Best Practices for CernVM-FS in HPC"* tutorial that was held on
- 4 Dec 2023, see also https://multixscale.github.io/cvmfs-tutorial-hpc-best-practices.
-
-
-# Introduction to CernVM-FS
-
-
-
-
-
-- [What is CernVM-FS?](what-is-cvmfs.md)
-- [Technical details](technical-details.md)
-- [Flagship repositories](flagship-repositories.md)
diff --git a/docs/tutorial/eessi/index.md b/docs/tutorial/eessi/index.md
deleted file mode 100644
index e70edbe4bb..0000000000
--- a/docs/tutorial/eessi/index.md
+++ /dev/null
@@ -1,25 +0,0 @@
-!!! danger "Work in progress"
-
- *(30 April 2025)*
-
- The contents of this tutorial are currently being reworked to be up-to-date with recent developments in CernVM-FS,
- and to be well integrated in the EESSI documentation.
-
- It is based on the *"Best Practices for CernVM-FS in HPC"* tutorial that was held on
- 4 Dec 2023, see also https://multixscale.github.io/cvmfs-tutorial-hpc-best-practices.
-
-
-# EESSI
-
-## European Environment for Scientific Software Installations
-
-