Repository: tektoncd/operator
Pull request #237 (2021-02-25 12:50:19)

update version with ubi based tags
this update all the clustertasks and the pipeline template
to use tags with ubi based images.

Signed-off-by: Pradeep Kumar <pradkuma@redhat.com>

# Changes

<!-- 🎉🎉🎉 Thank you for the PR!!! 🎉🎉🎉 -->

<!-- Describe your changes here- ideally you can get that description straight from
your descriptive commit message(s)! -->

# Submitter Checklist

These are the criteria that every PR should meet, please check them off as you
review them:

- [ ] Includes [tests](https://github.com/tektoncd/community/blob/master/standards.md#principles) (if functionality changed/added)
- [ ] Includes [docs](https://github.com/tektoncd/community/blob/master/standards.md#principles) (if user facing)
- [ ] Commit messages follow [commit message best practices](https://github.com/tektoncd/community/blob/master/standards.md#commit-messages)

_See [the contribution guide](https://github.com/tektoncd/operator/blob/master/CONTRIBUTING.md) for more details._

# Release Notes

<!--
Describe any user facing changes here, or delete this block.

Examples of user facing changes:
- API changes
- Bug fixes
- Any changes in behavior
- Changes requiring upgrade notices or deprecation warnings

For pull requests with a release note:

```release-note
Your release note here
```

For pull requests that require additional action from users switching to the new release, include the string "action required" (case insensitive) in the release note:

```release-note
action required: your release note here
```

For pull requests that don't need to be mentioned at release time, use the `/release-note-none` Prow command to add the `release-note-none` label to the PR. You can also write the string "NONE" as a release note in your PR description:

```release-note
NONE
```
-->


tekton-robot: [APPROVALNOTIFIER] This PR is **NOT APPROVED**

This pull-request has been approved by:
To complete the [pull request process](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process), please assign **vdemeester**
You can assign the PR to them by writing `/assign @vdemeester` in a comment when ready.

The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=tektoncd%2Foperator).

<details open>
Needs approval from an approver in each of these files:

- **[OWNERS](https://github.com/tektoncd/operator/blob/main/OWNERS)**

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":["vdemeester"]} -->
tekton-robot: @pradeepitm12: The following test **failed**, say `/retest` to rerun them all:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-tekton-operator-build-tests | 02f4b1fc687626dd39eb9159a48a10cb40fcc11f | [link](https://tekton-releases.appspot.com/build/tekton-prow/pr-logs/pull/tektoncd_operator/237/pull-tekton-operator-build-tests/1364920736052940800/) | `/test pull-tekton-operator-build-tests`

[Full PR test history](https://tekton-releases.appspot.com/pr/tektoncd_operator/237). [Your PR dashboard](https://prow.tekton.dev/pr/pradeepitm12).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
tekton-robot: @pradeepitm12: The following test **failed**, say `/retest` to rerun them all:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-tekton-operator-build-tests | 02f4b1fc687626dd39eb9159a48a10cb40fcc11f | [link](https://tekton-releases.appspot.com/build/tekton-prow/pr-logs/pull/tektoncd_operator/237/pull-tekton-operator-build-tests/1364920736052940800/) | `/test pull-tekton-operator-build-tests`

[Full PR test history](https://tekton-releases.appspot.com/pr/tektoncd_operator/237). [Your PR dashboard](https://prow.tekton.dev/pr/pradeepitm12).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
nikhil-thomas: /approve
/lgtm
/meow
tekton-robot: @nikhil-thomas: ![cat image](https://cdn2.thecatapi.com/images/a2r.jpg)

<details>

In response to [this](https://github.com/tektoncd/operator/pull/237#issuecomment-785874029):

>/approve
>/lgtm
>/meow


Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
</details>
tekton-robot: [APPROVALNOTIFIER] This PR is **APPROVED**

This pull-request has been approved by: *<a href="https://github.com/tektoncd/operator/pull/237#issuecomment-785874029" title="LGTM">nikhil-thomas</a>*

The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=tektoncd%2Foperator).

The pull request process is described [here](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process)

<details >
Needs approval from an approver in each of these files:

- ~~[OWNERS](https://github.com/tektoncd/operator/blob/main/OWNERS)~~ [nikhil-thomas]

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":[]} -->
tekton-robot: New changes are detected. LGTM label has been removed.
nikhil-thomas: /lgtm

Patch:
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet-pr/s2i-dotnet-pr-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet-pr/s2i-dotnet-pr-task.yaml
index 0bb760e95..6144511e4 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet-pr/s2i-dotnet-pr-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet-pr/s2i-dotnet-pr-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of .NET imagestream for .NET version
-      default: '3.1'
+      default: '3.1-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet-pr/s2i-dotnet-pr-v0-19-0-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet-pr/s2i-dotnet-pr-v0-19-0-task.yaml
index 9957bc1a0..b7a96a0ac 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet-pr/s2i-dotnet-pr-v0-19-0-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet-pr/s2i-dotnet-pr-v0-19-0-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of .NET imagestream for .NET version
-      default: '3.1'
+      default: '3.1-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet/s2i-dotnet-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet/s2i-dotnet-task.yaml
index f59b623ba..3b0f40694 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet/s2i-dotnet-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet/s2i-dotnet-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of .NET imagestream for .NET version
-      default: '3.1'
+      default: '3.1-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet/s2i-dotnet-v0-19-0-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet/s2i-dotnet-v0-19-0-task.yaml
index 2e3393592..58e391518 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet/s2i-dotnet-v0-19-0-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-dotnet/s2i-dotnet-v0-19-0-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of .NET imagestream for .NET version
-      default: '3.1'
+      default: '3.1-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java-pr/s2i-java-pr-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java-pr/s2i-java-pr-task.yaml
index 72d147e18..0c12bf8e9 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java-pr/s2i-java-pr-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java-pr/s2i-java-pr-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of java imagestream for java version
-      default: '11'
+      default: 'openjdk-11-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java-pr/s2i-java-pr-v0-19-0-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java-pr/s2i-java-pr-v0-19-0-task.yaml
index 9cb76fe5c..70d9ac82f 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java-pr/s2i-java-pr-v0-19-0-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java-pr/s2i-java-pr-v0-19-0-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of java imagestream for java version
-      default: '11'
+      default: 'openjdk-11-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java/s2i-java-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java/s2i-java-task.yaml
index 5cc2484ff..d3697e154 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java/s2i-java-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java/s2i-java-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of java imagestream for java version
-      default: '11'
+      default: 'openjdk-11-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java/s2i-java-v0-19-0-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java/s2i-java-v0-19-0-task.yaml
index ede5501ea..4737311d2 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java/s2i-java-v0-19-0-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-java/s2i-java-v0-19-0-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of java imagestream for java version
-      default: '11'
+      default: 'openjdk-11-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs-pr/s2i-nodejs-pr-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs-pr/s2i-nodejs-pr-task.yaml
index 680b4c7b0..b7492c3ff 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs-pr/s2i-nodejs-pr-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs-pr/s2i-nodejs-pr-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of nodejs imagestream for nodejs version
-      default: '12'
+      default: '12-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs-pr/s2i-nodejs-pr-v0-19-0-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs-pr/s2i-nodejs-pr-v0-19-0-task.yaml
index 37986fc6b..2ff65ea3b 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs-pr/s2i-nodejs-pr-v0-19-0-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs-pr/s2i-nodejs-pr-v0-19-0-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of nodejs imagestream for nodejs version
-      default: '12'
+      default: '12-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs/s2i-nodejs-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs/s2i-nodejs-task.yaml
index 548e725d5..3bed784f7 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs/s2i-nodejs-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs/s2i-nodejs-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of nodejs imagestream for nodejs version
-      default: '12'
+      default: '12-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs/s2i-nodejs-v0-19-0-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs/s2i-nodejs-v0-19-0-task.yaml
index 3ddbe4992..8d2e34b1e 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs/s2i-nodejs-v0-19-0-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-nodejs/s2i-nodejs-v0-19-0-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of nodejs imagestream for nodejs version
-      default: '12'
+      default: '12-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl-pr/s2i-perl-pr-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl-pr/s2i-perl-pr-task.yaml
index ed6ff75f5..68b4c0c19 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl-pr/s2i-perl-pr-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl-pr/s2i-perl-pr-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of perl imagestream for perl version
-      default: '5.30'
+      default: '5.30-el7'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl-pr/s2i-perl-pr-v0-19-0-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl-pr/s2i-perl-pr-v0-19-0-task.yaml
index b66190ef0..089d556ef 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl-pr/s2i-perl-pr-v0-19-0-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl-pr/s2i-perl-pr-v0-19-0-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of perl imagestream for perl version
-      default: '5.30'
+      default: '5.30-el7'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl/s2i-perl-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl/s2i-perl-task.yaml
index 42fae1971..7f0bff908 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl/s2i-perl-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl/s2i-perl-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of perl imagestream for perl version
-      default: '5.30'
+      default: '5.30-el7'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl/s2i-perl-v0-19-0-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl/s2i-perl-v0-19-0-task.yaml
index a3d6f907a..2ea29ab56 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl/s2i-perl-v0-19-0-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-perl/s2i-perl-v0-19-0-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of perl imagestream for perl version
-      default: '5.30'
+      default: '5.30-el7'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php-pr/s2i-php-pr-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php-pr/s2i-php-pr-task.yaml
index 1c3ee89bd..41443895c 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php-pr/s2i-php-pr-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php-pr/s2i-php-pr-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of php imagestream for php version
-      default: '7.3'
+      default: '7.3-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php-pr/s2i-php-pr-v0-19-0-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php-pr/s2i-php-pr-v0-19-0-task.yaml
index 93e16b451..effdd7313 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php-pr/s2i-php-pr-v0-19-0-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php-pr/s2i-php-pr-v0-19-0-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of php imagestream for php version
-      default: '7.3'
+      default: '7.3-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php/s2i-php-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php/s2i-php-task.yaml
index f8678e89d..cfa3151b1 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php/s2i-php-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php/s2i-php-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of php imagestream for php version
-      default: '7.3'
+      default: '7.3-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php/s2i-php-v0-19-0-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php/s2i-php-v0-19-0-task.yaml
index 73f4b968f..5ab7e24b5 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php/s2i-php-v0-19-0-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-php/s2i-php-v0-19-0-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of php imagestream for php version
-      default: '7.3'
+      default: '7.3-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python-pr/s2i-python-pr-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python-pr/s2i-python-pr-task.yaml
index 427641df0..db5b9b1f2 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python-pr/s2i-python-pr-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python-pr/s2i-python-pr-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of python imagestream for python version
-      default: '3.8'
+      default: '3.8-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python-pr/s2i-python-pr-v0-19-0-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python-pr/s2i-python-pr-v0-19-0-task.yaml
index 2f40dbbd6..437d70b83 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python-pr/s2i-python-pr-v0-19-0-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python-pr/s2i-python-pr-v0-19-0-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of python imagestream for python version
-      default: '3.8'
+      default: '3.8-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python/s2i-python-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python/s2i-python-task.yaml
index 1943cb5fd..258207b7d 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python/s2i-python-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python/s2i-python-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of python imagestream for python version
-      default: '3.8'
+      default: '3.8-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python/s2i-python-v0-19-0-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python/s2i-python-v0-19-0-task.yaml
index 109c7ce18..da6a4a9d4 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python/s2i-python-v0-19-0-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-python/s2i-python-v0-19-0-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of python imagestream for python version
-      default: '3.8'
+      default: '3.8-ubi8'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby-pr/s2i-ruby-pr-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby-pr/s2i-ruby-pr-task.yaml
index b639c28a9..72f2dcbb3 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby-pr/s2i-ruby-pr-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby-pr/s2i-ruby-pr-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of ruby imagestream for ruby version
-      default: '2.7'
+      default: '2.7-ubi7'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby-pr/s2i-ruby-pr-v0-19-0-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby-pr/s2i-ruby-pr-v0-19-0-task.yaml
index 1d523fd3f..fb0eac429 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby-pr/s2i-ruby-pr-v0-19-0-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby-pr/s2i-ruby-pr-v0-19-0-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of ruby imagestream for ruby version
-      default: '2.7'
+      default: '2.7-ubi7'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby/s2i-ruby-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby/s2i-ruby-task.yaml
index c0822b086..0b3ecef23 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby/s2i-ruby-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby/s2i-ruby-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of ruby imagestream for ruby version
-      default: '2.7'
+      default: '2.7-ubi7'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby/s2i-ruby-v0-19-0-task.yaml b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby/s2i-ruby-v0-19-0-task.yaml
index e588d299f..f4e646130 100644
--- a/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby/s2i-ruby-v0-19-0-task.yaml
+++ b/cmd/openshift/kodata/tekton-addon/0.0.1/addons/02-clustertasks/s2i-ruby/s2i-ruby-v0-19-0-task.yaml
@@ -21,7 +21,7 @@ spec:
   params:
     - name: VERSION
       description: The tag of ruby imagestream for ruby version
-      default: '2.7'
+      default: '2.7-ubi7'
       type: string
     - name: PATH_CONTEXT
       description: The location of the path to run s2i from.
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/pipelinetemplates.go b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/pipelinetemplates.go
index 761c2b81b..397344f4d 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/pipelinetemplates.go
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/pipelinetemplates.go
@@ -35,10 +35,9 @@ type pipeline struct {
 }
 
 type RuntimeSpec struct {
-	Runtime      string
-	Version      string
-	MinorVersion string
-	Default      string
+	Runtime string
+	Version string
+	Default string
 }
 
 const (
@@ -50,14 +49,14 @@ const (
 
 var (
 	Runtimes = map[string]RuntimeSpec{
-		"s2i-dotnet": {Runtime: "dotnet", Version: "$(params.VERSION)", Default: "3.1"},
+		"s2i-dotnet": {Runtime: "dotnet", Version: "$(params.VERSION)", Default: "3.1-ubi8"},
 		"s2i-go":     {Runtime: "golang", Version: "$(params.VERSION)", Default: "1.13.4-ubi8"},
-		"s2i-java":   {Runtime: "java", Version: "$(params.VERSION)", Default: "11"},
-		"s2i-nodejs": {Runtime: "nodejs", Version: "$(params.VERSION)", Default: "12"},
-		"s2i-perl":   {Runtime: "perl", Version: "$(params.VERSION)", Default: "5.30"},
-		"s2i-php":    {Runtime: "php", Version: "$(params.VERSION)", Default: "7.3"},
-		"s2i-python": {Runtime: "python", Version: "$(params.VERSION)", Default: "3.8"},
-		"s2i-ruby":   {Runtime: "ruby", Version: "$(params.VERSION)", Default: "2.7"},
+		"s2i-java":   {Runtime: "java", Version: "$(params.VERSION)", Default: "openjdk-11-ubi8"},
+		"s2i-nodejs": {Runtime: "nodejs", Version: "$(params.VERSION)", Default: "12-ubi8"},
+		"s2i-perl":   {Runtime: "perl", Version: "$(params.VERSION)", Default: "5.30-el7"},
+		"s2i-php":    {Runtime: "php", Version: "$(params.VERSION)", Default: "7.3-ubi8"},
+		"s2i-python": {Runtime: "python", Version: "$(params.VERSION)", Default: "3.8-ubi8"},
+		"s2i-ruby":   {Runtime: "ruby", Version: "$(params.VERSION)", Default: "2.7-ubi7"},
 		"buildah":    {},
 	}
 )


Test patch:
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-deployment-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-deployment-pr.golden
index 34b14a8e3..ddefd9a14 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-deployment-pr.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-deployment-pr.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"dotnet","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-dotnet-deployment-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.1","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-dotnet-pr"}},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"dotnet","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-dotnet-deployment-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.1-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-dotnet-pr"}},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-deployment.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-deployment.golden
index 5c9b4e205..b0f9d23f0 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-deployment.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-deployment.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"dotnet","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-dotnet-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.1","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-dotnet"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"dotnet","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-dotnet-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.1-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-dotnet"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-knative-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-knative-pr.golden
index 9f02148ce..8987d5c88 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-knative-pr.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-knative-pr.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"dotnet","pipeline.openshift.io/type":"knative"},"name":"s2i-dotnet-knative-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.1","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-dotnet-pr"}},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(resources.inputs.image.url)","--force"]}],"resources":{"inputs":[{"from":["build"],"name":"image","resource":"app-image"}]},"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"dotnet","pipeline.openshift.io/type":"knative"},"name":"s2i-dotnet-knative-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.1-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-dotnet-pr"}},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(resources.inputs.image.url)","--force"]}],"resources":{"inputs":[{"from":["build"],"name":"image","resource":"app-image"}]},"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-knative.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-knative.golden
index 495bcd067..9fe511874 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-knative.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-knative.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"dotnet","pipeline.openshift.io/type":"knative"},"name":"s2i-dotnet-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.1","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-dotnet"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"dotnet","pipeline.openshift.io/type":"knative"},"name":"s2i-dotnet-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.1-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-dotnet"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-pr.golden
index f1c78c997..742e911d9 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-pr.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet-pr.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"dotnet","pipeline.openshift.io/type":"openshift"},"name":"s2i-dotnet-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.1","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-dotnet-pr"}},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"dotnet","pipeline.openshift.io/type":"openshift"},"name":"s2i-dotnet-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.1-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-dotnet-pr"}},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet.golden
index e8f048a32..a49d21581 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-dotnet.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"dotnet","pipeline.openshift.io/type":"openshift"},"name":"s2i-dotnet","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.1","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-dotnet"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"dotnet","pipeline.openshift.io/type":"openshift"},"name":"s2i-dotnet","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.1-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-dotnet"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-deployment-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-deployment-pr.golden
index aa370254a..d096d0391 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-deployment-pr.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-deployment-pr.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"java","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-java-deployment-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"11","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-java-pr"}},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"java","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-java-deployment-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"openjdk-11-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-java-pr"}},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-deployment.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-deployment.golden
index 432c4fcef..8ee0468d7 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-deployment.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-deployment.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"java","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-java-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"11","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-java"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"java","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-java-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"openjdk-11-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-java"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-knative-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-knative-pr.golden
index b202463b4..239b9d394 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-knative-pr.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-knative-pr.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"java","pipeline.openshift.io/type":"knative"},"name":"s2i-java-knative-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"11","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-java-pr"}},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(resources.inputs.image.url)","--force"]}],"resources":{"inputs":[{"from":["build"],"name":"image","resource":"app-image"}]},"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"java","pipeline.openshift.io/type":"knative"},"name":"s2i-java-knative-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"openjdk-11-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-java-pr"}},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(resources.inputs.image.url)","--force"]}],"resources":{"inputs":[{"from":["build"],"name":"image","resource":"app-image"}]},"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-knative.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-knative.golden
index e0096f6de..64da1211d 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-knative.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-knative.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"java","pipeline.openshift.io/type":"knative"},"name":"s2i-java-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"11","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-java"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"java","pipeline.openshift.io/type":"knative"},"name":"s2i-java-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"openjdk-11-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-java"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-pr.golden
index 6b6e58096..cb089f2a2 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-pr.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java-pr.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"java","pipeline.openshift.io/type":"openshift"},"name":"s2i-java-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"11","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-java-pr"}},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"java","pipeline.openshift.io/type":"openshift"},"name":"s2i-java-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"openjdk-11-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-java-pr"}},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java.golden
index d20ca7476..512401c20 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-java.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"java","pipeline.openshift.io/type":"openshift"},"name":"s2i-java","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"11","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-java"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"java","pipeline.openshift.io/type":"openshift"},"name":"s2i-java","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"openjdk-11-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-java"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-deployment-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-deployment-pr.golden
index 4155b93ba..72edb0a7b 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-deployment-pr.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-deployment-pr.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"nodejs","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-nodejs-deployment-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"12","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-nodejs-pr"}},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"nodejs","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-nodejs-deployment-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"12-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-nodejs-pr"}},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-deployment.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-deployment.golden
index ad81ed9c2..ebe16e0fd 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-deployment.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-deployment.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"nodejs","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-nodejs-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"12","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-nodejs"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"nodejs","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-nodejs-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"12-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-nodejs"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-knative-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-knative-pr.golden
index 90940cab7..5a359cb7f 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-knative-pr.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-knative-pr.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"nodejs","pipeline.openshift.io/type":"knative"},"name":"s2i-nodejs-knative-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"12","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-nodejs-pr"}},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(resources.inputs.image.url)","--force"]}],"resources":{"inputs":[{"from":["build"],"name":"image","resource":"app-image"}]},"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"nodejs","pipeline.openshift.io/type":"knative"},"name":"s2i-nodejs-knative-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"12-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-nodejs-pr"}},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(resources.inputs.image.url)","--force"]}],"resources":{"inputs":[{"from":["build"],"name":"image","resource":"app-image"}]},"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-knative.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-knative.golden
index 806d241d1..220cceec9 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-knative.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-knative.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"nodejs","pipeline.openshift.io/type":"knative"},"name":"s2i-nodejs-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"12","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-nodejs"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"nodejs","pipeline.openshift.io/type":"knative"},"name":"s2i-nodejs-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"12-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-nodejs"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-pr.golden
index 23f90bf20..808c7d49d 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-pr.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs-pr.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"nodejs","pipeline.openshift.io/type":"openshift"},"name":"s2i-nodejs-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"12","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-nodejs-pr"}},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"nodejs","pipeline.openshift.io/type":"openshift"},"name":"s2i-nodejs-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"12-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-nodejs-pr"}},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs.golden
index 02d34e621..d1b3b646c 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-nodejs.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"nodejs","pipeline.openshift.io/type":"openshift"},"name":"s2i-nodejs","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"12","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-nodejs"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"nodejs","pipeline.openshift.io/type":"openshift"},"name":"s2i-nodejs","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"12-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-nodejs"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-deployment-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-deployment-pr.golden
index 4f2c8d7ba..cfac51057 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-deployment-pr.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-deployment-pr.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"perl","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-perl-deployment-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"5.30","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-perl-pr"}},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"perl","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-perl-deployment-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"5.30-el7","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-perl-pr"}},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-deployment.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-deployment.golden
index 41f904b9a..0c2dd3d80 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-deployment.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-deployment.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"perl","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-perl-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"5.30","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-perl"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"perl","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-perl-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"5.30-el7","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-perl"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-knative-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-knative-pr.golden
index 206c50ba5..4a0c0ce52 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-knative-pr.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-knative-pr.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"perl","pipeline.openshift.io/type":"knative"},"name":"s2i-perl-knative-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"5.30","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-perl-pr"}},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(resources.inputs.image.url)","--force"]}],"resources":{"inputs":[{"from":["build"],"name":"image","resource":"app-image"}]},"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"perl","pipeline.openshift.io/type":"knative"},"name":"s2i-perl-knative-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"5.30-el7","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-perl-pr"}},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(resources.inputs.image.url)","--force"]}],"resources":{"inputs":[{"from":["build"],"name":"image","resource":"app-image"}]},"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-knative.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-knative.golden
index d80df0f22..ce64d2ba2 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-knative.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-knative.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"perl","pipeline.openshift.io/type":"knative"},"name":"s2i-perl-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"5.30","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-perl"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"perl","pipeline.openshift.io/type":"knative"},"name":"s2i-perl-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"5.30-el7","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-perl"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-pr.golden
index a0abbafe2..e23bed791 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-pr.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl-pr.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"perl","pipeline.openshift.io/type":"openshift"},"name":"s2i-perl-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"5.30","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-perl-pr"}},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"perl","pipeline.openshift.io/type":"openshift"},"name":"s2i-perl-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"5.30-el7","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-perl-pr"}},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl.golden
index f0db161e5..1af20f128 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-perl.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"perl","pipeline.openshift.io/type":"openshift"},"name":"s2i-perl","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"5.30","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-perl"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"perl","pipeline.openshift.io/type":"openshift"},"name":"s2i-perl","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"5.30-el7","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-perl"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-deployment-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-deployment-pr.golden
index 1f0afdb8c..c0b18281c 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-deployment-pr.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-deployment-pr.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"php","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-php-deployment-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"7.3","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-php-pr"}},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"php","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-php-deployment-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"7.3-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-php-pr"}},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-deployment.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-deployment.golden
index 413f44b39..b7eb000fd 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-deployment.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-deployment.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"php","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-php-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"7.3","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-php"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"php","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-php-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"7.3-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-php"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-knative-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-knative-pr.golden
index 02ce36b4d..2ac4ab58d 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-knative-pr.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-knative-pr.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"php","pipeline.openshift.io/type":"knative"},"name":"s2i-php-knative-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"7.3","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-php-pr"}},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(resources.inputs.image.url)","--force"]}],"resources":{"inputs":[{"from":["build"],"name":"image","resource":"app-image"}]},"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"php","pipeline.openshift.io/type":"knative"},"name":"s2i-php-knative-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"7.3-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-php-pr"}},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(resources.inputs.image.url)","--force"]}],"resources":{"inputs":[{"from":["build"],"name":"image","resource":"app-image"}]},"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-knative.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-knative.golden
index 27ec1bf20..cd4e0073b 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-knative.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-knative.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"php","pipeline.openshift.io/type":"knative"},"name":"s2i-php-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"7.3","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-php"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"php","pipeline.openshift.io/type":"knative"},"name":"s2i-php-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"7.3-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-php"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-pr.golden
index 010377df7..00480a801 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-pr.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php-pr.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"php","pipeline.openshift.io/type":"openshift"},"name":"s2i-php-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"7.3","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-php-pr"}},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"php","pipeline.openshift.io/type":"openshift"},"name":"s2i-php-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"7.3-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-php-pr"}},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php.golden
index ec30f35e5..68d162ba5 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-php.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"php","pipeline.openshift.io/type":"openshift"},"name":"s2i-php","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"7.3","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-php"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"php","pipeline.openshift.io/type":"openshift"},"name":"s2i-php","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"7.3-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-php"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-deployment-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-deployment-pr.golden
index 46b475ac8..2960acb42 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-deployment-pr.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-deployment-pr.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"python","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-python-deployment-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-python-pr"}},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"python","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-python-deployment-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.8-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-python-pr"}},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-deployment.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-deployment.golden
index d6073ed4e..502c33c66 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-deployment.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-deployment.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"python","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-python-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-python"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"python","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-python-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.8-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-python"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-knative-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-knative-pr.golden
index b75e28959..de953f944 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-knative-pr.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-knative-pr.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"python","pipeline.openshift.io/type":"knative"},"name":"s2i-python-knative-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-python-pr"}},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(resources.inputs.image.url)","--force"]}],"resources":{"inputs":[{"from":["build"],"name":"image","resource":"app-image"}]},"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"python","pipeline.openshift.io/type":"knative"},"name":"s2i-python-knative-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.8-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-python-pr"}},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(resources.inputs.image.url)","--force"]}],"resources":{"inputs":[{"from":["build"],"name":"image","resource":"app-image"}]},"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-knative.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-knative.golden
index da90d85e9..e6abfc131 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-knative.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-knative.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"python","pipeline.openshift.io/type":"knative"},"name":"s2i-python-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-python"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"python","pipeline.openshift.io/type":"knative"},"name":"s2i-python-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.8-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-python"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-pr.golden
index 9606dba72..896f3a681 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-pr.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python-pr.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"python","pipeline.openshift.io/type":"openshift"},"name":"s2i-python-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-python-pr"}},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"python","pipeline.openshift.io/type":"openshift"},"name":"s2i-python-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.8-ubi8","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-python-pr"}},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python.golden
index b22bd8f35..fc46dbc7c 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-python.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"python","pipeline.openshift.io/type":"openshift"},"name":"s2i-python","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-python"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"python","pipeline.openshift.io/type":"openshift"},"name":"s2i-python","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"3.8-ubi8","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-python"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-deployment-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-deployment-pr.golden
index b966d8d86..2247d8ef5 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-deployment-pr.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-deployment-pr.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"ruby","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-ruby-deployment-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"2.7","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-ruby-pr"}},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"ruby","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-ruby-deployment-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"2.7-ubi7","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-ruby-pr"}},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-deployment.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-deployment.golden
index 1059be266..f196aa74b 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-deployment.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-deployment.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"ruby","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-ruby-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"2.7","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-ruby"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"ruby","pipeline.openshift.io/type":"kubernetes"},"name":"s2i-ruby-deployment","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"2.7-ubi7","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-ruby"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"SCRIPT","value":"kubectl $@"},{"name":"ARGS","value":["rollout","status","deploy/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-knative-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-knative-pr.golden
index ff4de8cfb..b3097a6c7 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-knative-pr.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-knative-pr.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"ruby","pipeline.openshift.io/type":"knative"},"name":"s2i-ruby-knative-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"2.7","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-ruby-pr"}},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(resources.inputs.image.url)","--force"]}],"resources":{"inputs":[{"from":["build"],"name":"image","resource":"app-image"}]},"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"ruby","pipeline.openshift.io/type":"knative"},"name":"s2i-ruby-knative-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"2.7-ubi7","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-ruby-pr"}},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(resources.inputs.image.url)","--force"]}],"resources":{"inputs":[{"from":["build"],"name":"image","resource":"app-image"}]},"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-knative.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-knative.golden
index d309bbba5..73c5860bc 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-knative.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-knative.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"ruby","pipeline.openshift.io/type":"knative"},"name":"s2i-ruby-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"2.7","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-ruby"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"ruby","pipeline.openshift.io/type":"knative"},"name":"s2i-ruby-knative","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"2.7-ubi7","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-ruby"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"kn-service-create","params":[{"name":"ARGS","value":["service","create","$(params.APP_NAME)","--image=$(params.IMAGE_NAME)","--force"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"kn"}}],"workspaces":[{"name":"workspace"}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-pr.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-pr.golden
index 055532756..0c352e62e 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-pr.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby-pr.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"ruby","pipeline.openshift.io/type":"openshift"},"name":"s2i-ruby-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"2.7","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-ruby-pr"}},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"ruby","pipeline.openshift.io/type":"openshift"},"name":"s2i-ruby-pr","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"2.7-ubi7","name":"VERSION","type":"string"}],"resources":[{"name":"app-source","type":"git"},{"name":"app-image","type":"image"}],"tasks":[{"name":"build","params":[{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"resources":{"inputs":[{"name":"source","resource":"app-source"}],"outputs":[{"name":"image","resource":"app-image"}]},"taskRef":{"kind":"ClusterTask","name":"s2i-ruby-pr"}},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}]}}
diff --git a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby.golden b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby.golden
index 821f293fa..85282647e 100644
--- a/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby.golden
+++ b/pkg/reconciler/openshift/tektonaddon/pipelinetemplates/testdata/s2i-ruby.golden
@@ -1,1 +1,1 @@
-{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"ruby","pipeline.openshift.io/type":"openshift"},"name":"s2i-ruby","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"2.7","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-ruby"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}
+{"apiVersion":"tekton.dev/v1beta1","kind":"Pipeline","metadata":{"annotations":{"operator.tekton.dev/preserve-namespace":"true"},"labels":{"pipeline.openshift.io/runtime":"ruby","pipeline.openshift.io/type":"openshift"},"name":"s2i-ruby","namespace":"openshift"},"spec":{"params":[{"name":"APP_NAME","type":"string"},{"name":"GIT_REPO","type":"string"},{"name":"GIT_REVISION","type":"string"},{"name":"IMAGE_NAME","type":"string"},{"default":".","name":"PATH_CONTEXT","type":"string"},{"default":"2.7-ubi7","name":"VERSION","type":"string"}],"tasks":[{"name":"fetch-repository","params":[{"name":"url","value":"$(params.GIT_REPO)"},{"name":"revision","value":"$(params.GIT_REVISION)"},{"name":"subdirectory","value":""},{"name":"deleteExisting","value":"true"}],"taskRef":{"kind":"ClusterTask","name":"git-clone"},"workspaces":[{"name":"output","workspace":"workspace"}]},{"name":"build","params":[{"name":"IMAGE","value":"$(params.IMAGE_NAME)"},{"name":"TLSVERIFY","value":"false"},{"name":"PATH_CONTEXT","value":"$(params.PATH_CONTEXT)"},{"name":"VERSION","value":"$(params.VERSION)"}],"runAfter":["fetch-repository"],"taskRef":{"kind":"ClusterTask","name":"s2i-ruby"},"workspaces":[{"name":"source","workspace":"workspace"}]},{"name":"deploy","params":[{"name":"ARGS","value":["rollout","status","dc/$(params.APP_NAME)"]}],"runAfter":["build"],"taskRef":{"kind":"ClusterTask","name":"openshift-client"}}],"workspaces":[{"name":"workspace"}]}}