diff --git a/.gitignore b/.gitignore
index 2e6d3ccf..13e79b19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
# mkdocs
.cache/
site/
+_site/
+.DS_Store
diff --git a/docs/images/merlin7-open-ondemand-interactive-partition.png b/docs/images/merlin7-open-ondemand-interactive-partition.png
new file mode 100644
index 00000000..8b30e295
Binary files /dev/null and b/docs/images/merlin7-open-ondemand-interactive-partition.png differ
diff --git a/docs/images/merlin7-open-ondemand-login.png b/docs/images/merlin7-open-ondemand-login.png
new file mode 100644
index 00000000..337444cd
Binary files /dev/null and b/docs/images/merlin7-open-ondemand-login.png differ
diff --git a/docs/images/merlin7-open-ondemand-shell-access.png b/docs/images/merlin7-open-ondemand-shell-access.png
new file mode 100644
index 00000000..82446a50
Binary files /dev/null and b/docs/images/merlin7-open-ondemand-shell-access.png differ
diff --git a/docs/images/merlin7-open-ondemand-shell-password.png b/docs/images/merlin7-open-ondemand-shell-password.png
new file mode 100644
index 00000000..756f3915
Binary files /dev/null and b/docs/images/merlin7-open-ondemand-shell-password.png differ
diff --git a/docs/images/merlin7-open-ondemand-shell-session.png b/docs/images/merlin7-open-ondemand-shell-session.png
new file mode 100644
index 00000000..f0aaf311
Binary files /dev/null and b/docs/images/merlin7-open-ondemand-shell-session.png differ
diff --git a/docs/merlin7/05-Open-OnDemand/open-ondemand.md b/docs/merlin7/05-Open-OnDemand/open-ondemand.md
new file mode 100644
index 00000000..c0a60ba5
--- /dev/null
+++ b/docs/merlin7/05-Open-OnDemand/open-ondemand.md
@@ -0,0 +1,48 @@
+# ondemand.psi.ch
+[Open OnDemand](https://www.openondemand.org/) is an open-source, web-based portal that allows researchers, students, and engineers to access High-Performance Computing (HPC) resources from any device using a web browser.
+
+## Accessing Open OnDemand
+Open Ondemand can be accessed from your browser at .
+
+It's recommended to use a **Chromium-Based** browser (e.g., Google Chrome or
+Chromium) to have access to all
+features.
+
+To login, use your **PSI Credentials**.
+
+
+
+## Interactive Partition
+
+When choosing a partition in one of the applications to start a job, give
+preference to the interactive partition and keep the --reservation=interactive
+box checked.
+
+The interactive reservation provides immediate access to reserved resources.
+This means that **your job will start faster** and it will use the same reservation
+if you wish to reconnect.
+
+If you start noticing delays when using the default interactive setup, please inform the [Merlin 7 Admins](/support/introduction/#email-the-admins) so the reservation can be reviewed or extended.
+
+
+
+## Merlin 7 Shell Access
+Open OnDemand allows you to access Merlin 7 with a shell session similar to SSH
+into the cluster on your own machine. To do so, go to **Clusters > merlin7 Shell
+Access**.
+
+
+
+Then, you will be requested to type your Merlin 7 password, which should be the
+same as your PSI password.
+
+
+
+!!! warning "No screen being displayed when opening Shell Access"
+ This seems to be an issue with some browsers, for example, Firefox. Try to use a Chromium-Based browser. If the problem persists, contact the [Merlin 7 Admins](/support/introduction/#email-the-admins).
+
+Once you login to Merlin 7, you will see the same shell as connecting via SSH
+from your terminal.
+
+
+
diff --git a/docs/merlin7/05-Software-Support/ansys-rsm.md b/docs/merlin7/06-Software-Support/ansys-rsm.md
similarity index 100%
rename from docs/merlin7/05-Software-Support/ansys-rsm.md
rename to docs/merlin7/06-Software-Support/ansys-rsm.md
diff --git a/docs/merlin7/05-Software-Support/ansys.md b/docs/merlin7/06-Software-Support/ansys.md
similarity index 100%
rename from docs/merlin7/05-Software-Support/ansys.md
rename to docs/merlin7/06-Software-Support/ansys.md
diff --git a/docs/merlin7/05-Software-Support/cp2k.md b/docs/merlin7/06-Software-Support/cp2k.md
similarity index 100%
rename from docs/merlin7/05-Software-Support/cp2k.md
rename to docs/merlin7/06-Software-Support/cp2k.md
diff --git a/docs/merlin7/05-Software-Support/cray-module.env.md b/docs/merlin7/06-Software-Support/cray-module.env.md
similarity index 100%
rename from docs/merlin7/05-Software-Support/cray-module.env.md
rename to docs/merlin7/06-Software-Support/cray-module.env.md
diff --git a/docs/merlin7/05-Software-Support/dirac.md b/docs/merlin7/06-Software-Support/dirac.md
similarity index 100%
rename from docs/merlin7/05-Software-Support/dirac.md
rename to docs/merlin7/06-Software-Support/dirac.md
diff --git a/docs/merlin7/05-Software-Support/gromacs.md b/docs/merlin7/06-Software-Support/gromacs.md
similarity index 100%
rename from docs/merlin7/05-Software-Support/gromacs.md
rename to docs/merlin7/06-Software-Support/gromacs.md
diff --git a/docs/merlin7/05-Software-Support/ippl.md b/docs/merlin7/06-Software-Support/ippl.md
similarity index 100%
rename from docs/merlin7/05-Software-Support/ippl.md
rename to docs/merlin7/06-Software-Support/ippl.md
diff --git a/docs/merlin7/05-Software-Support/lammps.md b/docs/merlin7/06-Software-Support/lammps.md
similarity index 100%
rename from docs/merlin7/05-Software-Support/lammps.md
rename to docs/merlin7/06-Software-Support/lammps.md
diff --git a/docs/merlin7/05-Software-Support/matlab.md b/docs/merlin7/06-Software-Support/matlab.md
similarity index 100%
rename from docs/merlin7/05-Software-Support/matlab.md
rename to docs/merlin7/06-Software-Support/matlab.md
diff --git a/docs/merlin7/05-Software-Support/mpich.md b/docs/merlin7/06-Software-Support/mpich.md
similarity index 100%
rename from docs/merlin7/05-Software-Support/mpich.md
rename to docs/merlin7/06-Software-Support/mpich.md
diff --git a/docs/merlin7/05-Software-Support/opal-x.md b/docs/merlin7/06-Software-Support/opal-x.md
similarity index 100%
rename from docs/merlin7/05-Software-Support/opal-x.md
rename to docs/merlin7/06-Software-Support/opal-x.md
diff --git a/docs/merlin7/05-Software-Support/openmpi.md b/docs/merlin7/06-Software-Support/openmpi.md
similarity index 100%
rename from docs/merlin7/05-Software-Support/openmpi.md
rename to docs/merlin7/06-Software-Support/openmpi.md
diff --git a/docs/merlin7/05-Software-Support/pmodules.md b/docs/merlin7/06-Software-Support/pmodules.md
similarity index 100%
rename from docs/merlin7/05-Software-Support/pmodules.md
rename to docs/merlin7/06-Software-Support/pmodules.md
diff --git a/docs/merlin7/05-Software-Support/quantum-espresso.md b/docs/merlin7/06-Software-Support/quantum-espresso.md
similarity index 100%
rename from docs/merlin7/05-Software-Support/quantum-espresso.md
rename to docs/merlin7/06-Software-Support/quantum-espresso.md
diff --git a/docs/merlin7/05-Software-Support/spack.md b/docs/merlin7/06-Software-Support/spack.md
similarity index 100%
rename from docs/merlin7/05-Software-Support/spack.md
rename to docs/merlin7/06-Software-Support/spack.md
diff --git a/mkdocs.yml b/mkdocs.yml
index 12b3c6d2..d0a69741 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -118,22 +118,24 @@ nav:
- merlin7/03-Slurm-General-Documentation/slurm-mail.md
- Jupyterhub:
- merlin7/04-Jupyterhub/jupyterhub.md
+ - Open OnDemand:
+ - merlin7/05-Open-OnDemand/open-ondemand.md
- Software Support:
- - merlin7/05-Software-Support/pmodules.md
- - merlin7/05-Software-Support/openmpi.md
- - merlin7/05-Software-Support/mpich.md
- - merlin7/05-Software-Support/cray-module.env.md
- - merlin7/05-Software-Support/ansys.md
- - merlin7/05-Software-Support/ansys-rsm.md
- - merlin7/05-Software-Support/cp2k.md
- - merlin7/05-Software-Support/dirac.md
- - merlin7/05-Software-Support/gromacs.md
- - merlin7/05-Software-Support/ippl.md
- - merlin7/05-Software-Support/lammps.md
- - merlin7/05-Software-Support/matlab.md
- - merlin7/05-Software-Support/opal-x.md
- - merlin7/05-Software-Support/quantum-espresso.md
- - merlin7/05-Software-Support/spack.md
+ - merlin7/06-Software-Support/pmodules.md
+ - merlin7/06-Software-Support/openmpi.md
+ - merlin7/06-Software-Support/mpich.md
+ - merlin7/06-Software-Support/cray-module.env.md
+ - merlin7/06-Software-Support/ansys.md
+ - merlin7/06-Software-Support/ansys-rsm.md
+ - merlin7/06-Software-Support/cp2k.md
+ - merlin7/06-Software-Support/dirac.md
+ - merlin7/06-Software-Support/gromacs.md
+ - merlin7/06-Software-Support/ippl.md
+ - merlin7/06-Software-Support/lammps.md
+ - merlin7/06-Software-Support/matlab.md
+ - merlin7/06-Software-Support/opal-x.md
+ - merlin7/06-Software-Support/quantum-espresso.md
+ - merlin7/06-Software-Support/spack.md
- Merlin 6:
- Quick Start Guide:
- merlin6/introduction.md