diff --git a/doc.zih.tu-dresden.de/docs/jobs_and_resources/barnard_test.md b/doc.zih.tu-dresden.de/docs/jobs_and_resources/barnard_test.md
index 864c53c7638c9aeaa9649fa5e67de829c28d25b6..5603936791a9fa117c539dde95b59693dd119052 100644
--- a/doc.zih.tu-dresden.de/docs/jobs_and_resources/barnard_test.md
+++ b/doc.zih.tu-dresden.de/docs/jobs_and_resources/barnard_test.md
@@ -1,7 +1,16 @@
-# Tests on Barnard
+# Barnard Migration How-To
 
 All HPC users are invited to test our new HPC system Barnard and prepare your software
-and workflows for production there. For general hints please refer to these sites:
+and workflows for production there.
+
+**Furthermore, all data in the `/home` directory or in workspaces on the BeeGFS or Lustre SSD file systems
+will be deleted by the end of 2023!**
+
+Existing Taurus users that would like to keep some of their need to copy some of their data on these
+file systems need
+to copy them the new system manually, using the steps described below.
+
+For general hints regarding the migration please refer to these sites:
 
 * [Details on architecture](/jobs_and_resources/architecture_2023),
 * [Description of the migration](migration_2023.md).
diff --git a/doc.zih.tu-dresden.de/docs/software/singularity_recipe_hints.md b/doc.zih.tu-dresden.de/docs/software/singularity_recipe_hints.md
index 10bd429ed450b43aae871a326f2b74274b196637..c1f570c9360a4521b0588e30224c6444f9f02c06 100644
--- a/doc.zih.tu-dresden.de/docs/software/singularity_recipe_hints.md
+++ b/doc.zih.tu-dresden.de/docs/software/singularity_recipe_hints.md
@@ -74,9 +74,9 @@ From: ubuntu:20.04
 
 %environment
     export MPICH_DIR=/opt/mpich
-    export SINGULARITY_MPICH_DIR=$MPICH_DIR
-    export SINGULARITYENV_APPEND_PATH=$MPICH_DIR/bin
-    export SINGULAIRTYENV_APPEND_LD_LIBRARY_PATH=$MPICH_DIR/lib
+    export SINGULARITY_MPICH_DIR=${MPICH_DIR}
+    export SINGULARITYENV_APPEND_PATH=${MPICH_DIR}/bin
+    export SINGULAIRTYENV_APPEND_LD_LIBRARY_PATH=${MPICH_DIR}/lib
 
 %post
     echo "Installing required packages..."
@@ -88,21 +88,21 @@ From: ubuntu:20.04
     echo "Installing MPICH"
     export MPICH_DIR=/opt/mpich
     export MPICH_VERSION=4.1
-    export MPICH_URL="https://www.mpich.org/static/downloads/$MPICH_VERSION/mpich-$MPICH_VERSION.tar.gz"
+    export MPICH_URL="https://www.mpich.org/static/downloads/${MPICH_VERSION}/mpich-${MPICH_VERSION}.tar.gz"
     mkdir -p /tmp/mpich
     mkdir -p /opt
     # Download
-    cd /tmp/mpich && wget -O mpich-$MPICH_VERSION.tar.gz $MPICH_URL && tar -xf mpich-$MPICH_VERSION.tar.gz
+    cd /tmp/mpich && wget -O mpich-${MPICH_VERSION}.tar.gz ${MPICH_URL} && tar -xf mpich-${MPICH_VERSION}.tar.gz
 
     # Configure and compile/install
-    cd /tmp/mpich/mpich-$MPICH_VERSION
-    ./configure --prefix=$MPICH_DIR && make install
+    cd /tmp/mpich/mpich-${MPICH_VERSION}
+    ./configure --prefix=${MPICH_DIR} && make install
 
 
     # Set env variables so we can compile our application
-    export PATH=$MPICH_DIR/bin:$PATH
-    export LD_LIBRARY_PATH=$MPICH_DIR/lib:$LD_LIBRARY_PATH
-    export MANPATH=$MPICH_DIR/share/man:$MANPATH
+    export PATH=${MPICH_DIR}/bin:${PATH}
+    export LD_LIBRARY_PATH=${MPICH_DIR}/lib:${LD_LIBRARY_PATH}
+    export MANPATH=${MPICH_DIR}/share/man:${MANPATH}
 
 
     echo "Compiling the MPI application..."
@@ -195,13 +195,13 @@ This image may be run with
 singularity exec xeyes.sif xeyes.
 ```
 
-This works because all the magic is done by Singularity already like setting `$DISPLAY` to the outside
-display and mounting `$HOME` so `$HOME/.Xauthority` (X11 authentication cookie) is found. When you are
+This works because all the magic is done by Singularity already like setting `${DISPLAY}` to the outside
+display and mounting `${HOME}` so `${HOME}/.Xauthority` (X11 authentication cookie) is found. When you are
 using `--contain` or `--no-home` you have to set that cookie yourself or mount/copy it inside
-the container. Similar for `--cleanenv` you have to set `$DISPLAY`, e.g., via
+the container. Similar for `--cleanenv` you have to set `${DISPLAY}`, e.g., via
 
 ```console
-export SINGULARITY_DISPLAY=$DISPLAY
+export SINGULARITY_DISPLAY=${DISPLAY}
 ```
 
 When you run a container as root (via `sudo`) you may need to allow root for your local display
diff --git a/doc.zih.tu-dresden.de/mkdocs.yml b/doc.zih.tu-dresden.de/mkdocs.yml
index a891cbc5219d0aec32597be222dd3511ff2c0955..c2e5705f5ae208abba9eccb86e701bfc82e996d5 100644
--- a/doc.zih.tu-dresden.de/mkdocs.yml
+++ b/doc.zih.tu-dresden.de/mkdocs.yml
@@ -105,7 +105,7 @@ nav:
         - Architectural Re-Design 2023: jobs_and_resources/architecture_2023.md
         - Overview 2023: jobs_and_resources/hardware_overview_2023.md
         - Migration 2023: jobs_and_resources/migration_2023.md
-        - Tests 2023: jobs_and_resources/barnard_test.md
+        - "How-To: Migration 2023": jobs_and_resources/barnard_test.md
       - AMD Rome Nodes: jobs_and_resources/rome_nodes.md
       - NVMe Storage: jobs_and_resources/nvme_storage.md
       - Alpha Centauri: jobs_and_resources/alpha_centauri.md