diff --git a/installation/includes/02_helpers.sh b/installation/includes/02_helpers.sh
index eb4b1072e..a3597fddb 100644
--- a/installation/includes/02_helpers.sh
+++ b/installation/includes/02_helpers.sh
@@ -45,8 +45,8 @@ _download_file_from_google_drive() {
 
 print_verify_installation() {
     echo ""
-    echo "---------------------------------------------------------"
-    echo "Check installation"
+    echo "  -------------------------------------------------------"
+    echo "  Check installation"
     echo ""
 }
 
diff --git a/installation/routines/set_raspi_config.sh b/installation/routines/set_raspi_config.sh
index dcbc70dec..da195b1bb 100644
--- a/installation/routines/set_raspi_config.sh
+++ b/installation/routines/set_raspi_config.sh
@@ -13,22 +13,22 @@ _run_set_raspi_config() {
   # Source: https://raspberrypi.stackexchange.com/a/66939
 
   # Autologin
-  echo "  * Enable Autologin for user"
+  echo "  Enable Autologin for user"
   sudo raspi-config nonint do_boot_behaviour B2
 
   # Wait for network at boot
-  # echo "  * Enable 'Wait for network at boot'"
+  # echo "  Enable 'Wait for network at boot'"
   # sudo raspi-config nonint do_boot_wait 1
 
   # power management of wifi: switch off to avoid disconnecting
-  echo "  * Disable Wifi power management to avoid disconnecting"
+  echo "  Disable Wifi power management to avoid disconnecting"
   sudo iwconfig wlan0 power off
 
   # On-board audio
   if [[ $(_get_onboard_audio) -eq 1 ]]; then
     DISABLE_ONBOARD_AUDIO=${DISABLE_ONBOARD_AUDIO:-false}
     if [[ $DISABLE_ONBOARD_AUDIO = true ]]; then
-      echo "  * Disable on-chip BCM audio"
+      echo "  Disable on-chip BCM audio"
       echo "    Backup ${RPI_BOOT_CONFIG_FILE} --> ${DISABLE_ONBOARD_AUDIO_BACKUP}"
       sudo cp "${RPI_BOOT_CONFIG_FILE}" "${DISABLE_ONBOARD_AUDIO_BACKUP}"
       sudo sed -i "s/^\(dtparam=\([^,]*,\)*\)audio=\(on\|true\|yes\|1\)\(.*\)/\1audio=off\4/g" "${RPI_BOOT_CONFIG_FILE}"
diff --git a/installation/routines/set_ssh_qos.sh b/installation/routines/set_ssh_qos.sh
index 793d96e05..eaca62fed 100644
--- a/installation/routines/set_ssh_qos.sh
+++ b/installation/routines/set_ssh_qos.sh
@@ -4,7 +4,7 @@ set_ssh_qos() {
     if [ "$DISABLE_SSH_QOS" == true ] ; then
         # The latest version of SSH installed on the Raspberry Pi 3 uses QoS headers, which disagrees with some
         # routers and other hardware. This causes immense delays when remotely accessing the RPi over ssh.
-        echo "  * Set SSH QoS to best effort"
+        echo "  Set SSH QoS to best effort"
         echo -e "IPQoS 0x00 0x00\n" | sudo tee -a /etc/ssh/sshd_config
         echo -e "IPQoS 0x00 0x00\n" | sudo tee -a /etc/ssh/ssh_config
     fi
diff --git a/installation/routines/setup_git.sh b/installation/routines/setup_git.sh
index f2a12e882..613062f43 100644
--- a/installation/routines/setup_git.sh
+++ b/installation/routines/setup_git.sh
@@ -2,7 +2,7 @@ GIT_ABORT_MSG="Aborting dir to git repo conversion.
 Your directory content is untouched, you simply cannot use git for updating / developing"
 
 _git_install_os_dependencies() {
-  echo "Install Git dependencies"
+  echo "  Install Git dependencies"
   sudo apt-get -y update; sudo apt-get -y install \
     git \
     --no-install-recommends \
diff --git a/installation/routines/setup_jukebox_core.sh b/installation/routines/setup_jukebox_core.sh
index 4f6d618dd..1e0c3a818 100644
--- a/installation/routines/setup_jukebox_core.sh
+++ b/installation/routines/setup_jukebox_core.sh
@@ -22,7 +22,7 @@ echo "  --------------------------------------------------------------------
 
 # Functions
 _jukebox_core_install_os_dependencies() {
-  echo "  Install Jukebox OS dependencies"
+  echo "  Install Jukebox OS dependencies" | tee /dev/fd/3
   sudo apt-get -y update && sudo apt-get -y install \
     at \
     alsa-utils \
@@ -38,7 +38,7 @@ _jukebox_core_install_os_dependencies() {
 }
 
 _jukebox_core_install_python_requirements() {
-  echo "  Install Python requirements"
+  echo "  Install Python requirements" | tee /dev/fd/3
 
   cd "${INSTALLATION_PATH}"  || exit_on_error
 
@@ -50,7 +50,7 @@ _jukebox_core_install_python_requirements() {
 }
 
 _jukebox_core_configure_pulseaudio() {
-  echo "Copy PulseAudio configuration"
+  echo "  Copy PulseAudio configuration" | tee /dev/fd/3
   mkdir -p $(dirname "$JUKEBOX_PULSE_CONFIG")
   cp -f "${INSTALLATION_PATH}/resources/default-settings/pulseaudio.default.pa" "${JUKEBOX_PULSE_CONFIG}"
 }
@@ -90,7 +90,7 @@ _jukebox_core_build_and_install_pyzmq() {
   # Sources:
   # https://pyzmq.readthedocs.io/en/latest/howto/draft.html
   # https://github.com/MonsieurV/ZeroMQ-RPi/blob/master/README.md
-  echo "  Build and install pyzmq with WebSockets Support"
+  echo "  Build and install pyzmq with WebSockets Support" | tee /dev/fd/3
 
   if ! pip list | grep -F pyzmq >> /dev/null; then
     # Download pre-compiled libzmq from Google Drive because RPi has trouble compiling it
@@ -115,18 +115,18 @@ _jukebox_core_build_and_install_pyzmq() {
     ZMQ_PREFIX="${ZMQ_PREFIX}" ZMQ_DRAFT_API=1 \
       pip install --no-cache-dir --no-binary "pyzmq" --pre pyzmq
   else
-    echo "    Skipping. pyzmq already installed"
+    echo "    Skipping. pyzmq already installed" | tee /dev/fd/3
   fi
 }
 
 _jukebox_core_install_settings() {
-  echo "  Register Jukebox settings"
+  echo "  Register Jukebox settings" | tee /dev/fd/3
   cp -f "${INSTALLATION_PATH}/resources/default-settings/jukebox.default.yaml" "${SETTINGS_PATH}/jukebox.yaml"
   cp -f "${INSTALLATION_PATH}/resources/default-settings/logger.default.yaml" "${SETTINGS_PATH}/logger.yaml"
 }
 
 _jukebox_core_register_as_service() {
-  echo "  Register Jukebox Core user service"
+  echo "  Register Jukebox Core user service" | tee /dev/fd/3
 
   sudo cp -f "${INSTALLATION_PATH}/resources/default-services/jukebox-daemon.service" "${JUKEBOX_SERVICE_NAME}"
   sudo sed -i "s|%%INSTALLATION_PATH%%|${INSTALLATION_PATH}|g" "${JUKEBOX_SERVICE_NAME}"
diff --git a/installation/routines/setup_jukebox_webapp.sh b/installation/routines/setup_jukebox_webapp.sh
index 5c27a2e71..bd63f5653 100644
--- a/installation/routines/setup_jukebox_webapp.sh
+++ b/installation/routines/setup_jukebox_webapp.sh
@@ -47,7 +47,7 @@ _jukebox_webapp_install_node() {
 # TODO: Avoid building the app locally
 # Instead implement a Github Action that prebuilds on commititung a git tag
 _jukebox_webapp_build() {
-  echo "  Building web application"
+  echo "  Building web application" | tee /dev/fd/3
   cd "${INSTALLATION_PATH}/src/webapp" || exit_on_error
   npm ci --prefer-offline --no-audit --production
   rm -rf build
diff --git a/installation/routines/setup_kiosk_mode.sh b/installation/routines/setup_kiosk_mode.sh
index ab5d9d301..f8d07971c 100644
--- a/installation/routines/setup_kiosk_mode.sh
+++ b/installation/routines/setup_kiosk_mode.sh
@@ -7,6 +7,7 @@ KIOSK_MODE_CHROMIUM_CUSTOM_DISABLE_UPDATE_CHECK='/etc/chromium-browser/customiza
 KIOSK_MODE_CHROMIUM_FLAG_UPDATE_INTERVAL='--check-for-update-interval=31536000'
 
 _kiosk_mode_install_os_dependencies() {
+  echo "  Install Kiosk Mode dependencies" | tee /dev/fd/3
   # Resource:
   # https://blog.r0b.io/post/minimal-rpi-kiosk/
   sudo apt-get -qq -y install --no-install-recommends \
@@ -18,6 +19,7 @@ _kiosk_mode_install_os_dependencies() {
 }
 
 _kiosk_mode_set_autostart() {
+  echo "  Configure Kiosk Mode" | tee /dev/fd/3
   local _DISPLAY='$DISPLAY'
   local _XDG_VTNR='$XDG_VTNR'
 
diff --git a/installation/routines/setup_mpd.sh b/installation/routines/setup_mpd.sh
index 08aca35c3..da1f77337 100644
--- a/installation/routines/setup_mpd.sh
+++ b/installation/routines/setup_mpd.sh
@@ -4,8 +4,9 @@ AUDIOFOLDERS_PATH="${SHARED_PATH}/audiofolders"
 PLAYLISTS_PATH="${SHARED_PATH}/playlists"
 
 _mpd_install_os_dependencies() {
+  echo "  Install MPD OS dependencies"
   sudo apt-get -y update
-  echo "Install MPD OS dependencies"
+
   echo "Note: Installing MPD might cause a message: 'Job failed. See journalctl -xe for details'"
   echo "It can be ignored! It's an artefact of the MPD installation - nothing we can do about it."
   sudo apt-get -y install \
@@ -17,6 +18,13 @@ _mpd_install_os_dependencies() {
 }
 
 _mpd_configure() {
+  echo "  Configure MPD as user local service" | tee /dev/fd/3
+
+  # Make sure system-wide mpd is disabled
+  sudo systemctl stop mpd.socket
+  sudo systemctl stop mpd.service
+  sudo systemctl disable mpd.socket
+  sudo systemctl disable mpd.service
   # MPD will be setup as user process (rather than a system-wide process)
   mkdir -p $(dirname "$MPD_CONF_PATH")
 
@@ -25,6 +33,11 @@ _mpd_configure() {
   # Prepare new mpd.conf
   sed -i 's|%%JUKEBOX_AUDIOFOLDERS_PATH%%|'"$AUDIOFOLDERS_PATH"'|' "${MPD_CONF_PATH}"
   sed -i 's|%%JUKEBOX_PLAYLISTS_PATH%%|'"$PLAYLISTS_PATH"'|' "${MPD_CONF_PATH}"
+
+  # Prepare user-service MPD to be started at next boot
+  systemctl --user daemon-reload
+  systemctl --user enable mpd.socket
+  systemctl --user enable mpd.service
 }
 
 _mpd_check() {
@@ -45,23 +58,10 @@ _mpd_check() {
 }
 
 _run_setup_mpd() {
+    # Install/update only if enabled: do not stuff up any existing configuration
     if [[ $ENABLE_MPD_OVERWRITE_INSTALL == true ]] ; then
-
-        # Install/update only if enabled: do not stuff up any existing configuration
         _mpd_install_os_dependencies
-
-        # Make sure system-wide mpd is disabled
-        echo "Configure MPD as user local service" | tee /dev/fd/3
-        sudo systemctl stop mpd.socket
-        sudo systemctl stop mpd.service
-        sudo systemctl disable mpd.socket
-        sudo systemctl disable mpd.service
         _mpd_configure
-        # Prepare user-service MPD to be started at next boot
-        systemctl --user daemon-reload
-        systemctl --user enable mpd.socket
-        systemctl --user enable mpd.service
-
         _mpd_check
     fi
 }
diff --git a/installation/routines/setup_samba.sh b/installation/routines/setup_samba.sh
index edefc33e2..12f03797a 100644
--- a/installation/routines/setup_samba.sh
+++ b/installation/routines/setup_samba.sh
@@ -4,7 +4,7 @@ SMB_CONF="/etc/samba/smb.conf"
 SMB_CONF_HEADER="## Jukebox Samba Config"
 
 _samba_install_os_dependencies() {
-  echo "Install Samba Core dependencies"
+  echo "  Install Samba Core dependencies"
   sudo apt-get -qq -y update; sudo apt-get -qq -y install \
     samba samba-common-bin \
     --no-install-recommends \
@@ -14,12 +14,13 @@ _samba_install_os_dependencies() {
 }
 
 _samba_set_user() {
+  echo "  Configure Samba" | tee /dev/fd/3
   local SMB_USER="pi"
   local SMB_PASSWD="raspberry"
 
   # Samba has not been configured
   if grep -q "$SMB_CONF_HEADER" "$SMB_CONF"; then
-    echo "  Skipping. Already set up!" | tee /dev/fd/3
+    echo "    Skipping. Already set up!" | tee /dev/fd/3
   else
     # Create Samba user
     (echo "${SMB_PASSWD}"; echo "${SMB_PASSWD}") | sudo smbpasswd -s -a $SMB_USER
@@ -66,6 +67,6 @@ _run_setup_samba() {
 
 setup_samba() {
     if [ "$ENABLE_SAMBA" == true ] ; then
-        run_with_log_frame _run_setup_samba "Install Samba and configure user"
+        run_with_log_frame _run_setup_samba "Install Samba"
     fi
 }