diff --git a/knative-kubecon/eventing/010-channel.yaml b/knative-kubecon/eventing/010-channel.yaml
deleted file mode 100644
index 2941574..0000000
--- a/knative-kubecon/eventing/010-channel.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: eventing.knative.dev/v1alpha1
-kind: Channel
-metadata:
-  name: testchannel
-spec:
-  provisioner:
-    apiVersion: eventing.knative.dev/v1alpha1
-    kind: ClusterChannelProvisioner
-    name: in-memory-channel
diff --git a/knative-kubecon/eventing/030-subscription.yaml b/knative-kubecon/eventing/010-trigger.yaml
similarity index 56%
rename from knative-kubecon/eventing/030-subscription.yaml
rename to knative-kubecon/eventing/010-trigger.yaml
index f19c65a..9db3361 100644
--- a/knative-kubecon/eventing/030-subscription.yaml
+++ b/knative-kubecon/eventing/010-trigger.yaml
@@ -1,13 +1,12 @@
 apiVersion: eventing.knative.dev/v1alpha1
-kind: Subscription
+kind: Trigger
 metadata:
-  name: testevents-subscription
+  name: my-service-trigger
   namespace: myproject
 spec:
-  channel:
-    apiVersion: eventing.knative.dev/v1alpha1
-    kind: Channel
-    name: testchannel
+  filter:
+    sourceAndType:
+      type: dev.knative.source.heartbeats
   subscriber:
     ref:
       apiVersion: serving.knative.dev/v1alpha1
diff --git a/knative-kubecon/eventing/021-source.yaml b/knative-kubecon/eventing/021-source.yaml
index 8204a9e..89088e9 100644
--- a/knative-kubecon/eventing/021-source.yaml
+++ b/knative-kubecon/eventing/021-source.yaml
@@ -2,6 +2,7 @@ apiVersion: sources.eventing.knative.dev/v1alpha1
 kind: ContainerSource
 metadata:
   name: heartbeat-event-source
+  namespace: myproject
 spec:
   image: docker.io/matzew/kube-heartbeat
   args: 
@@ -9,5 +10,5 @@ spec:
    - '--period=400'
   sink:
     apiVersion: eventing.knative.dev/v1alpha1
-    kind: Channel
-    name: testchannel
+    kind: Broker
+    name: default