diff --git a/data-plane/pom.xml b/data-plane/pom.xml
index e0f0ea8c1d..6988e3228f 100644
--- a/data-plane/pom.xml
+++ b/data-plane/pom.xml
@@ -39,8 +39,8 @@
     <maven.jacoco.plugin.version>0.8.12</maven.jacoco.plugin.version>
     <maven.enforcer.plugin.version>3.5.0</maven.enforcer.plugin.version>
     <maven.license.plugin.version>2.0.0</maven.license.plugin.version>
-    <mycila.license.plugin.version>4.1</mycila.license.plugin.version>
-    <spotless.plugin.version>2.38.0</spotless.plugin.version>
+    <mycila.license.plugin.version>5.0.0</mycila.license.plugin.version>
+    <spotless.plugin.version>3.0.0</spotless.plugin.version>
 
     <!-- dependencies version -->
     <vertx.version>4.5.7</vertx.version>
@@ -48,17 +48,17 @@
     <micrometer.version>1.12.2</micrometer.version>
     <opentelemetry.version>1.32.0</opentelemetry.version>
     <jackson.version>2.14.1</jackson.version>
-    <protobuf.version>3.25.2</protobuf.version>
-    <bucket4j.version>7.6.0</bucket4j.version>
+    <protobuf.version>4.32.1.redhat-00002</protobuf.version>
+    <bucket4j.version>8.0.1</bucket4j.version>
     <slf4j.version>2.0.9</slf4j.version>
     <ch.qos.logback.version>1.4.14</ch.qos.logback.version>
-    <net.logstash.logback.encoder.version>7.2</net.logstash.logback.encoder.version>
+    <net.logstash.logback.encoder.version>8.1</net.logstash.logback.encoder.version>
     <assertj.version>3.26.0</assertj.version>
     <awaitility.version>4.2.0</awaitility.version>
     <junit.jupiter.version>5.10.1</junit.jupiter.version>
     <mokito.junit.jupiter.version>5.12.0</mokito.junit.jupiter.version>
-    <fabric8.kubernetes.version>6.10.0</fabric8.kubernetes.version>
-    <kafka.version>3.7.1</kafka.version>
+    <fabric8.kubernetes.version>7.1.0.redhat-00001</fabric8.kubernetes.version>
+    <kafka.version>4.0.0.redhat-00013</kafka.version>
     <debezium.version>2.6.1.Final</debezium.version>
     <jib.version>3.4.0</jib.version>
     <quarkus.version>3.8.6.SP3-redhat-00002</quarkus.version>
diff --git a/openshift/ci-operator/knative-images/event_display/Dockerfile b/openshift/ci-operator/knative-images/event_display/Dockerfile
index 7102fadac4..610c34df96 100755
--- a/openshift/ci-operator/knative-images/event_display/Dockerfile
+++ b/openshift/ci-operator/knative-images/event_display/Dockerfile
@@ -30,6 +30,7 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Event Display" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Event Display" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Event Display" \
-      io.openshift.tags="event-display"
+      io.openshift.tags="event-display" \
+      cpe="cpe:/a:redhat:openshift_serverless:1.35::el8"
 
 ENTRYPOINT ["/usr/bin/event_display"]
diff --git a/openshift/ci-operator/knative-images/heartbeats/Dockerfile b/openshift/ci-operator/knative-images/heartbeats/Dockerfile
index 82110a806b..79fe710b7f 100755
--- a/openshift/ci-operator/knative-images/heartbeats/Dockerfile
+++ b/openshift/ci-operator/knative-images/heartbeats/Dockerfile
@@ -30,6 +30,7 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Heartbeats" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Heartbeats" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Heartbeats" \
-      io.openshift.tags="heartbeats"
+      io.openshift.tags="heartbeats" \
+      cpe="cpe:/a:redhat:openshift_serverless:1.35::el8"
 
 ENTRYPOINT ["/usr/bin/heartbeats"]
diff --git a/openshift/ci-operator/knative-images/kafka-controller/Dockerfile b/openshift/ci-operator/knative-images/kafka-controller/Dockerfile
index 2b6a22701f..8bdd6037da 100755
--- a/openshift/ci-operator/knative-images/kafka-controller/Dockerfile
+++ b/openshift/ci-operator/knative-images/kafka-controller/Dockerfile
@@ -30,6 +30,7 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Controller" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Controller" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Kafka Controller" \
-      io.openshift.tags="kafka-controller"
+      io.openshift.tags="kafka-controller" \
+      cpe="cpe:/a:redhat:openshift_serverless:1.35::el8"
 
 ENTRYPOINT ["/usr/bin/kafka-controller"]
