diff --git a/buildah/README.md b/buildah/README.md
index 3559072607..108afdb81d 100644
--- a/buildah/README.md
+++ b/buildah/README.md
@@ -18,7 +18,7 @@ kubectl apply -f https://raw.githubusercontent.com/tektoncd/catalog/master/build
 ### Parameters
 
 * **BUILDER_IMAGE:**: The name of the image containing the Buildah tool. See
-  note below.  (_default:_ quay.io/openshift-pipeline/buildah)
+  note below.  (_default:_ quay.io/buildah/stable)
 * **DOCKERFILE**: The path to the `Dockerfile` to execute (_default:_
   `./Dockerfile`)
 * **TLSVERIFY**: Verify the TLS on the registry endpoint (for push/pull to a
diff --git a/buildah/buildah.yaml b/buildah/buildah.yaml
index 600fcd2242..2c3e6c9446 100644
--- a/buildah/buildah.yaml
+++ b/buildah/buildah.yaml
@@ -7,7 +7,7 @@ spec:
     params:
     - name: BUILDER_IMAGE
       description: The location of the buildah builder image.
-      default: quay.io/openshift-pipeline/buildah
+      default: quay.io/buildah/stable
     - name: DOCKERFILE
       description: Path to the Dockerfile to build.
       default: ./Dockerfile
diff --git a/s2i/s2i.yaml b/s2i/s2i.yaml
index aac83047e5..ec522b4360 100644
--- a/s2i/s2i.yaml
+++ b/s2i/s2i.yaml
@@ -31,7 +31,7 @@ spec:
      - name: gen-source
        mountPath: /gen-source
   - name: build
-    image: quay.io/openshift-pipeline/buildah
+    image: quay.io/buildah/stable
     workingdir: /gen-source
     command: ['buildah', 'bud', '--tls-verify=${inputs.params.TLSVERIFY}', '--layers', '-f', '/gen-source/Dockerfile.gen', '-t', '${outputs.resources.image.url}', '.']
     volumeMounts:
@@ -43,7 +43,7 @@ spec:
       privileged: true
 
   - name: push
-    image: quay.io/openshift-pipeline/buildah
+    image: quay.io/buildah/stable
     command: ['buildah', 'push', '--tls-verify=${inputs.params.TLSVERIFY}', '${outputs.resources.image.url}', 'docker://${outputs.resources.image.url}']
     volumeMounts:
     - name: varlibcontainers