diff --git a/address-completion-c4c/sales-cloud-address-completion-here/k8s/subscription.yaml b/address-completion-c4c/sales-cloud-address-completion-here/k8s/subscription.yaml
index 40310880f..a7578120a 100644
--- a/address-completion-c4c/sales-cloud-address-completion-here/k8s/subscription.yaml
+++ b/address-completion-c4c/sales-cloud-address-completion-here/k8s/subscription.yaml
@@ -1,26 +1,13 @@
-apiVersion: eventing.kyma-project.io/v1alpha1
+apiVersion: eventing.kyma-project.io/v1alpha2
 kind: Subscription
 metadata:
   labels:
     scenario: address-completion
   name: address-completion-here
 spec:
-  filter:
-    filters:
-    - eventSource:
-        property: source
-        type: exact
-        value: ""
-      eventType:
-        property: type
-        type: exact
-        value: sap.kyma.custom.{provide-your-application-name-as-shown-in-kyma}.Account.Root.Created.v1
-    - eventSource:
-        property: source
-        type: exact
-        value: ""
-      eventType:
-        property: type
-        type: exact
-        value: sap.kyma.custom.{provide-your-application-name-as-shown-in-kyma}.Account.Root.Updated.v1
+  source: "{provide-your-application-name-as-shown-in-kyma}"
+  types:
+    - Account.Root.Created.v1
+    - Account.Root.Updated.v1
+  typeMatching: standard
   sink: http://address-completion-here.{your-namespace}.svc.cluster.local
diff --git a/address-completion-s4/README.md b/address-completion-s4/README.md
index 3085b0343..3709034c7 100644
--- a/address-completion-s4/README.md
+++ b/address-completion-s4/README.md
@@ -105,15 +105,23 @@ This step creats the connection between the two Message Clients in SAP Event Mes
 
 ## Using SAP Data Quality Services
 
