diff --git a/inspect/serial-log/init.sh b/inspect/serial-log/init.sh
index 87206b9..69c1fef 100755
--- a/inspect/serial-log/init.sh
+++ b/inspect/serial-log/init.sh
@@ -3,4 +3,4 @@ set -x
 
 SERIAL_DEV=$1
 DEV_NAME=$(basename "${SERIAL_DEV}")
-tio -m INLCRNL --log --log-file "serial-log.${DEV_NAME}" "${SERIAL_DEV}"
+tio -m INLCRNL --log --log-file "ext-dir/serial-log.${DEV_NAME}" "${SERIAL_DEV}"
diff --git a/run-remote b/run-remote
index 84bdffc..6c551d2 100755
--- a/run-remote
+++ b/run-remote
@@ -3,11 +3,24 @@
 IMAGE="$1"
 shift
 
-TARGET="$1"
+REMOTE="$1"
 shift
 
-IMAGE_BASENAME=$(basename "${IMAGE}")
-docker save -o "/tmp/${IMAGE_BASENAME}" "${IMAGE}"
-rsync -av --progress "/tmp/${IMAGE_BASENAME}" "${IMAGE}/run.sh" "${TARGET}:/tmp"
-ssh "${TARGET}" docker load -i "/tmp/${IMAGE_BASENAME}"
-ssh -t "${TARGET}" /tmp/run.sh $@
+DIR="/tmp/docker-devtools/infrastructure/${IMAGE}"
+mkdir -p "${DIR}"
+
+# Save the docker image, transfer it and the per-image run script to remote.
+docker save -o "${DIR}/image.tar" "${IMAGE}"
+cp "${IMAGE}/run.sh" "${DIR}"
+ssh "${REMOTE}" mkdir -p "docker-devtools/infrastructure/${IMAGE}"
+rsync -av --progress "${DIR}/" "${REMOTE}:docker-devtools/infrastructure/${IMAGE}"
+
+# Load docker image on remote.
+ssh "${REMOTE}" docker load -i "docker-devtools/infrastructure/${IMAGE}/image.tar"
+
+# Create data dir on remote and run image on remote.
+ssh -t "${REMOTE}" " \
+  mkdir -p docker-devtools/data/${IMAGE}; \
+  cd docker-devtools/data/${IMAGE}; \
+  \$HOME/docker-devtools/infrastructure/${IMAGE}/run.sh \
+" $@