diff --git a/scripts/image b/scripts/image
index ba9b1aa9e3..178d02c017 100755
--- a/scripts/image
+++ b/scripts/image
@@ -20,6 +20,36 @@ ${SCRIPTS}/checkdeps
 ( setup_toolchain host )
 setup_toolchain target
 
+function do_mkimage() {
+  # Variables used in mkimage script must be passed
+  env \
+    PATH="$PATH:/sbin" \
+    ROOT="$ROOT" \
+    SCRIPTS="$SCRIPTS" \
+    TOOLCHAIN="$TOOLCHAIN" \
+    PROJECT_DIR="$PROJECT_DIR" \
+    PROJECT="$PROJECT" \
+    DEVICE="$DEVICE" \
+    DISTRO="$DISTRO" \
+    TARGET_IMG="$TARGET_IMG" \
+    IMAGE_NAME="$IMAGE_NAME" \
+    INSTALL_SRC_DIR="$INSTALL_SRC_DIR" \
+    BOOTLOADER="$BOOTLOADER" \
+    KERNEL_NAME="$KERNEL_NAME" \
+    TARGET_KERNEL_ARCH="$TARGET_KERNEL_ARCH" \
+    RELEASE_DIR="$RELEASE_DIR" \
+    UUID_STORAGE="$(uuidgen)" \
+    DISTRO_BOOTLABEL="$DISTRO_BOOTLABEL" \
+    DISTRO_DISKLABEL="$DISTRO_DISKLABEL" \
+    UBOOT_SYSTEM="$UBOOT_SYSTEM" \
+    UBOOT_VERSION="$UBOOT_VERSION" \
+    EXTRA_CMDLINE="$EXTRA_CMDLINE" \
+    SYSTEM_SIZE="$SYSTEM_SIZE" \
+    SYSTEM_PART_START="$SYSTEM_PART_START" \
+    OVA_SIZE="$OVA_SIZE" \
+    $SCRIPTS/mkimage
+}
+
 if [ -n "$CUSTOM_GIT_HASH" ]; then
   GIT_HASH="$CUSTOM_GIT_HASH"
 else
@@ -281,33 +311,7 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
       INSTALL_SRC_DIR="$PROJECT_DIR/$PROJECT/install"
     fi
 
-    # Variables used in image script must be passed
-    env \
-      PATH="$PATH:/sbin" \
-      ROOT="$ROOT" \
-      SCRIPTS="$SCRIPTS" \
-      TOOLCHAIN="$TOOLCHAIN" \
-      PROJECT_DIR="$PROJECT_DIR" \
-      PROJECT="$PROJECT" \
-      DEVICE="$DEVICE" \
-      DISTRO="$DISTRO" \
-      TARGET_IMG="$TARGET_IMG" \
-      IMAGE_NAME="$IMAGE_NAME" \
-      INSTALL_SRC_DIR="$INSTALL_SRC_DIR" \
-      BOOTLOADER="$BOOTLOADER" \
-      KERNEL_NAME="$KERNEL_NAME" \
-      TARGET_KERNEL_ARCH="$TARGET_KERNEL_ARCH" \
-      RELEASE_DIR=$RELEASE_DIR \
-      UUID_STORAGE="$(uuidgen)" \
-      DISTRO_BOOTLABEL="$DISTRO_BOOTLABEL" \
-      DISTRO_DISKLABEL="$DISTRO_DISKLABEL" \
-      UBOOT_SYSTEM="$UBOOT_SYSTEM" \
-      UBOOT_VERSION="$UBOOT_VERSION" \
-      EXTRA_CMDLINE="$EXTRA_CMDLINE" \
-      SYSTEM_SIZE="$SYSTEM_SIZE" \
-      SYSTEM_PART_START="$SYSTEM_PART_START" \
-      OVA_SIZE="$OVA_SIZE" \
-      $SCRIPTS/mkimage
+    do_mkimage
   fi
 
   # Cleanup release dir
