diff --git a/tekton/install-pipelines.sh b/tekton/install-pipelines.sh
index 760f56d2..b3624837 100644
--- a/tekton/install-pipelines.sh
+++ b/tekton/install-pipelines.sh
@@ -15,25 +15,27 @@ if [[ "${KUBECTL_CMD}" == "" ]]; then
 fi
 
 if [[ "${PIPELINE_NAMESPACE}" != "" ]]; then
-  NS="--namespace ${PIPELINE_NAMESPACE}"
+  NS=${PIPELINE_NAMESPACE}
+else
+  NS=default
 fi
 
 echo "Installing Tekton resources ${NS}"
-tkn task delete ${NS} --force git-clone || true
-tkn hub install task ${NS} git-clone
-tkn task delete ${NS} --force git-cli || true
-tkn hub install task ${NS} git-cli
+tkn task delete --namespace ${NS} --force git-clone || true
+tkn hub install task --namespace ${NS} git-clone
+tkn task delete --namespace ${NS} --force git-cli || true
+tkn hub install task --namespace ${NS} git-cli
 
 
 # Install Operator Tasks
-${KUBECTL_CMD} ${NS} apply --filename ${TEKTON_DIR}/task-make.yaml
-${KUBECTL_CMD} ${NS} apply --filename ${TEKTON_DIR}/task-setup-env.yaml
-${KUBECTL_CMD} ${NS} apply --filename ${TEKTON_DIR}/task-buildah.yaml
-${KUBECTL_CMD} ${NS} apply --filename ${TEKTON_DIR}/task-check-image.yaml
-${KUBECTL_CMD} ${NS} apply --filename ${TEKTON_DIR}/task-oci-cli.yaml
+${KUBECTL_CMD} --namespace ${NS} apply --filename ${TEKTON_DIR}/task-make.yaml
+${KUBECTL_CMD} --namespace ${NS} apply --filename ${TEKTON_DIR}/task-setup-env.yaml
+${KUBECTL_CMD} --namespace ${NS} apply --filename ${TEKTON_DIR}/task-buildah.yaml
+${KUBECTL_CMD} --namespace ${NS} apply --filename ${TEKTON_DIR}/task-check-image.yaml
+${KUBECTL_CMD} --namespace ${NS} apply --filename ${TEKTON_DIR}/task-oci-cli.yaml
 
 # Install Operator Pipelines
-${KUBECTL_CMD} ${NS} apply --filename ${TEKTON_DIR}/pipeline-operator-ci.yaml
+${KUBECTL_CMD} --namespace ${NS} apply --filename ${TEKTON_DIR}/pipeline-operator-ci.yaml
 
 # Install Operator test configmap
-${KUBECTL_CMD} ${NS} apply --filename ${TEKTON_DIR}/os-cert-config.yaml
+${KUBECTL_CMD} --namespace ${NS} apply --filename ${TEKTON_DIR}/os-cert-config.yaml
diff --git a/tekton/operator-ci-run.yaml b/tekton/operator-ci-run.yaml
index 0882178b..50efcf99 100644
--- a/tekton/operator-ci-run.yaml
+++ b/tekton/operator-ci-run.yaml
@@ -40,4 +40,6 @@ spec:
       value: "us-phoenix-1"
     - name: oci-cli-secret
       value: oci-cli-secret
+    - name: buildah-image
+      value: 'quay.io/buildah/stable:v1.39.3'
 
diff --git a/tekton/pipeline-operator-ci.yaml b/tekton/pipeline-operator-ci.yaml
index 788cdd70..4ecfebbe 100644
--- a/tekton/pipeline-operator-ci.yaml
+++ b/tekton/pipeline-operator-ci.yaml
@@ -61,6 +61,10 @@ spec:
       type: string
       description: The optional no proxy to use
       default: ''
+    - name: buildah-image
+      type: string
+      description: The Buildah image to use
+      default: 'quay.io/buildah/stable:v1'
   results:
     - name: upload-result
       description: The result of the upload task
@@ -155,6 +159,8 @@ spec:
           value: $(tasks.setup-env.results.BUILDER_IMAGE_NAME)
         - name: BUILD_EXTRA_ARGS
           value: "--build-arg GoArch=$(tasks.setup-env.results.BUILD_ARCH) --build-arg GoVersion=$(tasks.setup-env.results.OPERATOR_GO_VERSION)"
+        - name: BUILDER_IMAGE
+          value: $(params.buildah-image)
         - name: httpProxy
           value: $(params.httpProxy)
         - name: httpsProxy