diff --git a/.buildkite/pipelines/upload_pipeline.yml b/.buildkite/pipelines/upload_pipeline.yml
index f20dd1f60f7f74..1f53ac97a7b47d 100644
--- a/.buildkite/pipelines/upload_pipeline.yml
+++ b/.buildkite/pipelines/upload_pipeline.yml
@@ -7,5 +7,7 @@ steps:
         echo "Uploading pipeline $TESTED_PIPELINE_PATH"
         buildkite-agent pipeline upload $TESTED_PIPELINE_PATH
       else
-        $TESTED_PIPELINE_PATH | buildkite-agent pipeline upload
+        $TESTED_PIPELINE_PATH > /tmp/pipeline_steps.yml
+        buildkite-agent artifact upload '/tmp/pipeline_steps.yml'
+        buildkite-agent pipeline upload '/tmp/pipeline_steps.yml'
       fi
diff --git a/.buildkite/scripts/pipelines/pull_request/pipeline.ts b/.buildkite/scripts/pipelines/pull_request/pipeline.ts
index a464e8ac693a3a..7f562a477364ea 100644
--- a/.buildkite/scripts/pipelines/pull_request/pipeline.ts
+++ b/.buildkite/scripts/pipelines/pull_request/pipeline.ts
@@ -318,7 +318,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
     // remove duplicated steps
     console.log([...new Set(pipeline)].join('\n'));
   } catch (ex) {
-    console.error('PR pipeline generation error', ex.message);
+    console.error('Error while generating the pipeline steps: ' + ex.message, ex);
     process.exit(1);
   }
 })();