diff --git a/scripts/image_st b/scripts/image_st
index bd4decf390..4f60e9bf28 100755
--- a/scripts/image_st
+++ b/scripts/image_st
@@ -23,6 +23,36 @@ $SCRIPTS/build kmod:host
 $SCRIPTS/build mtools:host
 $SCRIPTS/build populatefs:host
 
+function do_mkimage() {
+  # Variables used in mkimage script must be passed
+  env \
+    PATH="$PATH:/sbin" \
+    ROOT="$ROOT" \
+    SCRIPTS="$SCRIPTS" \
+    TOOLCHAIN="$TOOLCHAIN" \
+    PROJECT_DIR="$PROJECT_DIR" \
+    PROJECT="$PROJECT" \
+    DEVICE="$DEVICE" \
+    DISTRO="$DISTRO" \
+    TARGET_IMG="$TARGET_IMG" \
+    IMAGE_NAME="$IMAGE_NAME" \
+    INSTALL_SRC_DIR="$INSTALL_SRC_DIR" \
+    BOOTLOADER="$BOOTLOADER" \
+    KERNEL_NAME="$KERNEL_NAME" \
+    TARGET_KERNEL_ARCH="$TARGET_KERNEL_ARCH" \
+    RELEASE_DIR="$RELEASE_DIR" \
+    UUID_STORAGE="$(uuidgen)" \
+    DISTRO_BOOTLABEL="$DISTRO_BOOTLABEL" \
+    DISTRO_DISKLABEL="$DISTRO_DISKLABEL" \
+    UBOOT_SYSTEM="$UBOOT_SYSTEM" \
+    UBOOT_VERSION="$UBOOT_VERSION" \
+    EXTRA_CMDLINE="$EXTRA_CMDLINE" \
+    SYSTEM_SIZE="$SYSTEM_SIZE" \
+    SYSTEM_PART_START="$SYSTEM_PART_START" \
+    OVA_SIZE="$OVA_SIZE" \
+    $SCRIPTS/mkimage
+}
+
 if [ -n "$CUSTOM_GIT_HASH" ]; then
   GIT_HASH="$CUSTOM_GIT_HASH"
 else
@@ -331,33 +361,7 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
       INSTALL_SRC_DIR="$PROJECT_DIR/$PROJECT/install"
     fi
 
-    # variables used in image script must be passed
-    env \
-      PATH="$PATH:/sbin" \
-      ROOT="$ROOT" \
-      SCRIPTS="$SCRIPTS" \
-      TOOLCHAIN="$TOOLCHAIN" \
-      PROJECT_DIR="$PROJECT_DIR" \
-      PROJECT="$PROJECT" \
-      DEVICE="$DEVICE" \
-      DISTRO="$DISTRO" \
-      TARGET_IMG="$TARGET_IMG" \
-      IMAGE_NAME="$IMAGE_NAME" \
-      INSTALL_SRC_DIR="$INSTALL_SRC_DIR" \
-      BOOTLOADER="$BOOTLOADER" \
-      KERNEL_NAME="$KERNEL_NAME" \
-      TARGET_KERNEL_ARCH="$TARGET_KERNEL_ARCH" \
-      RELEASE_DIR=$RELEASE_DIR \
-      UUID_STORAGE="$(uuidgen)" \
-      DISTRO_BOOTLABEL="$DISTRO_BOOTLABEL" \
-      DISTRO_DISKLABEL="$DISTRO_DISKLABEL" \
-      UBOOT_SYSTEM="$UBOOT_SYSTEM" \
-      UBOOT_VERSION="$UBOOT_VERSION" \
-      EXTRA_CMDLINE="$EXTRA_CMDLINE" \
-      SYSTEM_SIZE="$SYSTEM_SIZE" \
-      SYSTEM_PART_START="$SYSTEM_PART_START" \
-      OVA_SIZE="$OVA_SIZE" \
-      $SCRIPTS/mkimage
+    do_mkimage
   fi
 
   # cleanup release dir