-### Create the SAP DQS Service Instance and Binding
+> [!NOTE]
+> SAP Data Quality Services (DQS) are available only for the Cloud Foundry (CF) environment. See the [pricing and region availability details](https://discovery-center.cloud.sap/serviceCatalog/data-quality-services?region=all&tab=service_plan).
+> The steps below describe how to create an SAP DSQ service instance in CF and make its credentials available to Kyma.
+> For the `addressCleanse` endpoint, see the [API reference](https://api.sap.com/api/mld/resource).
 
-The APIs for the DQS service can be found [here](https://api.sap.com/api/mld/resource). The addressCleanse endpoint is used in this scenario.
+### Create an SAP DQS Service Instance in Cloud Foundry
 
-- Apply the service instance
+- Set up a subaccount with a CF environment and space in a region where DQS is available (e.g. AWS: Europe (Frankfurt))
+- Create an instance named `data-quality-service` of `Data Quality Services` with plan `standard` in that CF space
+- Create a Service Key for the instance
 
-```
-kubectl apply -f ./k8s/dqs-si.yaml -n dev
-kubectl apply -f ./k8s/dqs-sb.yaml -n dev
+### Copy the DQS Credentials to Kyma
+
+Copy the CF service key credentials into a Kubernetes Secret using the [secret-from-cf-service-key](../secret-from-cf-service-key/README.md) utility:
+
+```bash
+node create-k8s-secret-from-cf-service-key.js data-quality-service-sb {your-service-key-name} | kubectl -n dev apply -f -
 ```
 
 ### Apply the function
diff --git a/cdc-webhook/webhook-event-subscription/k8s/subscription.yaml b/cdc-webhook/webhook-event-subscription/k8s/subscription.yaml
index 928251f57..892cd981c 100644
--- a/cdc-webhook/webhook-event-subscription/k8s/subscription.yaml
+++ b/cdc-webhook/webhook-event-subscription/k8s/subscription.yaml
@@ -1,19 +1,11 @@
-apiVersion: eventing.kyma-project.io/v1alpha1
+apiVersion: eventing.kyma-project.io/v1alpha2
 kind: Subscription
 metadata:
   name: event-registration-subscription
   namespace: cdc
 spec:
-  filter:
-    filters:
-    - eventSource:
-        property: source
-        type: exact
-        value: ""
-      eventType:
-        property: type
-        type: exact
-        value: sap.kyma.custom.cdc.subscription.updated.v1
-  protocol: ""
-  protocolsettings: {}
-  sink: http://event-consumer.cdc.svc.cluster.local
\ No newline at end of file
+  source: ""
+  types:
+    - sap.kyma.custom.cdc.subscription.updated.v1
+  typeMatching: exact
+  sink: http://event-consumer.cdc.svc.cluster.local
diff --git a/helm-charts/sample-event-trigger-java/templates/subscription.yaml b/helm-charts/sample-event-trigger-java/templates/subscription.yaml
index f75c70b0f..500d26d0d 100644
--- a/helm-charts/sample-event-trigger-java/templates/subscription.yaml
+++ b/helm-charts/sample-event-trigger-java/templates/subscription.yaml
@@ -1,18 +1,12 @@
-apiVersion: eventing.kyma-project.io/v1alpha1
+apiVersion: eventing.kyma-project.io/v1alpha2
 kind: Subscription
 metadata:
   name: {{ include "sample-event-trigger-java.fullname" . }}
   labels:
     {{- include "sample-event-trigger-java.labels" . | nindent 4 }}
 spec:
-  filter:
-    filters:
-      - eventSource:
-          property: source
-          type: exact
-          value: ""
-        eventType:
-          property: type
-          type: exact
-          value: sap.kyma.custom.{{ .Values.subscription.application }}.{{ .Values.subscription.eventType }}.v1
-  sink: http://{{ include "sample-event-trigger-java.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local
\ No newline at end of file
+  source: ""
+  types:
+    - sap.kyma.custom.{{ .Values.subscription.application }}.{{ .Values.subscription.eventType }}.v1
+  typeMatching: exact
+  sink: http://{{ include "sample-event-trigger-java.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local
diff --git a/in-cluster-events/functions-javascript/k8s/subscription.yaml b/in-cluster-events/functions-javascript/k8s/subscription.yaml
index a5007a2b4..870bb5ed9 100644
--- a/in-cluster-events/functions-javascript/k8s/subscription.yaml
+++ b/in-cluster-events/functions-javascript/k8s/subscription.yaml
@@ -1,20 +1,12 @@
-apiVersion: eventing.kyma-project.io/v1alpha1
+apiVersion: eventing.kyma-project.io/v1alpha2
 kind: Subscription
 metadata:
   name: consumer
   labels:
     scenario: in-cluster-events
 spec:
-  filter:
-    filters:
-    - eventSource:
-        property: source
-        type: exact
-        value: ""
-      eventType:
-        property: type
-        type: exact
-        value: sap.kyma.custom.internal.product.viewed.v1
-  protocol: ""
-  protocolsettings: {}
-  sink: http://consumer.in-cluster-events.svc.cluster.local #this is the service name and port
\ No newline at end of file
+  source: ""
+  types:
+    - sap.kyma.custom.internal.product.viewed.v1
+  typeMatching: exact
+  sink: http://consumer.in-cluster-events.svc.cluster.local
diff --git a/nextjs-app-with-kyma-eventing/event-subscription/k8s/subscription.yaml b/nextjs-app-with-kyma-eventing/event-subscription/k8s/subscription.yaml
index 6345875c7..ba65abfae 100644
--- a/nextjs-app-with-kyma-eventing/event-subscription/k8s/subscription.yaml
+++ b/nextjs-app-with-kyma-eventing/event-subscription/k8s/subscription.yaml
@@ -1,19 +1,11 @@
-apiVersion: eventing.kyma-project.io/v1alpha1
+apiVersion: eventing.kyma-project.io/v1alpha2
 kind: Subscription
 metadata:
   name: event-subscription
   namespace: conference-registration
 spec:
-  filter:
-    filters:
-    - eventSource:
-        property: source
-        type: exact
-        value: ""
-      eventType:
-        property: type
-        type: exact
-        value: sap.kyma.custom.app.conference.registration.v1
-  protocol: ""
-  protocolsettings: {}
-  sink: http://event-consumer.conference-registration.svc.cluster.local
\ No newline at end of file
+  source: ""
+  types:
+    - sap.kyma.custom.app.conference.registration.v1
+  typeMatching: exact
+  sink: http://event-consumer.conference-registration.svc.cluster.local
diff --git a/order-validation/lambda/k8s/subscription.yaml b/order-validation/lambda/k8s/subscription.yaml
index 32f0b8419..d4bf9eaa6 100644
--- a/order-validation/lambda/k8s/subscription.yaml
+++ b/order-validation/lambda/k8s/subscription.yaml
@@ -1,16 +1,10 @@
-apiVersion: eventing.kyma-project.io/v1alpha1
+apiVersion: eventing.kyma-project.io/v1alpha2
 kind: Subscription
 metadata:
   name: order-validation
 spec:
-  filter:
-    filters:
-    - eventSource:
-        property: source
-        type: exact
-        value: ""
-      eventType:
-        property: type
-        type: exact
-        value: sap.kyma.custom.<ccv2-application>.order.fraudcheck.v1
+  source: ""
+  types:
+    - sap.kyma.custom.<ccv2-application>.order.fraudcheck.v1
+  typeMatching: exact
   sink: http://order-validation.order-validation.svc.cluster.local
diff --git a/sample-event-trigger-java/k8s/subscription.yaml b/sample-event-trigger-java/k8s/subscription.yaml
index ee0c74c48..efce6f9b8 100644
--- a/sample-event-trigger-java/k8s/subscription.yaml
+++ b/sample-event-trigger-java/k8s/subscription.yaml
@@ -1,16 +1,10 @@
-apiVersion: eventing.kyma-project.io/v1alpha1
+apiVersion: eventing.kyma-project.io/v1alpha2
 kind: Subscription
 metadata:
   name: sample-event-trigger-java-subscription
 spec:
-  filter:
-    filters:
-      - eventSource:
-          property: source
-          type: exact
-          value: ""
-        eventType:
-          property: type
-          type: exact
-          value: sap.kyma.custom.{your-connected-commerce-application-name}.order.created.v1
+  source: ""
+  types:
+    - sap.kyma.custom.{your-connected-commerce-application-name}.order.created.v1
+  typeMatching: exact
   sink: http://sample-event-trigger-java.dev.svc.cluster.local
diff --git a/sample-websockets/k8s/server.yaml b/sample-websockets/k8s/server.yaml
index e31cd671d..42dbfe3d5 100644
--- a/sample-websockets/k8s/server.yaml
+++ b/sample-websockets/k8s/server.yaml
@@ -42,22 +42,15 @@ spec:
 status:
   loadBalancer: {}
 ---
-apiVersion: eventing.kyma-project.io/v1alpha1
+apiVersion: eventing.kyma-project.io/v1alpha2
 kind: Subscription
 metadata:
   name: websocket-server
 spec:
-  filter:
-    filters:
-      - eventSource:
-          property: source
-          type: exact
-          value: ''
-        eventType:
-          property: type
-          type: exact
-          value: sap.kyma.custom.mp-gaurav-10-mock-ccv2.order.created.v1
-  protocolsettings: {}
+  source: ""
+  types:
+    - sap.kyma.custom.mp-gaurav-10-mock-ccv2.order.created.v1
+  typeMatching: exact
   sink: http://websocket-server.dev.svc.cluster.local:8888/events
 ---
 apiVersion: gateway.kyma-project.io/v2