diff --git a/roles/ipa-build-tinyipa-image/tasks/main.yaml b/roles/ipa-build-tinyipa-image/tasks/main.yaml
index 68fdb4b..4e1aaa4 100644
--- a/roles/ipa-build-tinyipa-image/tasks/main.yaml
+++ b/roles/ipa-build-tinyipa-image/tasks/main.yaml
@@ -1,5 +1,5 @@
 - name: Build a TinyIPA image
-  command: make
+  command: make all
   args:
     chdir: '{{ tinyipa_dir }}'
   environment:
diff --git a/tinyipa/build-iso.sh b/tinyipa/build-iso.sh
index 7e76e28..92ae32b 100755
--- a/tinyipa/build-iso.sh
+++ b/tinyipa/build-iso.sh
@@ -1,18 +1,20 @@
-#!/bin/sh
+#!/bin/bash
 
 set -ex
 WORKDIR=$(readlink -f $0 | xargs dirname)
 SYSLINUX_VERSION="6.03"
 SYSLINUX_URL="https://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-${SYSLINUX_VERSION}.tar.gz"
 
-cd $WORKDIR/build_files
+source ${WORKDIR}/common.sh
+
+cd ${WORKDIR}/build_files
 wget -N $SYSLINUX_URL && tar zxf syslinux-${SYSLINUX_VERSION}.tar.gz
 
 cd $WORKDIR
 rm -rf newiso
 mkdir -p newiso/boot/isolinux
-cp build_files/syslinux-${SYSLINUX_VERSION}/core/isolinux.bin newiso/boot/isolinux/.
+cp build_files/syslinux-${SYSLINUX_VERSION}/bios/core/isolinux.bin newiso/boot/isolinux/.
 cp build_files/isolinux.cfg newiso/boot/isolinux/.
-cp tinyipa.gz newiso/boot/corepure64.gz
-cp tinyipa.vmlinuz newiso/boot/vmlinuz64
+cp tinyipa${BRANCH_EXT}.gz newiso/boot/corepure64.gz
+cp tinyipa${BRANCH_EXT}.vmlinuz newiso/boot/vmlinuz64
 genisoimage -l -r -J -R -V TC-custom -no-emul-boot -boot-load-size 4 -boot-info-table -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat -o tinyipa.iso newiso