diff --git a/scripts/package-installer b/scripts/package-installer
index 84cb68ae..f75c3ef2 100755
--- a/scripts/package-installer
+++ b/scripts/package-installer
@@ -9,8 +9,12 @@ BASEDOCKERFILE=./scripts/installer/BaseDockerfile.${ARCH}
 DOCKERFILE=./scripts/installer/Dockerfile.${ARCH}
 ARTIFACTS=./dist/artifacts
 
-if [ ! -f $DOCKERFILE ] || [ ! -f ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION} ] || [ ! -f ${ARTIFACTS}/${INITRD} ]; then
-    echo "Skipping package-installer due to ARM build: ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION}  or ${ARTIFACTS}/${INITRD} not found"
+if \
+      [[ "${ARCH}" != "amd64" ]] || \
+      [ ! -f ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION} ] || \
+      [ ! -f ${ARTIFACTS}/${INITRD} ]; \
+      then
+    echo "Skipping package-installer due to ARM/ARM64 build: ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION}  or ${ARTIFACTS}/${INITRD} not found"
     exit 0
 fi
 
diff --git a/scripts/package-iso b/scripts/package-iso
index fbaec6c8..629ddc09 100755
--- a/scripts/package-iso
+++ b/scripts/package-iso
@@ -13,8 +13,12 @@ CHECKSUM=iso-checksums.txt
 mkdir -p ${CD}/boot/isolinux
 mkdir -p ${CD}/rancheros
 
-if [ ! -f ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION} ] || [ ! -f ${ARTIFACTS}/${INITRD} ]; then
-    echo "Skipping package-iso due to ARM build: ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION}  or ${ARTIFACTS}/${INITRD} not found"
+if \
+      [[ "${ARCH}" != "amd64" ]] || \
+      [ ! -f ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION} ] || \
+      [ ! -f ${ARTIFACTS}/${INITRD} ]; \
+    then
+    echo "Skipping package-iso due to ARM/ARM64 build: ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION}  or ${ARTIFACTS}/${INITRD} not found"
     exit 0
 fi