diff --git a/.tekton/kn-eventing-apiserver-receive-adapter-115-pull-request.yaml b/.tekton/kn-eventing-apiserver-receive-adapter-115-pull-request.yaml
index 53986c0b698..3744d1d499f 100755
--- a/.tekton/kn-eventing-apiserver-receive-adapter-115-pull-request.yaml
+++ b/.tekton/kn-eventing-apiserver-receive-adapter-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-apiserver-receive-adapter-115-push.yaml b/.tekton/kn-eventing-apiserver-receive-adapter-115-push.yaml
index 0ed96d4fc5c..90356bdb0ed 100755
--- a/.tekton/kn-eventing-apiserver-receive-adapter-115-push.yaml
+++ b/.tekton/kn-eventing-apiserver-receive-adapter-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-appender-115-pull-request.yaml b/.tekton/kn-eventing-appender-115-pull-request.yaml
index 1e761d5903d..350590aa800 100755
--- a/.tekton/kn-eventing-appender-115-pull-request.yaml
+++ b/.tekton/kn-eventing-appender-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-appender-115-push.yaml b/.tekton/kn-eventing-appender-115-push.yaml
index 6ce6c6f1769..33875baca5e 100755
--- a/.tekton/kn-eventing-appender-115-push.yaml
+++ b/.tekton/kn-eventing-appender-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-channel-controller-115-pull-request.yaml b/.tekton/kn-eventing-channel-controller-115-pull-request.yaml
index 5f6ed3d72af..94d34d93957 100755
--- a/.tekton/kn-eventing-channel-controller-115-pull-request.yaml
+++ b/.tekton/kn-eventing-channel-controller-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-channel-controller-115-push.yaml b/.tekton/kn-eventing-channel-controller-115-push.yaml
index 477d1f32d6f..5e91eb22c93 100755
--- a/.tekton/kn-eventing-channel-controller-115-push.yaml
+++ b/.tekton/kn-eventing-channel-controller-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-channel-dispatcher-115-pull-request.yaml b/.tekton/kn-eventing-channel-dispatcher-115-pull-request.yaml
index 2f1461c0322..951af3f5f54 100755
--- a/.tekton/kn-eventing-channel-dispatcher-115-pull-request.yaml
+++ b/.tekton/kn-eventing-channel-dispatcher-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-channel-dispatcher-115-push.yaml b/.tekton/kn-eventing-channel-dispatcher-115-push.yaml
index e12aa0e08cf..4ba185ccae0 100755
--- a/.tekton/kn-eventing-channel-dispatcher-115-push.yaml
+++ b/.tekton/kn-eventing-channel-dispatcher-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-controller-115-pull-request.yaml b/.tekton/kn-eventing-controller-115-pull-request.yaml
index 1c8ca69ce2d..3e64cd9efa7 100755
--- a/.tekton/kn-eventing-controller-115-pull-request.yaml
+++ b/.tekton/kn-eventing-controller-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-controller-115-push.yaml b/.tekton/kn-eventing-controller-115-push.yaml
index 66e38add287..cd4146e68de 100755
--- a/.tekton/kn-eventing-controller-115-push.yaml
+++ b/.tekton/kn-eventing-controller-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-event-display-115-pull-request.yaml b/.tekton/kn-eventing-event-display-115-pull-request.yaml
index d4d3f645c34..d6a0e2dedae 100755
--- a/.tekton/kn-eventing-event-display-115-pull-request.yaml
+++ b/.tekton/kn-eventing-event-display-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-event-display-115-push.yaml b/.tekton/kn-eventing-event-display-115-push.yaml
index 5a6a054ab5c..ad1c354da65 100755
--- a/.tekton/kn-eventing-event-display-115-push.yaml
+++ b/.tekton/kn-eventing-event-display-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-filter-115-pull-request.yaml b/.tekton/kn-eventing-filter-115-pull-request.yaml
index 181e1d37a82..205fd3c03e0 100755
--- a/.tekton/kn-eventing-filter-115-pull-request.yaml
+++ b/.tekton/kn-eventing-filter-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-filter-115-push.yaml b/.tekton/kn-eventing-filter-115-push.yaml
index cf44cc90b37..cb0de2bc018 100755
--- a/.tekton/kn-eventing-filter-115-push.yaml
+++ b/.tekton/kn-eventing-filter-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-heartbeats-115-pull-request.yaml b/.tekton/kn-eventing-heartbeats-115-pull-request.yaml
index 5b0fb6cf49c..72b942ed7b5 100755
--- a/.tekton/kn-eventing-heartbeats-115-pull-request.yaml
+++ b/.tekton/kn-eventing-heartbeats-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-heartbeats-115-push.yaml b/.tekton/kn-eventing-heartbeats-115-push.yaml
index 503e95a0ffe..eb28d1a4337 100755
--- a/.tekton/kn-eventing-heartbeats-115-push.yaml
+++ b/.tekton/kn-eventing-heartbeats-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-heartbeats-receiver-115-pull-request.yaml b/.tekton/kn-eventing-heartbeats-receiver-115-pull-request.yaml
index 999d6b2f933..6f6a94c753a 100755
--- a/.tekton/kn-eventing-heartbeats-receiver-115-pull-request.yaml
+++ b/.tekton/kn-eventing-heartbeats-receiver-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-heartbeats-receiver-115-push.yaml b/.tekton/kn-eventing-heartbeats-receiver-115-push.yaml
index 94b6339f84a..b354950b92d 100755
--- a/.tekton/kn-eventing-heartbeats-receiver-115-push.yaml
+++ b/.tekton/kn-eventing-heartbeats-receiver-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-ingress-115-pull-request.yaml b/.tekton/kn-eventing-ingress-115-pull-request.yaml
index aa0b7d60795..7ef522b668a 100755
--- a/.tekton/kn-eventing-ingress-115-pull-request.yaml
+++ b/.tekton/kn-eventing-ingress-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-ingress-115-push.yaml b/.tekton/kn-eventing-ingress-115-push.yaml
index b193a024638..8b8912f812b 100755
--- a/.tekton/kn-eventing-ingress-115-push.yaml
+++ b/.tekton/kn-eventing-ingress-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-jobsink-115-pull-request.yaml b/.tekton/kn-eventing-jobsink-115-pull-request.yaml
index 4de30dfd27a..fefae03f830 100755
--- a/.tekton/kn-eventing-jobsink-115-pull-request.yaml
+++ b/.tekton/kn-eventing-jobsink-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-jobsink-115-push.yaml b/.tekton/kn-eventing-jobsink-115-push.yaml
index 41c884c6f53..73cfb3990d3 100755
--- a/.tekton/kn-eventing-jobsink-115-push.yaml
+++ b/.tekton/kn-eventing-jobsink-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-migrate-115-pull-request.yaml b/.tekton/kn-eventing-migrate-115-pull-request.yaml
index 329b5261875..636f3882e76 100755
--- a/.tekton/kn-eventing-migrate-115-pull-request.yaml
+++ b/.tekton/kn-eventing-migrate-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-migrate-115-push.yaml b/.tekton/kn-eventing-migrate-115-push.yaml
index 2ac36f1d2c4..6d7b380d299 100755
--- a/.tekton/kn-eventing-migrate-115-push.yaml
+++ b/.tekton/kn-eventing-migrate-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-mtchannel-broker-115-pull-request.yaml b/.tekton/kn-eventing-mtchannel-broker-115-pull-request.yaml
index 299efb334a5..a708bc8cb48 100755
--- a/.tekton/kn-eventing-mtchannel-broker-115-pull-request.yaml
+++ b/.tekton/kn-eventing-mtchannel-broker-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-mtchannel-broker-115-push.yaml b/.tekton/kn-eventing-mtchannel-broker-115-push.yaml
index e23173755c6..abcf4a7a942 100755
--- a/.tekton/kn-eventing-mtchannel-broker-115-push.yaml
+++ b/.tekton/kn-eventing-mtchannel-broker-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-mtping-115-pull-request.yaml b/.tekton/kn-eventing-mtping-115-pull-request.yaml
index 5117957d8a5..f414712dd9f 100755
--- a/.tekton/kn-eventing-mtping-115-pull-request.yaml
+++ b/.tekton/kn-eventing-mtping-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-mtping-115-push.yaml b/.tekton/kn-eventing-mtping-115-push.yaml
index 49e72810d56..27ebcb862d2 100755
--- a/.tekton/kn-eventing-mtping-115-push.yaml
+++ b/.tekton/kn-eventing-mtping-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-pong-115-pull-request.yaml b/.tekton/kn-eventing-pong-115-pull-request.yaml
index c2a06b33b27..839915e7f34 100755
--- a/.tekton/kn-eventing-pong-115-pull-request.yaml
+++ b/.tekton/kn-eventing-pong-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-pong-115-push.yaml b/.tekton/kn-eventing-pong-115-push.yaml
index a751d9e3da0..c760fb0c277 100755
--- a/.tekton/kn-eventing-pong-115-push.yaml
+++ b/.tekton/kn-eventing-pong-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-schema-115-pull-request.yaml b/.tekton/kn-eventing-schema-115-pull-request.yaml
index beb15a6a1c1..7e016ec1bd4 100755
--- a/.tekton/kn-eventing-schema-115-pull-request.yaml
+++ b/.tekton/kn-eventing-schema-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-schema-115-push.yaml b/.tekton/kn-eventing-schema-115-push.yaml
index f77cbb3fc4e..3132c323aaf 100755
--- a/.tekton/kn-eventing-schema-115-push.yaml
+++ b/.tekton/kn-eventing-schema-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-test-event-sender-115-pull-request.yaml b/.tekton/kn-eventing-test-event-sender-115-pull-request.yaml
index 28385e27dd7..4bb958f6610 100755
--- a/.tekton/kn-eventing-test-event-sender-115-pull-request.yaml
+++ b/.tekton/kn-eventing-test-event-sender-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-test-event-sender-115-push.yaml b/.tekton/kn-eventing-test-event-sender-115-push.yaml
index b659ec1f829..8fdc16785ac 100755
--- a/.tekton/kn-eventing-test-event-sender-115-push.yaml
+++ b/.tekton/kn-eventing-test-event-sender-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-test-eventshub-115-pull-request.yaml b/.tekton/kn-eventing-test-eventshub-115-pull-request.yaml
index 9f24aa4d83e..d44c92ad700 100755
--- a/.tekton/kn-eventing-test-eventshub-115-pull-request.yaml
+++ b/.tekton/kn-eventing-test-eventshub-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-test-eventshub-115-push.yaml b/.tekton/kn-eventing-test-eventshub-115-push.yaml
index 559b61a3f5c..702636ee069 100755
--- a/.tekton/kn-eventing-test-eventshub-115-push.yaml
+++ b/.tekton/kn-eventing-test-eventshub-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-test-print-115-pull-request.yaml b/.tekton/kn-eventing-test-print-115-pull-request.yaml
index 3dddd2cfda3..7764f5194df 100755
--- a/.tekton/kn-eventing-test-print-115-pull-request.yaml
+++ b/.tekton/kn-eventing-test-print-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-test-print-115-push.yaml b/.tekton/kn-eventing-test-print-115-push.yaml
index 87d292f7a43..b7ac0fff0ba 100755
--- a/.tekton/kn-eventing-test-print-115-push.yaml
+++ b/.tekton/kn-eventing-test-print-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-test-recordevents-115-pull-request.yaml b/.tekton/kn-eventing-test-recordevents-115-pull-request.yaml
index fa08b34b336..7e3b8434206 100755
--- a/.tekton/kn-eventing-test-recordevents-115-pull-request.yaml
+++ b/.tekton/kn-eventing-test-recordevents-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-test-recordevents-115-push.yaml b/.tekton/kn-eventing-test-recordevents-115-push.yaml
index 4bb3cbcf57c..d2f83a2c307 100755
--- a/.tekton/kn-eventing-test-recordevents-115-push.yaml
+++ b/.tekton/kn-eventing-test-recordevents-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-test-request-sender-115-pull-request.yaml b/.tekton/kn-eventing-test-request-sender-115-pull-request.yaml
index 48e49413568..3d1dd70c712 100755
--- a/.tekton/kn-eventing-test-request-sender-115-pull-request.yaml
+++ b/.tekton/kn-eventing-test-request-sender-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-test-request-sender-115-push.yaml b/.tekton/kn-eventing-test-request-sender-115-push.yaml
index e1dcf37016d..95f4d411600 100755
--- a/.tekton/kn-eventing-test-request-sender-115-push.yaml
+++ b/.tekton/kn-eventing-test-request-sender-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-test-wathola-fetcher-115-pull-request.yaml b/.tekton/kn-eventing-test-wathola-fetcher-115-pull-request.yaml
index 6caec16a267..0ab8a94b9e9 100755
--- a/.tekton/kn-eventing-test-wathola-fetcher-115-pull-request.yaml
+++ b/.tekton/kn-eventing-test-wathola-fetcher-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-test-wathola-fetcher-115-push.yaml b/.tekton/kn-eventing-test-wathola-fetcher-115-push.yaml
index dcd881b00ac..4657a847c67 100755
--- a/.tekton/kn-eventing-test-wathola-fetcher-115-push.yaml
+++ b/.tekton/kn-eventing-test-wathola-fetcher-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-test-wathola-forwarder-115-pull-request.yaml b/.tekton/kn-eventing-test-wathola-forwarder-115-pull-request.yaml
index b066a8dcfd6..e69d724f04c 100755
--- a/.tekton/kn-eventing-test-wathola-forwarder-115-pull-request.yaml
+++ b/.tekton/kn-eventing-test-wathola-forwarder-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-test-wathola-forwarder-115-push.yaml b/.tekton/kn-eventing-test-wathola-forwarder-115-push.yaml
index e671c1a3ec8..fd04ca1894f 100755
--- a/.tekton/kn-eventing-test-wathola-forwarder-115-push.yaml
+++ b/.tekton/kn-eventing-test-wathola-forwarder-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-test-wathola-receiver-115-pull-request.yaml b/.tekton/kn-eventing-test-wathola-receiver-115-pull-request.yaml
index 768a8f40bc2..5532004f2cc 100755
--- a/.tekton/kn-eventing-test-wathola-receiver-115-pull-request.yaml
+++ b/.tekton/kn-eventing-test-wathola-receiver-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-test-wathola-receiver-115-push.yaml b/.tekton/kn-eventing-test-wathola-receiver-115-push.yaml
index f79f0b42c24..598d2cd5fdc 100755
--- a/.tekton/kn-eventing-test-wathola-receiver-115-push.yaml
+++ b/.tekton/kn-eventing-test-wathola-receiver-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-test-wathola-sender-115-pull-request.yaml b/.tekton/kn-eventing-test-wathola-sender-115-pull-request.yaml
index 381c2e65f06..85cf072cc44 100755
--- a/.tekton/kn-eventing-test-wathola-sender-115-pull-request.yaml
+++ b/.tekton/kn-eventing-test-wathola-sender-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-test-wathola-sender-115-push.yaml b/.tekton/kn-eventing-test-wathola-sender-115-push.yaml
index b9964a5f7ee..a6fa6bc00b8 100755
--- a/.tekton/kn-eventing-test-wathola-sender-115-push.yaml
+++ b/.tekton/kn-eventing-test-wathola-sender-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-webhook-115-pull-request.yaml b/.tekton/kn-eventing-webhook-115-pull-request.yaml
index 47dc7caa415..0365ca005bd 100755
--- a/.tekton/kn-eventing-webhook-115-pull-request.yaml
+++ b/.tekton/kn-eventing-webhook-115-pull-request.yaml
@@ -22,10 +22,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic
diff --git a/.tekton/kn-eventing-webhook-115-push.yaml b/.tekton/kn-eventing-webhook-115-push.yaml
index 321058e01a5..726aa6b504f 100755
--- a/.tekton/kn-eventing-webhook-115-push.yaml
+++ b/.tekton/kn-eventing-webhook-115-push.yaml
@@ -21,10 +21,10 @@ spec:
     - name: build-args
       value:
         - VERSION=1.35.0
+        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
         - GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.22
         - GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
         - JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
-        - JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
     - name: git-url
       value: '{{source_url}}'
     - name: hermetic