diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
index 3bce3ef8..dd3c293d 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -39,16 +39,16 @@ SET_armv7a_sf_systemd_SPECS="armv7a/stage1-systemd.spec armv7a/stage2-systemd.sp
 
 
 update_symlinks() {
-  # Symlink the latest stages3 to build from
-  for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
-    pushd $d >/dev/null
-    for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
-      of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
-      of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
-      ln -sf $f $of
-    done
-    popd >/dev/null
-  done
+	# Symlink the latest stages3 to build from
+	local d f
+	for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+		pushd "${d}" >/dev/null
+		for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
+			local of=$(echo "${f}" | convert_filename)
+			ln -sf "${f}" "${of}"
+		done
+		popd >/dev/null
+	done
 }
 
 upload() {