diff --git a/knative-kubecon/README.md b/knative-kubecon/README.md
index 6fff4fb..e590727 100644
--- a/knative-kubecon/README.md
+++ b/knative-kubecon/README.md
@@ -187,7 +187,7 @@ spec:
           containerConcurrency: 1
           container:
             imagePullPolicy: Always
-            image: docker-registry.default.svc:5000/myproject/dumpy:latest
+            image: image-registry.openshift-image-registry.svc:5000/myproject/dumpy:latest
 ```
 
 It's very apparent that the `spec.runLatest.configuration.build` part is a one-to-one copy of the Build
@@ -268,7 +268,8 @@ servicemesh, which is listening on `$(minishift ip):32380`). Stringed together w
 command:
 
 ```bash
-$ curl -H "Host: dumpy.myproject.example.com" "http://$(minishift ip):32380/health"
+$ IP=$(oc get -n istio-system service istio-ingressgateway -ojsonpath='{.status.loadBalancer.ingress[0].hostname}')
+$ curl -H "Host: dumpy.myproject.example.com" "http://$IP/health"
 
                     888 888             888
                     888 888             888
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..e49bac9 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.eventing.samples.heartbeat
   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..bcf0261 100644
--- a/knative-kubecon/eventing/021-source.yaml
+++ b/knative-kubecon/eventing/021-source.yaml
@@ -2,12 +2,13 @@ apiVersion: sources.eventing.knative.dev/v1alpha1
 kind: ContainerSource
 metadata:
   name: heartbeat-event-source
+  namespace: myproject
 spec:
-  image: docker.io/matzew/kube-heartbeat
+  image: quay.io/openshift-knative/knative-eventing-sources-heartbeats:v0.5.0
   args: 
    - '--label="<3"'
    - '--period=400'
   sink:
     apiVersion: eventing.knative.dev/v1alpha1
-    kind: Channel
-    name: testchannel
+    kind: Broker
+    name: default
diff --git a/knative-kubecon/serving/010-service.yaml b/knative-kubecon/serving/010-service.yaml
index 4702d3b..267c5ea 100644
--- a/knative-kubecon/serving/010-service.yaml
+++ b/knative-kubecon/serving/010-service.yaml
@@ -26,6 +26,10 @@ spec:
             alpha.image.policy.openshift.io/resolve-names: "*"
         spec:
           containerConcurrency: 1
+          timeoutSeconds: 60
           container:
             imagePullPolicy: Always
-            image: docker-registry.default.svc:5000/myproject/dumpy:latest
+            image: image-registry.openshift-image-registry.svc:5000/myproject/dumpy:latest
+            resources:
+              requests:
+                cpu: 50m
diff --git a/knative-kubecon/serving/011-service-update.yaml b/knative-kubecon/serving/011-service-update.yaml
index b6b4a3b..7ab38ee 100644
--- a/knative-kubecon/serving/011-service-update.yaml
+++ b/knative-kubecon/serving/011-service-update.yaml
@@ -28,6 +28,10 @@ spec:
             alpha.image.policy.openshift.io/resolve-names: "*"
         spec:
           containerConcurrency: 1
+          timeoutSeconds: 60
           container:
             imagePullPolicy: Always
-            image: docker-registry.default.svc:5000/myproject/dumpy:latest
+            image: image-registry.openshift-image-registry.svc:5000/myproject/dumpy:latest
+            resources:
+              requests:
+                cpu: 50m
diff --git a/knative-kubecon/serving/012-service-traffic.yaml b/knative-kubecon/serving/012-service-traffic.yaml
index 7f23410..bb16cb9 100644
--- a/knative-kubecon/serving/012-service-traffic.yaml
+++ b/knative-kubecon/serving/012-service-traffic.yaml
@@ -28,6 +28,10 @@ spec:
             alpha.image.policy.openshift.io/resolve-names: "*"
         spec:
           containerConcurrency: 1
+          timeoutSeconds: 60
           container:
             imagePullPolicy: Always
-            image: docker-registry.default.svc:5000/myproject/dumpy:latest
+            image: image-registry.openshift-image-registry.svc:5000/myproject/dumpy:latest
+            resources:
+              requests:
+                cpu: 50m
diff --git a/knative-kubecon/serving/013-service-final.yaml b/knative-kubecon/serving/013-service-final.yaml
index da2604e..23a5a06 100644
--- a/knative-kubecon/serving/013-service-final.yaml
+++ b/knative-kubecon/serving/013-service-final.yaml
@@ -28,6 +28,10 @@ spec:
             alpha.image.policy.openshift.io/resolve-names: "*"
         spec:
           containerConcurrency: 1
+          timeoutSeconds: 60
           container:
             imagePullPolicy: Always
-            image: docker-registry.default.svc:5000/myproject/dumpy:latest
+            image: image-registry.openshift-image-registry.svc:5000/myproject/dumpy:latest
+            resources:
+              requests:
+                cpu: 50m