diff --git a/openshift/ci-operator/knative-images/kafka-source-controller/Dockerfile b/openshift/ci-operator/knative-images/kafka-source-controller/Dockerfile
index 75cb4c80db..846d9292a9 100755
--- a/openshift/ci-operator/knative-images/kafka-source-controller/Dockerfile
+++ b/openshift/ci-operator/knative-images/kafka-source-controller/Dockerfile
@@ -30,6 +30,7 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Source Controller" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Kafka Source Controller" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Kafka Source Controller" \
-      io.openshift.tags="kafka-source-controller"
+      io.openshift.tags="kafka-source-controller" \
+      cpe="cpe:/a:redhat:openshift_serverless:1.35::el8"
 
 ENTRYPOINT ["/usr/bin/kafka-source-controller"]
diff --git a/openshift/ci-operator/knative-images/migrate/Dockerfile b/openshift/ci-operator/knative-images/migrate/Dockerfile
index ee2e8d7d23..88afea7368 100755
--- a/openshift/ci-operator/knative-images/migrate/Dockerfile
+++ b/openshift/ci-operator/knative-images/migrate/Dockerfile
@@ -30,6 +30,7 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Migrate" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Migrate" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Migrate" \
-      io.openshift.tags="migrate"
+      io.openshift.tags="migrate" \
+      cpe="cpe:/a:redhat:openshift_serverless:1.35::el8"
 
 ENTRYPOINT ["/usr/bin/migrate"]
diff --git a/openshift/ci-operator/knative-images/post-install/Dockerfile b/openshift/ci-operator/knative-images/post-install/Dockerfile
index 59bd09bcb2..d3ff742f2a 100755
--- a/openshift/ci-operator/knative-images/post-install/Dockerfile
+++ b/openshift/ci-operator/knative-images/post-install/Dockerfile
@@ -30,6 +30,7 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Post Install" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Post Install" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Post Install" \
-      io.openshift.tags="post-install"
+      io.openshift.tags="post-install" \
+      cpe="cpe:/a:redhat:openshift_serverless:1.35::el8"
 
 ENTRYPOINT ["/usr/bin/post-install"]
diff --git a/openshift/ci-operator/knative-images/webhook-kafka/Dockerfile b/openshift/ci-operator/knative-images/webhook-kafka/Dockerfile
index 6fa5844ed7..0477b1d726 100755
--- a/openshift/ci-operator/knative-images/webhook-kafka/Dockerfile
+++ b/openshift/ci-operator/knative-images/webhook-kafka/Dockerfile
@@ -30,6 +30,7 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Webhook Kafka" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Webhook Kafka" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Webhook Kafka" \
-      io.openshift.tags="webhook-kafka"
+      io.openshift.tags="webhook-kafka" \
+      cpe="cpe:/a:redhat:openshift_serverless:1.35::el8"
 
 ENTRYPOINT ["/usr/bin/webhook-kafka"]
diff --git a/openshift/ci-operator/knative-test-images/committed-offset/Dockerfile b/openshift/ci-operator/knative-test-images/committed-offset/Dockerfile
index 49c6e35d81..abbb09adb4 100755
--- a/openshift/ci-operator/knative-test-images/committed-offset/Dockerfile
+++ b/openshift/ci-operator/knative-test-images/committed-offset/Dockerfile
@@ -30,6 +30,7 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Committed Offset" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Committed Offset" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Test Test Images Committed Offset" \
-      io.openshift.tags="test-test-images-committed-offset"
+      io.openshift.tags="test-test-images-committed-offset" \
+      cpe="cpe:/a:redhat:openshift_serverless:1.35::el8"
 
 ENTRYPOINT ["/usr/bin/committed-offset"]
diff --git a/openshift/ci-operator/knative-test-images/consumer-group-lag-provider-test/Dockerfile b/openshift/ci-operator/knative-test-images/consumer-group-lag-provider-test/Dockerfile
index 2c3ccee586..5e9e49fed3 100755
--- a/openshift/ci-operator/knative-test-images/consumer-group-lag-provider-test/Dockerfile
+++ b/openshift/ci-operator/knative-test-images/consumer-group-lag-provider-test/Dockerfile
@@ -30,6 +30,7 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Consumer Group Lag Provider Test" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Consumer Group Lag Provider Test" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Test Test Images Consumer Group Lag Provider Test" \
-      io.openshift.tags="test-test-images-consumer-group-lag-provider-test"
+      io.openshift.tags="test-test-images-consumer-group-lag-provider-test" \
+      cpe="cpe:/a:redhat:openshift_serverless:1.35::el8"
 
 ENTRYPOINT ["/usr/bin/consumer-group-lag-provider-test"]
