diff --git a/scripts/node.sh b/scripts/node.sh
index bf49551..1fc24e8 100755
--- a/scripts/node.sh
+++ b/scripts/node.sh
@@ -14,22 +14,22 @@ echo "  NODE=${NODE}"
 echo "  LOG=${LOG}"
 echo "  COMMAND=${COMMAND}"
 
-ACTIVATION_HOOK="$(pixi shell-hook)"
+ACTIVATION_HOOK=$(printf '%q ' "$(pixi shell-hook)")
 SCRIPT_HEADER='
     echo Running on $(hostname) in $(pwd)
     echo Process ID: $$
 '
-SCRIPT="
+SCRIPT=$(printf '%q ' "
     ${SCRIPT_HEADER}
     echo Run command: ${COMMAND}
     ${COMMAND}
-"
+")
 
 # Enter working directory and initiate job from the first SSH node
-ssh ${NODE} /bin/env bash << EOF
+ssh ${NODE} /bin/env bash -l << EOF
     set -e
     cd ${WD}
     ${SCRIPT_HEADER}
-    eval ${ACTIVATION_HOOK@Q}
-    nohup sh -c ${SCRIPT@Q} > ${LOG} 2>&1 &
-EOF
\ No newline at end of file
+    eval ${ACTIVATION_HOOK}
+    nohup sh -c ${SCRIPT} > ${LOG} 2>&1 &
+EOF
diff --git a/scripts/subtasks.sh b/scripts/subtasks.sh
index b227e78..4f8bd64 100755
--- a/scripts/subtasks.sh
+++ b/scripts/subtasks.sh
@@ -20,7 +20,7 @@ done
 
 cd ${INIT_CWD:-$(pwd)}
 
-COMMAND="automech subtasks run ${@:ARG_OFFSET}"
+ARGS=$(printf '%q ' "${@:ARG_OFFSET}")
+COMMAND="automech subtasks run ${ARGS}"
 
-# echo pixi run node ${@: -1} ${SUBTASK_LOG} ${COMMAND@Q}
-pixi run node ${@: -1} ${SUBTASK_LOG} ${COMMAND@Q}
+pixi run node ${@: -1} ${SUBTASK_LOG} "${COMMAND}"