diff --git a/script/step/make_iso.sh b/script/step/make_iso.sh
index 497734604cd760cbd16f37f47bc2cc79c9ab58a2..419b22b9f3d705ecaf608402864f4b1f6db46ef2 100644
--- a/script/step/make_iso.sh
+++ b/script/step/make_iso.sh
@@ -36,13 +36,13 @@ function make_iso_inchroot()
     fi
     yum install oemaker lorax -y -c "${yum_conf}"
     cd /opt/oemaker
-
+    REPOS=`echo "${OBS_STANDARD_REPO_URL} ${OBS_STANDARD_THIRD_REPO_URL}" | sed 's/[ \t]*$//g'`
     set +e
     num=0
     set +u
     while [ "${num}" -lt 3 ]
     do
-        bash -x oemaker -t standard -p ${PRODUCTS} -v "${OS_VERSION}" -r "" -s "${OBS_STANDARD_REPO_URL} ${OBS_STANDARD_THIRD_REPO_URL}"
+        bash -x oemaker -t standard -p ${PRODUCTS} -v "${OS_VERSION}" -r "" -s "${REPOS}"
         if [ $? -eq 0 ];then
             break
         elif [ $? -eq 133 ]; then
diff --git a/script/step/make_iso_everysrc.sh b/script/step/make_iso_everysrc.sh
index bc879a2b469c29dc4a815597a08432234025c210..01d1b2fd6dc3541007658f842793bc9b1947f17c 100644
--- a/script/step/make_iso_everysrc.sh
+++ b/script/step/make_iso_everysrc.sh
@@ -44,11 +44,12 @@ function make_iso_everysrc_inchroot()
     done
     sed -i '/parse_rpmlist_xml \"conflict\"/d' rpm.sh
     OBS_STANDARD_REPO_URL=${OBS_STANDARD_REPO_URL%/*}
+    REPOS=`echo "${OBS_STANDARD_REPO_URL}/standard_aarch64 ${OBS_STANDARD_REPO_URL}/standard_x86_64 ${OBS_STANDARD_THIRD_REPO_URL}" | sed 's/[ \t]*$//g'`
     set +e
     num=0
     while [ "${num}" -lt 3 ]
     do
-        bash -x oemaker -t everything_src -p ${PRODUCTS} -v "${OS_VERSION}" -r "" -s "${OBS_STANDARD_REPO_URL}/standard_aarch64 ${OBS_STANDARD_REPO_URL}/standard_x86_64 ${OBS_STANDARD_THIRD_REPO_URL}"
+        bash -x oemaker -t everything_src -p ${PRODUCTS} -v "${OS_VERSION}" -r "" -s "${REPOS}"
         if [ $? -eq 0 ];then
             break
         elif [ $? -eq 133 ]; then
diff --git a/script/step/make_iso_everything.sh b/script/step/make_iso_everything.sh
index 2efdb41001d377f93e58d9991b30bb112c49fe6c..94e4178f8a02a4ee522763900475e8c0cb3afc2d 100644
--- a/script/step/make_iso_everything.sh
+++ b/script/step/make_iso_everything.sh
@@ -44,12 +44,12 @@ function make_iso_everything_inchroot()
     do
         sed -i '/<packagelist type="exclude">/a\        <packagereq>'$rpmsname'</packagereq>' config/rpmlist.xml
     done
-
+    REPOS=`echo "${OBS_STANDARD_REPO_URL} ${OBS_STANDARD_THIRD_REPO_URL}" | sed 's/[ \t]*$//g'`
     set +e
     num=0
     while [ "${num}" -lt 3 ]
     do
-        bash -x oemaker -t everything -p ${PRODUCTS} -v "${OS_VERSION}" -r "" -s "${OBS_STANDARD_REPO_URL} ${OBS_STANDARD_THIRD_REPO_URL}"
+        bash -x oemaker -t everything -p ${PRODUCTS} -v "${OS_VERSION}" -r "" -s "${REPOS}"
         if [ $? -eq 0 ];then
             break
         elif [ $? -eq 133 ]; then