diff --git a/openshift/ci-operator/knative-test-images/event-sender/Dockerfile b/openshift/ci-operator/knative-test-images/event-sender/Dockerfile
index bf7df8c289..040dee4398 100755
--- a/openshift/ci-operator/knative-test-images/event-sender/Dockerfile
+++ b/openshift/ci-operator/knative-test-images/event-sender/Dockerfile
@@ -30,6 +30,7 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Event Sender" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Event Sender" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Event Sender" \
-      io.openshift.tags="vendor-knative.dev-eventing-test-test-images-event-sender"
+      io.openshift.tags="vendor-knative.dev-eventing-test-test-images-event-sender" \
+      cpe="cpe:/a:redhat:openshift_serverless:1.35::el8"
 
 ENTRYPOINT ["/usr/bin/event-sender"]
diff --git a/openshift/ci-operator/knative-test-images/eventshub/Dockerfile b/openshift/ci-operator/knative-test-images/eventshub/Dockerfile
index 41c3da56a5..f89c0d86a6 100755
--- a/openshift/ci-operator/knative-test-images/eventshub/Dockerfile
+++ b/openshift/ci-operator/knative-test-images/eventshub/Dockerfile
@@ -30,6 +30,7 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Eventshub" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Eventshub" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Eventshub" \
-      io.openshift.tags="eventshub"
+      io.openshift.tags="eventshub" \
+      cpe="cpe:/a:redhat:openshift_serverless:1.35::el8"
 
 ENTRYPOINT ["/usr/bin/eventshub"]
diff --git a/openshift/ci-operator/knative-test-images/kafka-consumer/Dockerfile b/openshift/ci-operator/knative-test-images/kafka-consumer/Dockerfile
index 8d0d30c359..d59cd9c918 100755
--- a/openshift/ci-operator/knative-test-images/kafka-consumer/Dockerfile
+++ b/openshift/ci-operator/knative-test-images/kafka-consumer/Dockerfile
@@ -30,6 +30,7 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Kafka Consumer" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Test Test Images Kafka Consumer" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Test Test Images Kafka Consumer" \
-      io.openshift.tags="test-test-images-kafka-consumer"
+      io.openshift.tags="test-test-images-kafka-consumer" \
+      cpe="cpe:/a:redhat:openshift_serverless:1.35::el8"
 
 ENTRYPOINT ["/usr/bin/kafka-consumer"]
diff --git a/openshift/ci-operator/knative-test-images/logs-exporter/Dockerfile b/openshift/ci-operator/knative-test-images/logs-exporter/Dockerfile
index ece6de9ee2..5daa807870 100755
--- a/openshift/ci-operator/knative-test-images/logs-exporter/Dockerfile
+++ b/openshift/ci-operator/knative-test-images/logs-exporter/Dockerfile
@@ -30,6 +30,7 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Logs Exporter" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Logs Exporter" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Logs Exporter" \
-      io.openshift.tags="logs-exporter"
+      io.openshift.tags="logs-exporter" \
+      cpe="cpe:/a:redhat:openshift_serverless:1.35::el8"
 
 ENTRYPOINT ["/usr/bin/logs-exporter"]
diff --git a/openshift/ci-operator/knative-test-images/print/Dockerfile b/openshift/ci-operator/knative-test-images/print/Dockerfile
index 981a01ae16..662cfd016a 100755
--- a/openshift/ci-operator/knative-test-images/print/Dockerfile
+++ b/openshift/ci-operator/knative-test-images/print/Dockerfile
@@ -30,6 +30,7 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Print" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Print" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Print" \
-      io.openshift.tags="vendor-knative.dev-eventing-test-test-images-print"
+      io.openshift.tags="vendor-knative.dev-eventing-test-test-images-print" \
+      cpe="cpe:/a:redhat:openshift_serverless:1.35::el8"
 
 ENTRYPOINT ["/usr/bin/print"]
diff --git a/openshift/ci-operator/knative-test-images/recordevents/Dockerfile b/openshift/ci-operator/knative-test-images/recordevents/Dockerfile
index 9021ff037e..fabc35effa 100755
--- a/openshift/ci-operator/knative-test-images/recordevents/Dockerfile
+++ b/openshift/ci-operator/knative-test-images/recordevents/Dockerfile
@@ -30,6 +30,7 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Recordevents" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Recordevents" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Recordevents" \
-      io.openshift.tags="vendor-knative.dev-eventing-test-test-images-recordevents"
+      io.openshift.tags="vendor-knative.dev-eventing-test-test-images-recordevents" \
+      cpe="cpe:/a:redhat:openshift_serverless:1.35::el8"
 
 ENTRYPOINT ["/usr/bin/recordevents"]
