diff --git a/packages/build/src/plugins_core/deploy/index.js b/packages/build/src/plugins_core/deploy/index.js
index cd48749c19..dd02159fd7 100644
--- a/packages/build/src/plugins_core/deploy/index.js
+++ b/packages/build/src/plugins_core/deploy/index.js
@@ -28,6 +28,9 @@ const coreStep = async function ({
 }) {
   const client = createBuildbotClient(buildbotServerSocket)
   try {
+    // buildbot will emit logs. Flush the output to preserve the right order.
+    logs?.outputFlusher?.flush()
+
     await connectBuildbotClient(client)
     await saveUpdatedConfig({
       configMutations,