diff --git a/client/fetch_and_update.sh b/client/fetch_and_update.sh
new file mode 100755
index 0000000..d2d9a0c
--- /dev/null
+++ b/client/fetch_and_update.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -ex
+
+IMAGES=/isodevice/iconograph
+mkdir -p "${IMAGES}"
+
+BOOT=/isodevice
+
+FLAGS=$(cat flags)
+
+./fetcher.py --image-dir="${IMAGES}" --ca-cert=../config/ca.cert.pem ${FLAGS}
+./update_grub.py --image-dir="${IMAGES}" --boot-dir="${BOOT}" > ${BOOT}/grub/grub.cfg.tmp && mv ${BOOT}/grub/grub.cfg.tmp ${BOOT}/grub/grub.cfg
diff --git a/client/run b/client/run
index 5f044cc..28ffa7b 100755
--- a/client/run
+++ b/client/run
@@ -7,15 +7,7 @@ exec 2>&1
 # Mitigate crash looping
 sleep 60
 
-IMAGES=/isodevice/iconograph
-mkdir -p "${IMAGES}"
-
-BOOT=/isodevice
-
-FLAGS=$(cat flags)
-
 while :; do
-  ./fetcher.py --image-dir="${IMAGES}" --ca-cert=../config/ca.cert.pem ${FLAGS}
-  ./update_grub.py --image-dir="${IMAGES}" --boot-dir="${BOOT}" > ${BOOT}/grub/grub.cfg.tmp && mv ${BOOT}/grub/grub.cfg.tmp ${BOOT}/grub/grub.cfg
+  ./fetch_and_update.sh
   sleep 3600
 done