diff --git a/openshift/ci-operator/knative-test-images/request-sender/Dockerfile b/openshift/ci-operator/knative-test-images/request-sender/Dockerfile
index 0e6843eb94..b4bab064ff 100755
--- a/openshift/ci-operator/knative-test-images/request-sender/Dockerfile
+++ b/openshift/ci-operator/knative-test-images/request-sender/Dockerfile
@@ -30,6 +30,7 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Request Sender" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Request Sender" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Request Sender" \
-      io.openshift.tags="vendor-knative.dev-eventing-test-test-images-request-sender"
+      io.openshift.tags="vendor-knative.dev-eventing-test-test-images-request-sender" \
+      cpe="cpe:/a:redhat:openshift_serverless:1.35::el8"
 
 ENTRYPOINT ["/usr/bin/request-sender"]
diff --git a/openshift/ci-operator/knative-test-images/watch-cm/Dockerfile b/openshift/ci-operator/knative-test-images/watch-cm/Dockerfile
index fba3cc2bdb..f45dac37d3 100755
--- a/openshift/ci-operator/knative-test-images/watch-cm/Dockerfile
+++ b/openshift/ci-operator/knative-test-images/watch-cm/Dockerfile
@@ -30,6 +30,7 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Watch Cm" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Watch Cm" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Watch Cm" \
-      io.openshift.tags="watch-cm"
+      io.openshift.tags="watch-cm" \
+      cpe="cpe:/a:redhat:openshift_serverless:1.35::el8"
 
 ENTRYPOINT ["/usr/bin/watch-cm"]
diff --git a/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile
index cfb8c8c3da..a6f3942870 100755
--- a/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile
+++ b/openshift/ci-operator/knative-test-images/wathola-fetcher/Dockerfile
@@ -30,6 +30,7 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Fetcher" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Fetcher" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Fetcher" \
-      io.openshift.tags="vendor-knative.dev-eventing-test-test-images-wathola-fetcher"
+      io.openshift.tags="vendor-knative.dev-eventing-test-test-images-wathola-fetcher" \
+      cpe="cpe:/a:redhat:openshift_serverless:1.35::el8"
 
 ENTRYPOINT ["/usr/bin/wathola-fetcher"]
diff --git a/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile
index 2943a39a2f..fb9169b7b1 100755
--- a/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile
+++ b/openshift/ci-operator/knative-test-images/wathola-forwarder/Dockerfile
@@ -30,6 +30,7 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Forwarder" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Forwarder" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Forwarder" \
-      io.openshift.tags="vendor-knative.dev-eventing-test-test-images-wathola-forwarder"
+      io.openshift.tags="vendor-knative.dev-eventing-test-test-images-wathola-forwarder" \
+      cpe="cpe:/a:redhat:openshift_serverless:1.35::el8"
 
 ENTRYPOINT ["/usr/bin/wathola-forwarder"]
diff --git a/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile
index f5a257c3a7..e89acc6598 100755
--- a/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile
+++ b/openshift/ci-operator/knative-test-images/wathola-receiver/Dockerfile
@@ -30,6 +30,7 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Receiver" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Receiver" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Receiver" \
-      io.openshift.tags="vendor-knative.dev-eventing-test-test-images-wathola-receiver"
+      io.openshift.tags="vendor-knative.dev-eventing-test-test-images-wathola-receiver" \
+      cpe="cpe:/a:redhat:openshift_serverless:1.35::el8"
 
 ENTRYPOINT ["/usr/bin/wathola-receiver"]
diff --git a/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile b/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile
index 111f024913..64f613382f 100755
--- a/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile
+++ b/openshift/ci-operator/knative-test-images/wathola-sender/Dockerfile
@@ -30,6 +30,7 @@ LABEL \
       description="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Sender" \
       io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Sender" \
       io.k8s.description="Red Hat OpenShift Serverless Eventing Kafka Broker Vendor Knative.Dev Eventing Test Test Images Wathola Sender" \
-      io.openshift.tags="vendor-knative.dev-eventing-test-test-images-wathola-sender"
+      io.openshift.tags="vendor-knative.dev-eventing-test-test-images-wathola-sender" \
+      cpe="cpe:/a:redhat:openshift_serverless:1.35::el8"
 
 ENTRYPOINT ["/usr/bin/wathola-sender"]