diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index ea04463f4f5c9314f736199182a3533b11b17552..a95233f1369a40b11726b8cd669022cf22ec5bd9 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -268,7 +268,7 @@ jobs:
               ret=0;
               tools/buildman/buildman -o /tmp -P -E --board ${TEST_PY_BD} ${OVERRIDE} || ret=$?;
               if [[ $ret -ne 0 && $ret -ne 129 ]]; then
-                  tools/buildman/buildman -o /tmp -sdeP --board ${TEST_PY_BD};
+                  tools/buildman/buildman -o /tmp -seP --board ${TEST_PY_BD};
                   exit $ret;
               fi;
           fi
@@ -420,7 +420,7 @@ jobs:
               ret=0;
               tools/buildman/buildman -o /tmp -P -E ${BUILDMAN} ${OVERRIDE} || ret=$?;
               if [[ $ret -ne 0 && $ret -ne 129 ]]; then
-                  tools/buildman/buildman -o /tmp -sdeP ${BUILDMAN};
+                  tools/buildman/buildman -o /tmp -seP ${BUILDMAN};
                   exit $ret;
               fi;
           fi
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a456c9b42b586f41e8ba370d856ae3c7bbc1c17..f148739550aed1d70fd7081bad328671d1e84c04 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,7 @@ stages:
         tools/buildman/buildman -o /tmp -P -E --board ${TEST_PY_BD} ${OVERRIDE}
           || ret=$?;
         if [[ $ret -ne 0 && $ret -ne 129 ]]; then
-          tools/buildman/buildman -o /tmp -sdeP --board ${TEST_PY_BD};
+          tools/buildman/buildman -o /tmp -seP --board ${TEST_PY_BD};
           exit $ret;
         fi;
       fi
@@ -74,7 +74,7 @@ build all 32bit ARM platforms:
     - ret=0;
       ./tools/buildman/buildman -o /tmp -P -E arm -x aarch64 || ret=$?;
       if [[ $ret -ne 0 && $ret -ne 129 ]]; then
-        ./tools/buildman/buildman -o /tmp -sdeP;
+        ./tools/buildman/buildman -o /tmp -seP;
         exit $ret;
       fi;
 
@@ -88,7 +88,7 @@ build all 64bit ARM platforms:
     - ret=0;
       ./tools/buildman/buildman -o /tmp -P -E aarch64 || ret=$?;
       if [[ $ret -ne 0 && $ret -ne 129 ]]; then
-        ./tools/buildman/buildman -o /tmp -sdeP;
+        ./tools/buildman/buildman -o /tmp -seP;
         exit $ret;
       fi;
 
@@ -99,7 +99,7 @@ build all PowerPC platforms:
     - ret=0;
       ./tools/buildman/buildman -o /tmp -P -E powerpc || ret=$?;
       if [[ $ret -ne 0 && $ret -ne 129 ]]; then
-        ./tools/buildman/buildman -o /tmp -sdeP;
+        ./tools/buildman/buildman -o /tmp -seP;
         exit $ret;
       fi;
 
@@ -110,7 +110,7 @@ build all other platforms:
     - ret=0;
       ./tools/buildman/buildman -o /tmp -P -E -x arm,powerpc || ret=$?;
       if [[ $ret -ne 0 && $ret -ne 129 ]]; then
-        ./tools/buildman/buildman -o /tmp -sdeP;
+        ./tools/buildman/buildman -o /tmp -seP;
         exit $ret;
       fi;
 
diff --git a/.travis.yml b/.travis.yml
index f01983fa8963ffbd2bdfc72990a28f007aea9017..43a0b7bb6c59fe6f9ff6a13a5002a622b7bfb6cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -211,7 +211,7 @@ script:
      ret=0;
      tools/buildman/buildman -P -E ${BUILDMAN} ${OVERRIDE}|| ret=$?;
      if [[ $ret -ne 0 && $ret -ne 129 ]]; then
-       tools/buildman/buildman -sdeP ${BUILDMAN};
+       tools/buildman/buildman -seP ${BUILDMAN};
        exit $ret;
      fi;
    fi
@@ -240,7 +240,7 @@ script:
      tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E
        --board ${TEST_PY_BD} ${OVERRIDE}|| ret=$?;
      if [[ $ret -ne 0 && $ret -ne 129 ]]; then
-       tools/buildman/buildman -sde -o ${UBOOT_TRAVIS_BUILD_DIR} -w
+       tools/buildman/buildman -se -o ${UBOOT_TRAVIS_BUILD_DIR} -w
          --board ${TEST_PY_BD};
        exit $ret;
      fi;