diff --git a/buildall.sh b/buildall.sh
index b7da02f2..2aa686a7 100644
--- a/buildall.sh
+++ b/buildall.sh
@@ -1,18 +1,15 @@
 #!/bin/bash
 set -e
 find -type f | grep ympbuild | sort -V | while read line ; do
-    echo -e "\033[33;1m=>> BINARY BUILD START:\033[;0m $line"
     name=$(basename $(dirname $line))
-    if ! ls ./output/${name}_*$(uname -m).ymp ; then
-        ymp build $(dirname $line) --verbose --no-source --ignore-dependency --allow-oem
+    if ! find ./output/ -type f | grep "${name}_" | grep "$(uname -m).ymp$" 2>/dev/null ; then
+        echo -e "\033[33;1m<<= BINARY BUILD DONE:\033[;0m $line"
+        ymp-build $(dirname $line) --verbose --no-source --ignore-dependency --allow-oem
+        echo -e "\033[33;1m<<= BINARY BUILD DONE:\033[;0m $line"
     fi
-    echo -e "\033[33;1m<<= BINARY BUILD DONE:\033[;0m $line"
 done
 mkdir -p output
-echo "<h1><b>YMP index:</b></h1><br>" > output/index.html
 find -type f  | grep -v "output"| grep "$(uname -m).ymp$" | sort -V | while read line ; do
     mv $line output
-    echo "* <a href=\"$(basename $line)\">$(basename $line)</a><br>" >> output/index.html
 done
-ymp index output --allow-oem --verbose
-echo "* <a href=\"ymp-index.yaml\">ymp-index.yaml</a><br>" >> output/index.html
+ymp index output --allow-oem --verbose --move
diff --git a/update.sh b/update.sh
index 4def00f5..6aafdc05 100644
--- a/update.sh
+++ b/update.sh
@@ -1,18 +1,16 @@
 #!/bin/bash
 set -e
 find -type f | grep ympbuild | sort -V | while read line ; do
-    echo -e "\033[33;1m=>> SOURCE BUILD START:\033[;0m $line"
     name=$(basename $(dirname $line))
-    if ! ls ./output/${name}_*source.ymp 2>/dev/null ; then
-        ymp build $(dirname $line) --verbose --no-binary --ignore-dependency --allow-oem
+    if ! find ./output/ -type f | grep "${name}_" | grep "source.ymp$" 2>/dev/null ; then
+        echo -e "\033[33;1m=>> SOURCE BUILD START:\033[;0m $line"
+        ymp-build $(dirname $line) --verbose --no-binary --ignore-dependency --allow-oem
         echo -e "\033[33;1m<<= SOURCE BUILD DONE:\033[;0m $line"
     fi
 done
 mkdir -p output
-echo "<h1><b>YMP index:</b></h1><br>" > output/index.html
 find -type f  | grep -v "output"| grep "source.ymp$" | sort -V | while read line ; do
     mv $line output
-    echo "* <a href=\"$(basename $line)\">$(basename $line)</a><br>" >> output/index.html
 done
-ymp index output --allow-oem
-echo "* <a href=\"ymp-index.yaml\">ymp-index.yaml</a><br>" >> output/index.html
+ymp index output --allow-oem --verbose --move
+