diff --git a/docs/gitops/README.md b/docs/gitops/README.md
index 6053a426..7d860236 100644
--- a/docs/gitops/README.md
+++ b/docs/gitops/README.md
@@ -40,6 +40,19 @@ You can use the Janus IDP Demo repository to install the `Red Hat OpenShift Pipe
 
 The OpenShift Pipelines Operator can be installed directly from the OperatorHub. Select the operator from the list and install it without any special configuration.
 
+Make sure you install an OpenShift Pipelines Operator's version compatible with your Orchestrator Operator's version:
+
+| OpenShift Pipelines Operator version          |  Orchestrator Operator Version |
+|-----------------------------------------------|--------------------------------|
+| 4.11                                          |1.3.x                           |
+| 4.12                                          |1.3.x                           |
+| 4.13                                          |1.3.x                           |
+| 4.14                                          |1.3.x                           |
+| 4.15                                          |1.3.x                           |
+| 4.16                                          |1.3.x                           |
+| 4.17                                          |1.4.x                           |
+
+
 ### Install OpenShift GitOps Operator
 
 To install the OpenShift GitOps Operator with custom configuration:
diff --git a/helm-charts/orchestrator/templates/tekton-pipeline.yaml b/helm-charts/orchestrator/templates/tekton-pipeline.yaml
index 20f34dde..4a66d0ae 100644
--- a/helm-charts/orchestrator/templates/tekton-pipeline.yaml
+++ b/helm-charts/orchestrator/templates/tekton-pipeline.yaml
@@ -115,8 +115,14 @@ spec:
     - name: build-and-push-image
       runAfter: ["flatten-workflow"]
       taskRef:
-        name: buildah
-        kind: ClusterTask
+        resolver: cluster
+        params:
+        - name: kind
+          value: task
+        - name: name
+          value: buildah
+        - name: namespace
+          value: openshift-pipelines
       workspaces:
         - name: source
           workspace: workflow-source
@@ -130,7 +136,7 @@ spec:
         - name: CONTEXT
           value: flat/$(params.workflowId)
         - name: BUILD_EXTRA_ARGS
-          value: '--authfile=/workspace/dockerconfig/.dockerconfigjson --ulimit nofile=4096:4096 --build-arg WF_RESOURCES="." '
+          value: '--authfile=/workspace/dockerconfig/.dockerconfigjson --ulimit nofile=4096:4096 --build-arg WF_RESOURCES=. '
     - name: push-workflow-gitops
       runAfter: ["build-gitops", "build-and-push-image"]
       taskRef: