diff --git a/.tekton/exhort-pull-request.yaml b/.tekton/exhort-pull-request.yaml
index c8e17fc1..9db38667 100644
--- a/.tekton/exhort-pull-request.yaml
+++ b/.tekton/exhort-pull-request.yaml
@@ -6,6 +6,7 @@ metadata:
     build.appstudio.redhat.com/commit_sha: '{{revision}}'
     build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
+    pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
     pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main" && ( ".tekton/exhort-pull-request.yaml".pathChanged() || "ui/*".pathChanged() || "src/*".pathChanged() || "api-spec/*".pathChanged() || "pom.xml".pathChanged() ) && !( event_title.contains("[skip ci]") || event_title.contains("[ci skip]") )
   creationTimestamp: null
@@ -22,7 +23,7 @@ spec:
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/trusted-content-tenant/exhort/exhort:on-pr-{{revision}}
+    value: quay.io/redhat-user-workloads/trusted-content-tenant/exhort:on-pr-{{revision}}
   - name: image-expires-after
     value: 5d
   - name: dockerfile
diff --git a/.tekton/exhort-push.yaml b/.tekton/exhort-push.yaml
index 391ed766..41cddd32 100644
--- a/.tekton/exhort-push.yaml
+++ b/.tekton/exhort-push.yaml
@@ -5,9 +5,10 @@ metadata:
     build.appstudio.openshift.io/repo: https://github.com/trustification/exhort?rev={{revision}}
     build.appstudio.redhat.com/commit_sha: '{{revision}}'
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
+    pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-event: '[push]'
-    pipelinesascode.tekton.dev/on-target-branch: '[main]'
+    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
+      == "main"
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: exhort
@@ -22,7 +23,7 @@ spec:
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/redhat-user-workloads/trusted-content-tenant/exhort/exhort:{{revision}}
+    value: quay.io/redhat-user-workloads/trusted-content-tenant/exhort:{{revision}}
   - name: dockerfile
     value: src/main/docker/Dockerfile.jvm.staged
   - name: path-context
diff --git a/.tekton/openjdk-redis-6gb.yaml b/.tekton/openjdk-redis-6gb.yaml
index 716569be..e6b3d853 100644
--- a/.tekton/openjdk-redis-6gb.yaml
+++ b/.tekton/openjdk-redis-6gb.yaml
@@ -15,13 +15,18 @@ spec:
   params:
   - name: JDK_IMAGE
     description: Reference of the image buildah will produce.
-    default: registry.redhat.io/ubi9/openjdk-21:1.18
+    default: registry.redhat.io/ubi9/openjdk-21:1.22
   - name: REDIS_IMAGE
     description: The location of the buildah builder image.
     default: docker.io/redis/redis-stack:7.2.0-v7
   - name: SCRIPT
     description: The script to execute in the jdk image
     default: |
+      echo "Java version:"
+      java -version
+      echo "Maven version:"
+      mvn --version
+      echo "Running mvn verify..."
       mvn -B verify
   workspaces:
   - name: source