diff --git a/docs/buildstrategies.md b/docs/buildstrategies.md
index 6acddb5781..774c8a7594 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.0
+      image: quay.io/containers/buildah:v1.35.4-immutable
       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.0
+      image: quay.io/containers/buildah:v1.35.4-immutable
       securityContext:
         privileged: true
       command:
diff --git a/pkg/reconciler/buildrun/resources/taskrun_test.go b/pkg/reconciler/buildrun/resources/taskrun_test.go
index d6aa57a7c1..e431f98a8a 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.0"))
+				Expect(got.Steps[1].Image).To(Equal("quay.io/containers/buildah:v1.35.4-immutable"))
 			})
 
 			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 04ac613620..3266ebe3d4 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.0
+      image: quay.io/containers/buildah:v1.35.4-immutable
       workingDir: $(params.shp-source-root)
       securityContext:
         privileged: true
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 104c39ae72..49a5921768 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.0
+      image: quay.io/containers/buildah:v1.35.4-immutable
       workingDir: $(params.shp-source-root)
       securityContext:
         capabilities:
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 b990db3783..88ae2b6be3 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.0
+      image: quay.io/containers/buildah:v1.35.4-immutable
       workingDir: /s2i
       securityContext:
         privileged: true
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 cf0658f43f..16705b4a4f 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.0
+      image: quay.io/containers/buildah:v1.35.4-immutable
       workingDir: $(params.shp-source-root)
       securityContext:
         privileged: true
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 c2fa649ee6..b53f717edd 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.0
+      image: quay.io/containers/buildah:v1.35.4-immutable
       workingDir: $(params.shp-source-root)
       securityContext:
         capabilities:
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 fda9c42eef..f8d0c37ad1 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.0
+      image: quay.io/containers/buildah:v1.35.4-immutable
       workingDir: /s2i
       securityContext:
         capabilities:
diff --git a/test/v1alpha1_samples/buildstrategy_samples.go b/test/v1alpha1_samples/buildstrategy_samples.go
index 45f5e8268e..714acf3fdf 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.0
+      image: quay.io/containers/buildah:v1.35.4-immutable
       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.0
+      image: quay.io/containers/buildah:v1.35.4-immutable
       securityContext:
         capabilities:
           add: ["SETFCAP"]
@@ -83,7 +83,7 @@ spec:
       default: "vfs"
   buildSteps:
     - name: buildah-bud
-      image: quay.io/containers/buildah:v1.35.0
+      image: quay.io/containers/buildah:v1.35.4-immutable
       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.0
+      image: quay.io/containers/buildah:v1.35.4-immutable
       securityContext:
         capabilities:
           add: ["SETFCAP"]
diff --git a/test/v1alpha1_samples/clusterbuildstrategy_samples.go b/test/v1alpha1_samples/clusterbuildstrategy_samples.go
index c12656f103..0b24575de2 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.0
+      image: quay.io/containers/buildah:v1.35.4-immutable
       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.0
+      image: quay.io/containers/buildah:v1.35.4-immutable
       securityContext:
         capabilities:
           add: ["SETFCAP"]
@@ -91,7 +91,7 @@ spec:
       default: "vfs"
   buildSteps:
     - name: buildah-bud
-      image: quay.io/containers/buildah:v1.35.0
+      image: quay.io/containers/buildah:v1.35.4-immutable
       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.0
+      image: quay.io/containers/buildah:v1.35.4-immutable
       securityContext:
         capabilities:
           add: ["SETFCAP"]
diff --git a/test/v1beta1_samples/buildstrategy_samples.go b/test/v1beta1_samples/buildstrategy_samples.go
index b72093ec4b..8d3a4457a6 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.0
+      image: quay.io/containers/buildah:v1.35.4-immutable
       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.0
+      image: quay.io/containers/buildah:v1.35.4-immutable
       securityContext:
         privileged: true
       command:
@@ -81,7 +81,7 @@ spec:
       emptyDir: {}
   steps:
     - name: buildah-bud
-      image: quay.io/containers/buildah:v1.35.0
+      image: quay.io/containers/buildah:v1.35.4-immutable
       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.0
+      image: quay.io/containers/buildah:v1.35.4-immutable
       securityContext:
         privileged: true
       command:
diff --git a/test/v1beta1_samples/clusterbuildstrategy_samples.go b/test/v1beta1_samples/clusterbuildstrategy_samples.go
index ec793cd65d..2cd587d56c 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.0
+      image: quay.io/containers/buildah:v1.35.4-immutable
       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.0
+      image: quay.io/containers/buildah:v1.35.4-immutable
       securityContext:
         privileged: true
       command:
@@ -77,7 +77,7 @@ spec:
         emptyDir: {}
   steps:
     - name: buildah-bud
-      image: quay.io/containers/buildah:v1.35.0
+      image: quay.io/containers/buildah:v1.35.4-immutable
       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.0
+      image: quay.io/containers/buildah:v1.35.4-immutable
       securityContext:
         privileged: true
       command: