diff --git a/usr/bin/archboot-aarch64-server-release.sh b/usr/bin/archboot-aarch64-server-release.sh
index 786f3f488..aa8487518 100755
--- a/usr/bin/archboot-aarch64-server-release.sh
+++ b/usr/bin/archboot-aarch64-server-release.sh
@@ -66,11 +66,11 @@ cd "${_ISODIR}" || exit 1
 "archboot-${_ARCH}-release.sh" "${_BUILDDIR}" || rm -r "${_BUILDDIR}"
 # set user rights on files
 # set user rights on files
-[[ -d "${_BUILDDIR}" ]] && exit 1
+[[ -d "${_BUILDDIR}" ]] || exit 1
 chmod 755 "${_BUILDDIR}"
 chown -R "${_USER}" "${_BUILDDIR}"
 chgrp -R "${_GROUP}" "${_BUILDDIR}"
-cd "${_BUILDDIR}" || exit 1
+cd "${_BUILDDIR}"
 # remove sha256sum and install image
 rm sha256sum.txt
 # sign files and create new sha256sum.txt
diff --git a/usr/bin/archboot-x86_64-server-release.sh b/usr/bin/archboot-x86_64-server-release.sh
index b6645e32d..a7fc45b08 100755
--- a/usr/bin/archboot-x86_64-server-release.sh
+++ b/usr/bin/archboot-x86_64-server-release.sh
@@ -32,12 +32,12 @@ cp "${_PACMAN_MIRROR}" "${_PACMAN_MIRROR}".old
 cp "${_PACMAN_MIRROR}".archboot "${_PACMAN_MIRROR}"
 # create release in "${_ISODIR}"
 cd "${_ISODIR}" || exit 1
-"archboot-${_ARCH}-release.sh" "${_BUILDDIR}" ||rm -r "${_BUILDDIR}"
+"archboot-${_ARCH}-release.sh" "${_BUILDDIR}" || rm -r "${_BUILDDIR}"
 # restore pacman.conf and mirrorlist
 cp "${_PACMAN_MIRROR}".old "${_PACMAN_MIRROR}"
 cp "${_PACMAN_CONF}".old "${_PACMAN_CONF}"
 # set user rights on files
-[[ -d "${_BUILDDIR}" ]] && exit 1
+[[ -d "${_BUILDDIR}" ]] || exit 1
 chmod 755 "${_BUILDDIR}"
 chown -R "${_USER}" "${_BUILDDIR}"
 chgrp -R "${_GROUP}" "${_BUILDDIR}"