diff --git a/config/caps.yaml b/config/caps.yaml
index aae6fc5..b1b510d 100644
--- a/config/caps.yaml
+++ b/config/caps.yaml
@@ -13,19 +13,18 @@ spec:
             image: github.com/botless/commands/cmd/core/
             env:
             - name: TARGET
-              value: "http://slack-out-channel-7ls72.default.svc.cluster.local/" # <---------------   TODO: update this.
+              value: "http://default-broker.default.svc.cluster.local"
             - name: STRICT_TYPE
               value: "botless.bot.command.caps"
 ---
 apiVersion: eventing.knative.dev/v1alpha1
-kind: Subscription
+kind: Trigger
 metadata:
   name: caps-command
 spec:
-  channel:
-    apiVersion: eventing.knative.dev/v1alpha1
-    kind: Channel
-    name: parser-out
+  filter:
+    sourceAndType:
+      type: botless.bot.command.caps
   subscriber:
     ref:
       apiVersion: serving.knative.dev/v1alpha1
diff --git a/config/echo.yaml b/config/echo.yaml
index 84b6def..2644045 100644
--- a/config/echo.yaml
+++ b/config/echo.yaml
@@ -13,19 +13,18 @@ spec:
             image: github.com/botless/commands/cmd/core/
             env:
             - name: TARGET
-              value: "http://slack-out-channel-7ls72.default.svc.cluster.local/" # <---------------   TODO: update this.
+              value: "http://default-broker.default.svc.cluster.local"
             - name: STRICT_TYPE
               value: "botless.bot.command.echo"
 ---
 apiVersion: eventing.knative.dev/v1alpha1
-kind: Subscription
+kind: Trigger
 metadata:
   name: echo-command
 spec:
-  channel:
-    apiVersion: eventing.knative.dev/v1alpha1
-    kind: Channel
-    name: parser-out
+  filter:
+    sourceAndType:
+      type: botless.bot.command.echo
   subscriber:
     ref:
       apiVersion: serving.knative.dev/v1alpha1
diff --git a/config/flip.yaml b/config/flip.yaml
index 582ad08..922d061 100644
--- a/config/flip.yaml
+++ b/config/flip.yaml
@@ -13,21 +13,21 @@ spec:
             image: github.com/botless/commands/cmd/core/
             env:
             - name: TARGET
-              value: "http://slack-out-channel-7ls72.default.svc.cluster.local/" # <---------------   TODO: update this.
+              value: "http://default-broker.default.svc.cluster.local"
             - name: STRICT_TYPE
               value: "botless.bot.command.flip"
 ---
 apiVersion: eventing.knative.dev/v1alpha1
-kind: Subscription
+kind: Trigger
 metadata:
   name: flip-command
 spec:
-  channel:
-    apiVersion: eventing.knative.dev/v1alpha1
-    kind: Channel
-    name: parser-out
+  filter:
+    sourceAndType:
+      type: botless.bot.command.flip
   subscriber:
     ref:
       apiVersion: serving.knative.dev/v1alpha1
       kind: Service
       name: flip-command
+