diff --git a/docs/buildstrategies.md b/docs/buildstrategies.md
index 499305e446..af875adb3c 100644
--- a/docs/buildstrategies.md
+++ b/docs/buildstrategies.md
@@ -832,7 +832,7 @@ If we will apply the following resources:
 
   ```yaml
     - name: buildah-bud
-      image: quay.io/containers/buildah:v1.35.3
+      image: quay.io/containers/buildah:v1.35.4
       workingDir: $(params.shp-source-root)
       securityContext:
         privileged: true
@@ -854,7 +854,7 @@ If we will apply the following resources:
         - name: buildah-images
           mountPath: /var/lib/containers/storage
     - name: buildah-push
-      image: quay.io/containers/buildah:v1.35.3
+      image: quay.io/containers/buildah:v1.35.4
       securityContext:
         privileged: true
       command:
diff --git a/pkg/reconciler/buildrun/resources/taskrun_test.go b/pkg/reconciler/buildrun/resources/taskrun_test.go
index aa27039461..bf48d31161 100644
--- a/pkg/reconciler/buildrun/resources/taskrun_test.go
+++ b/pkg/reconciler/buildrun/resources/taskrun_test.go
@@ -98,7 +98,7 @@ var _ = Describe("GenerateTaskrun", func() {
 			})
 
 			It("should ensure IMAGE is replaced by builder image when needed.", func() {
-				Expect(got.Steps[1].Image).To(Equal("quay.io/containers/buildah:v1.35.3"))
+				Expect(got.Steps[1].Image).To(Equal("quay.io/containers/buildah:v1.35.4"))
 			})
 
 			It("should ensure ImagePullPolicy can be set by the build strategy author.", func() {
diff --git a/samples/v1alpha1/buildstrategy/buildah/buildstrategy_buildah_shipwright_managed_push_cr.yaml b/samples/v1alpha1/buildstrategy/buildah/buildstrategy_buildah_shipwright_managed_push_cr.yaml
index b23ad1160e..12bdc0cd64 100644
--- a/samples/v1alpha1/buildstrategy/buildah/buildstrategy_buildah_shipwright_managed_push_cr.yaml
+++ b/samples/v1alpha1/buildstrategy/buildah/buildstrategy_buildah_shipwright_managed_push_cr.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   buildSteps:
     - name: build
-      image: quay.io/containers/buildah:v1.35.3
+      image: quay.io/containers/buildah:v1.35.4
       imagePullPolicy: Always
       workingDir: $(params.shp-source-root)
       securityContext:
diff --git a/samples/v1alpha1/buildstrategy/buildah/buildstrategy_buildah_strategy_managed_push_cr.yaml b/samples/v1alpha1/buildstrategy/buildah/buildstrategy_buildah_strategy_managed_push_cr.yaml
index 829b01bd92..a848f10659 100644
--- a/samples/v1alpha1/buildstrategy/buildah/buildstrategy_buildah_strategy_managed_push_cr.yaml
+++ b/samples/v1alpha1/buildstrategy/buildah/buildstrategy_buildah_strategy_managed_push_cr.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   buildSteps:
     - name: build-and-push
-      image: quay.io/containers/buildah:v1.35.3
+      image: quay.io/containers/buildah:v1.35.4
       imagePullPolicy: Always
       workingDir: $(params.shp-source-root)
       securityContext:
diff --git a/samples/v1alpha1/buildstrategy/source-to-image/buildstrategy_source-to-image-redhat_cr.yaml b/samples/v1alpha1/buildstrategy/source-to-image/buildstrategy_source-to-image-redhat_cr.yaml
index 9b7a5bbd24..67cac9b7f3 100644
--- a/samples/v1alpha1/buildstrategy/source-to-image/buildstrategy_source-to-image-redhat_cr.yaml
+++ b/samples/v1alpha1/buildstrategy/source-to-image/buildstrategy_source-to-image-redhat_cr.yaml
@@ -21,7 +21,7 @@ spec:
         - name: s2i
           mountPath: /s2i
     - name: buildah
-      image: quay.io/containers/buildah:v1.35.3
+      image: quay.io/containers/buildah:v1.35.4
       imagePullPolicy: Always
       workingDir: /s2i
       securityContext:
diff --git a/samples/v1beta1/buildstrategy/buildah/buildstrategy_buildah_shipwright_managed_push_cr.yaml b/samples/v1beta1/buildstrategy/buildah/buildstrategy_buildah_shipwright_managed_push_cr.yaml
index 9fd38e71e4..6e31cf3b61 100644
--- a/samples/v1beta1/buildstrategy/buildah/buildstrategy_buildah_shipwright_managed_push_cr.yaml
+++ b/samples/v1beta1/buildstrategy/buildah/buildstrategy_buildah_shipwright_managed_push_cr.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   steps:
     - name: build
-      image: quay.io/containers/buildah:v1.35.3
+      image: quay.io/containers/buildah:v1.35.4
       imagePullPolicy: Always
       workingDir: $(params.shp-source-root)
       securityContext:
diff --git a/samples/v1beta1/buildstrategy/buildah/buildstrategy_buildah_strategy_managed_push_cr.yaml b/samples/v1beta1/buildstrategy/buildah/buildstrategy_buildah_strategy_managed_push_cr.yaml
index e96b1c978e..9d37fc3384 100644
--- a/samples/v1beta1/buildstrategy/buildah/buildstrategy_buildah_strategy_managed_push_cr.yaml
+++ b/samples/v1beta1/buildstrategy/buildah/buildstrategy_buildah_strategy_managed_push_cr.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   steps:
     - name: build-and-push
-      image: quay.io/containers/buildah:v1.35.3
+      image: quay.io/containers/buildah:v1.35.4
       imagePullPolicy: Always
       workingDir: $(params.shp-source-root)
       securityContext:
diff --git a/samples/v1beta1/buildstrategy/source-to-image/buildstrategy_source-to-image-redhat_cr.yaml b/samples/v1beta1/buildstrategy/source-to-image/buildstrategy_source-to-image-redhat_cr.yaml
index 6630199b99..4631936c6c 100644
--- a/samples/v1beta1/buildstrategy/source-to-image/buildstrategy_source-to-image-redhat_cr.yaml
+++ b/samples/v1beta1/buildstrategy/source-to-image/buildstrategy_source-to-image-redhat_cr.yaml
@@ -23,7 +23,7 @@ spec:
         - name: s2i
           mountPath: /s2i
     - name: buildah
-      image: quay.io/containers/buildah:v1.35.3
+      image: quay.io/containers/buildah:v1.35.4
       imagePullPolicy: Always
       workingDir: /s2i
       securityContext:
diff --git a/test/v1alpha1_samples/buildstrategy_samples.go b/test/v1alpha1_samples/buildstrategy_samples.go
index 3150369168..405426bf2b 100644
--- a/test/v1alpha1_samples/buildstrategy_samples.go
+++ b/test/v1alpha1_samples/buildstrategy_samples.go
@@ -18,7 +18,7 @@ spec:
       emptyDir: {}
   buildSteps:
     - name: buildah-bud
-      image: quay.io/containers/buildah:v1.35.3
+      image: quay.io/containers/buildah:v1.35.4
       workingDir: $(params.shp-source-root)
       securityContext:
         capabilities:
@@ -41,7 +41,7 @@ spec:
         - name: buildah-images
           mountPath: /var/lib/containers/storage
     - name: buildah-push
-      image: quay.io/containers/buildah:v1.35.3
+      image: quay.io/containers/buildah:v1.35.4
       securityContext:
         capabilities:
           add: ["SETFCAP"]
@@ -83,7 +83,7 @@ spec:
       default: "vfs"
   buildSteps:
     - name: buildah-bud
-      image: quay.io/containers/buildah:v1.35.3
+      image: quay.io/containers/buildah:v1.35.4
       workingDir: $(params.shp-source-root)
       securityContext:
         capabilities:
@@ -114,7 +114,7 @@ spec:
             fieldRef:
               fieldPath: "my-fieldpath"
     - name: buildah-push
-      image: quay.io/containers/buildah:v1.35.3
+      image: quay.io/containers/buildah:v1.35.4
       securityContext:
         capabilities:
           add: ["SETFCAP"]
diff --git a/test/v1alpha1_samples/clusterbuildstrategy_samples.go b/test/v1alpha1_samples/clusterbuildstrategy_samples.go
index 0129d923a4..0b8b0e1e16 100644
--- a/test/v1alpha1_samples/clusterbuildstrategy_samples.go
+++ b/test/v1alpha1_samples/clusterbuildstrategy_samples.go
@@ -24,7 +24,7 @@ spec:
       default: "vfs"
   buildSteps:
     - name: buildah-bud
-      image: quay.io/containers/buildah:v1.35.3
+      image: quay.io/containers/buildah:v1.35.4
       workingDir: $(params.shp-source-root)
       securityContext:
         capabilities:
@@ -48,7 +48,7 @@ spec:
         - name: buildah-images
           mountPath: /var/lib/containers/storage
     - name: buildah-push
-      image: quay.io/containers/buildah:v1.35.3
+      image: quay.io/containers/buildah:v1.35.4
       securityContext:
         capabilities:
           add: ["SETFCAP"]
@@ -91,7 +91,7 @@ spec:
       default: "vfs"
   buildSteps:
     - name: buildah-bud
-      image: quay.io/containers/buildah:v1.35.3
+      image: quay.io/containers/buildah:v1.35.4
       workingDir: $(params.shp-source-root)
       securityContext:
         capabilities:
@@ -115,7 +115,7 @@ spec:
         - name: buildah-images
           mountPath: /var/lib/containers/storage
     - name: buildah-push
-      image: quay.io/containers/buildah:v1.35.3
+      image: quay.io/containers/buildah:v1.35.4
       securityContext:
         capabilities:
           add: ["SETFCAP"]
diff --git a/test/v1beta1_samples/buildstrategy_samples.go b/test/v1beta1_samples/buildstrategy_samples.go
index ddd185613a..0e61433089 100644
--- a/test/v1beta1_samples/buildstrategy_samples.go
+++ b/test/v1beta1_samples/buildstrategy_samples.go
@@ -18,7 +18,7 @@ spec:
       emptyDir: {}
   steps:
     - name: buildah-bud
-      image: quay.io/containers/buildah:v1.35.3
+      image: quay.io/containers/buildah:v1.35.4
       workingDir: $(params.shp-source-root)
       securityContext:
         privileged: true
@@ -40,7 +40,7 @@ spec:
         - name: buildah-images
           mountPath: /var/lib/containers/storage
     - name: buildah-push
-      image: quay.io/containers/buildah:v1.35.3
+      image: quay.io/containers/buildah:v1.35.4
       securityContext:
         privileged: true
       command:
@@ -81,7 +81,7 @@ spec:
       emptyDir: {}
   steps:
     - name: buildah-bud
-      image: quay.io/containers/buildah:v1.35.3
+      image: quay.io/containers/buildah:v1.35.4
       workingDir: $(params.shp-source-root)
       securityContext:
         privileged: true
@@ -110,7 +110,7 @@ spec:
             fieldRef:
               fieldPath: "my-fieldpath"
     - name: buildah-push
-      image: quay.io/containers/buildah:v1.35.3
+      image: quay.io/containers/buildah:v1.35.4
       securityContext:
         privileged: true
       command:
diff --git a/test/v1beta1_samples/clusterbuildstrategy_samples.go b/test/v1beta1_samples/clusterbuildstrategy_samples.go
index a81418cb17..5ddcbde6c0 100644
--- a/test/v1beta1_samples/clusterbuildstrategy_samples.go
+++ b/test/v1beta1_samples/clusterbuildstrategy_samples.go
@@ -19,7 +19,7 @@ spec:
         emptyDir: {}
   steps:
     - name: buildah-bud
-      image: quay.io/containers/buildah:v1.35.3
+      image: quay.io/containers/buildah:v1.35.4
       workingDir: $(params.shp-source-root)
       securityContext:
         privileged: true
@@ -41,7 +41,7 @@ spec:
         - name: buildah-images
           mountPath: /var/lib/containers/storage
     - name: buildah-push
-      image: quay.io/containers/buildah:v1.35.3
+      image: quay.io/containers/buildah:v1.35.4
       securityContext:
         privileged: true
       command:
@@ -77,7 +77,7 @@ spec:
         emptyDir: {}
   steps:
     - name: buildah-bud
-      image: quay.io/containers/buildah:v1.35.3
+      image: quay.io/containers/buildah:v1.35.4
       workingDir: $(params.shp-source-root)
       securityContext:
         privileged: true
@@ -99,7 +99,7 @@ spec:
         - name: buildah-images
           mountPath: /var/lib/containers/storage
     - name: buildah-push
-      image: quay.io/containers/buildah:v1.35.3
+      image: quay.io/containers/buildah:v1.35.4
       securityContext:
         privileged: true
       command: