diff --git a/tinyipa/build-tinyipa.sh b/tinyipa/build-tinyipa.sh
index 4cd4e8c..029abf8 100755
--- a/tinyipa/build-tinyipa.sh
+++ b/tinyipa/build-tinyipa.sh
@@ -6,7 +6,7 @@ source ${WORKDIR}/common.sh
 
 IRONIC_LIB_SOURCE=${IRONIC_LIB_SOURCE:-}
 
-TC_RELEASE="13.x"
+TC_RELEASE="14.x"
 QEMU_RELEASE="v5.2.0"
 LSHW_RELEASE="B.02.18"
 BIOSDEVNAME_RELEASE="0.7.2"
diff --git a/tinyipa/build_files/bootlocal.sh b/tinyipa/build_files/bootlocal.sh
index 005d583..1c0c65f 100755
--- a/tinyipa/build_files/bootlocal.sh
+++ b/tinyipa/build_files/bootlocal.sh
@@ -2,7 +2,7 @@
 # put other system startup commands here
 
 #exec > /tmp/installlogs 2>&1
-set -x
+set -ux
 
 echo "Starting bootlocal script:"
 date
@@ -67,6 +67,11 @@ configure_dhcp_network
 
 mkdir -p /etc/ironic-python-agent.d/
 
+if [ -d /sys/firmware/efi ] ; then
+    echo "Make efivars available"
+    mount -t efivarfs efivarfs /sys/firmware/efi/efivars
+fi
+
 # Run IPA
 echo "Starting Ironic Python Agent:"
 date
diff --git a/tinyipa/build_files/buildreqs.lst b/tinyipa/build_files/buildreqs.lst
index 9daaa9b..918168f 100644
--- a/tinyipa/build_files/buildreqs.lst
+++ b/tinyipa/build_files/buildreqs.lst
@@ -11,7 +11,7 @@ gdisk.tcz
 git.tcz
 glib2-dev.tcz
 hdparm.tcz
-ipv6-netfilter-5.15.10-tinycore64.tcz
+ipv6-netfilter-6.1.2-tinycore64.tcz
 libpci-dev.tcz
 libtool-dev.tcz
 libtool.tcz
@@ -19,8 +19,8 @@ ninja.tcz
 parted.tcz
 pciutils.tcz
 pixman-dev.tcz
-raid-dm-5.15.10-tinycore64.tcz
-scsi-5.15.10-tinycore64.tcz
+raid-dm-6.1.2-tinycore64.tcz
+scsi-6.1.2-tinycore64.tcz
 udev-lib.tcz
 util-linux.tcz
 zlib_base-dev.tcz
diff --git a/tinyipa/build_files/fakeuname b/tinyipa/build_files/fakeuname
index ded1771..82c6ac1 100755
--- a/tinyipa/build_files/fakeuname
+++ b/tinyipa/build_files/fakeuname
@@ -2,7 +2,7 @@
 
 S="Linux"
 N="box"
-R="5.15.10-tinycore64"
+R="6.1.2-tinycore64"
 P="unknown"
 V="#2017 SMP"
 M="x86_64"
diff --git a/tinyipa/build_files/finalreqs.lst b/tinyipa/build_files/finalreqs.lst
index abd023d..90bc0de 100644
--- a/tinyipa/build_files/finalreqs.lst
+++ b/tinyipa/build_files/finalreqs.lst
@@ -4,22 +4,22 @@ dmidecode.tcz
 dosfstools.tcz
 efibootmgr.tcz
 efivar.tcz
-filesystems-5.15.10-tinycore64.tcz
+filesystems-6.1.2-tinycore64.tcz
 file.tcz
 gdisk.tcz
 glib2.tcz
 haveged.tcz
 hdparm.tcz
 iproute2.tcz
-ipv6-netfilter-5.15.10-tinycore64.tcz
+ipv6-netfilter-6.1.2-tinycore64.tcz
 libxml2.tcz
 mdadm.tcz
 ntpclient.tcz
 parted.tcz
 pciutils.tcz
 popt.tcz
-raid-dm-5.15.10-tinycore64.tcz
-scsi-5.15.10-tinycore64.tcz
+raid-dm-6.1.2-tinycore64.tcz
+scsi-6.1.2-tinycore64.tcz
 smartmontools.tcz
 udev-lib.tcz
 util-linux.tcz
diff --git a/tinyipa/finalise-tinyipa.sh b/tinyipa/finalise-tinyipa.sh
index 567df69..924ddd7 100755
--- a/tinyipa/finalise-tinyipa.sh
+++ b/tinyipa/finalise-tinyipa.sh
@@ -228,6 +228,10 @@ for target in *; do
     fi
 done
 popd
+# symlink bash to sh if /bin/sh is not there
+if [ ! -f "$FINALDIR/bin/sh" ]; then
+    $CHROOT_CMD ln -sf "/bin/bash" "/bin/sh"
+fi
 set -x
 
 # Rebuild build directory into gz file