diff --git a/Makefile b/Makefile
index d927e06..f9c4c36 100644
--- a/Makefile
+++ b/Makefile
@@ -33,16 +33,16 @@ help:
 	@echo ""
 
 install:
-	@bash -c tools/install.sh
+	@bash -c 'tools/install.sh'
 
 unattended:
-	@bash -c tools/install.sh -z
+	@bash -c 'tools/install.sh -z'
 
 uninstall:
-	@bash -c tools/uninstall.sh
+	@bash -c 'tools/uninstall.sh'
 
 update:
-	@bash -c tools/update.sh
+	@bash -c 'tools/update.sh'
 
 build:
 	@git submodule update
diff --git a/tools/install.sh b/tools/install.sh
index ebb2471..272dcd4 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -211,7 +211,8 @@ function install_crowsnest {
     fi
     if [ "${UNATTENDED}" == "true" ]; then
         echo -en "Adding Crowsnest Update Manager entry to moonraker.conf ...\r"
-        cat "${moonraker_update}" >> "${moonraker_conf}"
+        cat "${moonraker_conf}" "${moonraker_update}" | \
+        tee "${moonraker_conf}" > /dev/null
         echo -e "Adding Crowsnest Update Manager entry to moonraker.conf ... [OK]"
     fi
     echo -en "Add User ${BASE_USER} to group 'video' ...\r"
@@ -261,6 +262,8 @@ function install_raspicam_fix {
 while getopts "z" arg; do
     case ${arg} in
         z)
+            echo "Running in UNATTENDED Mode ..."
+            set -x
             UNATTENDED="true"
             ;;
         *)