diff --git a/go.mod b/go.mod
index eaf456d0d..7869f6d09 100644
--- a/go.mod
+++ b/go.mod
@@ -121,3 +121,5 @@ require (
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
+
+replace github.com/openshift/build-machinery-go => github.com/bertinatto/build-machinery-go v0.0.0-20241108201406-ebb762a479a7
diff --git a/go.sum b/go.sum
index e26aa2124..67d43fe0a 100644
--- a/go.sum
+++ b/go.sum
@@ -14,6 +14,8 @@ github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/bertinatto/build-machinery-go v0.0.0-20241108201406-ebb762a479a7 h1:BMs/rabheeOfij4zJpyExfDlL/o6ZJ44l8jKJgZDBu0=
+github.com/bertinatto/build-machinery-go v0.0.0-20241108201406-ebb762a479a7/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
 github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
 github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
 github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
@@ -150,8 +152,6 @@ github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
 github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0=
 github.com/openshift/api v0.0.0-20241001152557-e415140e5d5f h1:ya1OmyZm3LIIxI3U9VE9Nyx3ehCHgBwxyFUPflYPWls=
 github.com/openshift/api v0.0.0-20241001152557-e415140e5d5f/go.mod h1:Shkl4HanLwDiiBzakv+con/aMGnVE2MAGvoKp5oyYUo=
-github.com/openshift/build-machinery-go v0.0.0-20241031155326-6ae126a9cb72 h1:kMM+Ea3YFrcoYS76RhhBA7uELy97JM0gwqnyoy7fxco=
-github.com/openshift/build-machinery-go v0.0.0-20241031155326-6ae126a9cb72/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
 github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f h1:FRc0bVNWprihWS0GqQWzb3dY4dkCwpOP3mDw5NwSoR4=
 github.com/openshift/client-go v0.0.0-20241001162912-da6d55e4611f/go.mod h1:KiZi2mJRH1TOJ3FtBDYS6YvUL30s/iIXaGSUrSa36mo=
 github.com/openshift/library-go v0.0.0-20241106000323-9fcf3125a28e h1:ZPAUe9p5nfbzJzb23s+rdFqDrl3U58hC4Y0merEkoSE=
diff --git a/vendor/github.com/openshift/build-machinery-go/scripts/test-operator-integration.sh b/vendor/github.com/openshift/build-machinery-go/scripts/test-operator-integration.sh
index 04f08222a..fc12d8b1f 100644
--- a/vendor/github.com/openshift/build-machinery-go/scripts/test-operator-integration.sh
+++ b/vendor/github.com/openshift/build-machinery-go/scripts/test-operator-integration.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-set -o errexit
 set -o nounset
 set -o pipefail
 set -x
@@ -40,4 +39,12 @@ APPLY_CONFIG_ARGS=(
 )
 
 # Run the apply-configuration command from the operator
-"${MOM_CMD}" "${APPLY_CONFIG_ARGS[@]}"
+if ! "${MOM_CMD}" "${APPLY_CONFIG_ARGS[@]}"; then
+    # If the command fails, create an archive for easy downloading
+    TMP_DIR="$(mktemp -d)"
+    ARCHIVE_PATH="${TMP_DIR}/archive.tar.gz"
+    tar -czf "${ARCHIVE_PATH}" -C "${APPLY_CONFIG_OUTPUT_DIR}" .
+    mv "${ARCHIVE_PATH}" "${APPLY_CONFIG_OUTPUT_DIR}"
+    rmdir "${TMP_DIR}"
+    exit 1
+fi
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 947504140..1f2178b9c 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -248,7 +248,7 @@ github.com/openshift/api/template
 github.com/openshift/api/template/v1
 github.com/openshift/api/user
 github.com/openshift/api/user/v1
-# github.com/openshift/build-machinery-go v0.0.0-20241031155326-6ae126a9cb72
+# github.com/openshift/build-machinery-go v0.0.0-20241031155326-6ae126a9cb72 => github.com/bertinatto/build-machinery-go v0.0.0-20241108201406-ebb762a479a7
 ## explicit; go 1.22.0
 github.com/openshift/build-machinery-go
 github.com/openshift/build-machinery-go/make
@@ -1482,3 +1482,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
 ## explicit; go 1.12
 sigs.k8s.io/yaml
 sigs.k8s.io/yaml/goyaml.v2
+# github.com/openshift/build-machinery-go => github.com/bertinatto/build-machinery-go v0.0.0-20241108201406-ebb762a479a7