diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 57406f3eb8337d62e9ee740e15f700de4df245ea..ff2606d7cefed5d8397cd28ef08c9fe82513aa52 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -2273,6 +2273,9 @@ configure_networking
 admin_user_sudo
 create_generic_image
 atheros_wifi
+if [[ "$MACHINE" == 'beagle'* ]]; then
+    beaglebone_flasher "$MACHINE"
+fi
 continue_installation
 image_install_nodejs
 image_install_myqr
diff --git a/src/freedombone-image-hardware-setup b/src/freedombone-image-hardware-setup
index 71b44e7f20e5e916393a6aa01e5844b1800ba06f..ddd625bbaac5117bb42bfb9e99b7d633eaf346e2 100755
--- a/src/freedombone-image-hardware-setup
+++ b/src/freedombone-image-hardware-setup
@@ -30,7 +30,6 @@ export TEXTDOMAIN=${PROJECT_NAME}-image-hardware-setup
 export TEXTDOMAINDIR="/usr/share/locale"
 
 INSTALL_PACKAGES='apt-get -yq install'
-EMMC_DIR=/opt/scripts/tools/eMMC
 
 enable_serial_console() {
     # By default, spawn a console on the serial port
@@ -39,57 +38,6 @@ enable_serial_console() {
     echo "T0:12345:respawn:/sbin/getty -L $device 115200 vt100" >> /etc/inittab
 }
 
-beaglebone_flasher() {
-    beaglebone_variant="$1"
-
-    device_eeprom=
-    check_eeprom=
-    if [ "${beaglebone_variant}" = "am335x-boneblack" ]; then
-        device_eeprom='bbb-eeprom'
-        check_eeprom='check_eeprom'
-    fi
-    if [ "${beaglebone_variant}" = "am335x-bonegreen" ]; then
-        device_eeprom='bbg-eeprom'
-        check_eeprom='check_eeprom'
-    fi
-    if [ "${beaglebone_variant}" = "am57xx-beagle-x15" ]; then
-        device_eeprom='x15/X15_B1-eeprom'
-        check_eeprom='check_am57xx_eeprom'
-    fi
-
-    if [ ! $device_eeprom ]; then
-        return
-    fi
-
-    if [ ! -d "$EMMC_DIR" ]; then
-        mkdir -p "$EMMC_DIR"
-    fi
-
-    $INSTALL_PACKAGES wget rsync
-    wget "https://code.freedombone.net/bashrc/${PROJECT_NAME}/raw/master/image_build/emmc_functions.sh" -O "$EMMC_DIR/functions.sh"
-    if [ ! -f "$EMMC_DIR/functions.sh" ]; then
-        exit 62
-    fi
-    chmod +x "$EMMC_DIR/functions.sh"
-
-    cat >> "$EMMC_DIR/init-eMMC-flasher-v3.sh" <<EOF
-#!/bin/bash -e
-source \$(dirname "\$0")/functions.sh
-mkfs_options=""
-device_eeprom="$device_eeprom"
-check_if_run_as_root
-startup_message
-prepare_environment
-countdown 5
-$check_eeprom
-check_running_system
-activate_cylon_leds
-prepare_drive
-EOF
-
-    chmod +x "$EMMC_DIR/init-eMMC-flasher-v3.sh"
-}
-
 beaglebone_setup_boot() {
     beaglebone_variant="$1"
 
@@ -109,8 +57,6 @@ beaglebone_setup_boot() {
     bbb_initrd_addr='0x88080000'
     bbb_fdtaddr='0x88000000'
 
-    beaglebone_flasher "${beaglebone_variant}"
-
     # uEnv.txt for Beaglebone
     # based on https://github.com/beagleboard/image-builder/blob/master/target/boot/beagleboard.org.txt
     cat >> /boot/uEnv.txt <<EOF
diff --git a/src/freedombone-utils-flasher b/src/freedombone-utils-flasher
new file mode 100755
index 0000000000000000000000000000000000000000..9105e131a81a0f84842a70349a8f85774ba24a3c
--- /dev/null
+++ b/src/freedombone-utils-flasher
@@ -0,0 +1,88 @@
+#!/bin/bash
+#  _____               _           _
+# |   __|___ ___ ___ _| |___ _____| |_ ___ ___ ___
+# |   __|  _| -_| -_| . | . |     | . | . |   | -_|
+# |__|  |_| |___|___|___|___|_|_|_|___|___|_|_|___|
+#
+#                              Freedom in the Cloud
+#
+# Functions for flashing to emmc
+#
+# License
+# =======
+#
+# Copyright (C) 2018 Bob Mottram <bob@freedombone.net>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+EMMC_DIR=/opt/scripts/tools/eMMC
+
+function beaglebone_flasher {
+    beaglebone_variant="$1"
+
+    device_eeprom=
+    check_eeprom=
+    if [ "${beaglebone_variant}" = "beagleboneblack" ]; then
+        device_eeprom='bbb-eeprom'
+        check_eeprom='check_eeprom'
+    fi
+    if [ "${beaglebone_variant}" = "beaglebonegreen" ]; then
+        device_eeprom='bbg-eeprom'
+        check_eeprom='check_eeprom'
+    fi
+    if [ "${beaglebone_variant}" = "beaglex15" ]; then
+        device_eeprom='x15/X15_B1-eeprom'
+        check_eeprom='check_am57xx_eeprom'
+    fi
+
+    if [ ! $device_eeprom ]; then
+        return
+    fi
+
+    if [ ! -d "$rootdir$EMMC_DIR" ]; then
+        mkdir -p "$$rootdirEMMC_DIR"
+    fi
+
+    if [ "$rootdir" ]; then
+        # shellcheck disable=SC2086
+        chroot "$rootdir" $INSTALL_PACKAGES wget rsync
+    else
+        $INSTALL_PACKAGES wget rsync
+    fi
+    wget "https://code.freedombone.net/bashrc/${PROJECT_NAME}/raw/master/image_build/emmc_functions.sh" -O "$rootdir$EMMC_DIR/functions.sh"
+    if [ ! -f "$rootdir$EMMC_DIR/functions.sh" ]; then
+        exit 62
+    fi
+    chmod +x "$rootdir$EMMC_DIR/functions.sh"
+
+    cat >> "$rootdir$EMMC_DIR/init-eMMC-flasher-v3.sh" <<EOF
+#!/bin/bash -e
+source \$(dirname "\$0")/functions.sh
+mkfs_options=""
+device_eeprom="$device_eeprom"
+check_if_run_as_root
+startup_message
+prepare_environment
+countdown 5
+$check_eeprom
+check_running_system
+activate_cylon_leds
+prepare_drive
+EOF
+
+    chmod +x "$rootdir$EMMC_DIR/init-eMMC-flasher-v3.sh"
+    echo "#cmdline=init=$EMMC_DIR/init-eMMC-flasher-v3.sh" > "$rootdir/boot/uEnv.txt"
+}
+
+# NOTE: deliberately there is no "exit 0"