diff --git a/scripts/config.sh b/scripts/config.sh
index c2278f8..58b5620 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -9,5 +9,3 @@ URL="${URL:-http://$HOST}"
 DEST="${DEST:-$HOME/toes}"
 DATA_DIR="${DATA_DIR:-$HOME/data}"
 APPS_DIR="${APPS_DIR:-$HOME/apps}"
-
-mkdir -p "$DEST" "$DATA_DIR" "$APPS_DIR"
diff --git a/scripts/remote-install.sh b/scripts/remote-install.sh
index 33e36a7..c5a1beb 100755
--- a/scripts/remote-install.sh
+++ b/scripts/remote-install.sh
@@ -9,4 +9,8 @@ ROOT_DIR="$SCRIPT_DIR/.."
 source "$ROOT_DIR/scripts/config.sh"
 
 # Run remote install on the target
-ssh "$SSH_HOST" "git clone https://git.nose.space/defunkt/toes $DEST && cd $DEST && ./scripts/install.sh"
+ssh "$SSH_HOST" bash <<'SCRIPT'
+set -e
+DEST="${DEST:-$HOME/toes}"
+git clone https://git.nose.space/defunkt/toes "$DEST" && cd "$DEST" && ./scripts/install.sh
+SCRIPT