diff --git a/files/configs/event-router/vmware-event-router-clusterrole.yaml b/files/configs/event-router/vmware-event-router-clusterrole.yaml
index ac1edc4bb..f3713e273 100644
--- a/files/configs/event-router/vmware-event-router-clusterrole.yaml
+++ b/files/configs/event-router/vmware-event-router-clusterrole.yaml
@@ -5,7 +5,7 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: addressable-resolver
+  name: knative-serving-aggregated-addressable-resolver
 subjects:
 - kind: ServiceAccount
   name: vmware-event-router
diff --git a/files/downloads/cert-manager/overlay.yaml b/files/downloads/cert-manager/overlay.yaml
new file mode 100644
index 000000000..25fd06e3d
--- /dev/null
+++ b/files/downloads/cert-manager/overlay.yaml
@@ -0,0 +1,31 @@
+#@ load("@ytt:overlay", "overlay")
+
+#@overlay/match by=overlay.subset({"kind":"Deployment", "metadata": {"name": "cert-manager-cainjector"}})
+---
+spec:
+  template:
+    spec:
+      containers:
+      #@overlay/match by=overlay.all, expects="1+"
+      -
+        imagePullPolicy: IfNotPresent
+
+#@overlay/match by=overlay.subset({"kind":"Deployment", "metadata": {"name": "cert-manager"}})
+---
+spec:
+  template:
+    spec:
+      containers:
+      #@overlay/match by=overlay.all, expects="1+"
+      -
+        imagePullPolicy: IfNotPresent
+
+#@overlay/match by=overlay.subset({"kind":"Deployment", "metadata": {"name": "cert-manager-webhook"}})
+---
+spec:
+  template:
+    spec:
+      containers:
+      #@overlay/match by=overlay.all, expects="1+"
+      -
+        imagePullPolicy: IfNotPresent
diff --git a/files/downloads/rabbitmq-messaging-operator/overlay.yaml b/files/downloads/rabbitmq-messaging-operator/overlay.yaml
new file mode 100644
index 000000000..278181ad1
--- /dev/null
+++ b/files/downloads/rabbitmq-messaging-operator/overlay.yaml
@@ -0,0 +1,11 @@
+#@ load("@ytt:overlay", "overlay")
+
+#@overlay/match by=overlay.subset({"kind":"Deployment", "metadata": {"name": "messaging-topology-operator"}})
+---
+spec:
+  template:
+    spec:
+      containers:
+      #@overlay/match by=overlay.all, expects="1+"
+      -
+        imagePullPolicy: IfNotPresent
diff --git a/files/setup-05-knative.sh b/files/setup-05-knative.sh
index 2ece10de6..2d2d1c2b6 100755
--- a/files/setup-05-knative.sh
+++ b/files/setup-05-knative.sh
@@ -24,6 +24,14 @@ kubectl wait pod --timeout=3m --for=condition=Ready -l '!job-name' -n knative-ev
 echo -e "\e[92mDeploying RabbitMQ Cluster Operator ..." > /dev/console
 kubectl apply -f /root/download/cluster-operator.yml
 
+echo -e "\e[92mDeploying Cert-Manager ..." > /dev/console
+kubectl apply -f /root/download/cert-manager.yaml
+kubectl wait deployment --all --timeout=3m --for=condition=Available -n cert-manager
+
+echo -e "\e[92mDeploying RabbitMQ Messaging Operator ..." > /dev/console
+kubectl apply -f /root/download/messaging-topology-operator-with-certmanager.yaml
+kubectl wait deployment --all --timeout=3m --for=condition=Available -n rabbitmq-system
+
 echo -e "\e[92mDeploying RabbitMQ Broker ..." > /dev/console
 kubectl apply -f /root/download/rabbitmq-broker.yaml
 kubectl apply -f /root/config/knative/rabbit.yaml
diff --git a/scripts/photon-containers.sh b/scripts/photon-containers.sh
index 76c5a2a63..f2d6f15d1 100644
--- a/scripts/photon-containers.sh
+++ b/scripts/photon-containers.sh
@@ -21,19 +21,6 @@ done
 
 cd /root/download
 
-echo '> Downloading Contour...'
-CONTOUR_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["contour"].gitRepoTag')
-git clone https://github.com/projectcontour/contour.git
-cd contour
-git checkout ${CONTOUR_VERSION}
-sed -i "s/latest/${CONTOUR_VERSION}/g" examples/contour/02-job-certgen.yaml
-cat >> examples/contour/03-envoy.yaml << EOF
-      dnsPolicy: ClusterFirstWithHostNet
-      hostNetwork: true
-EOF
-sed -i 's/imagePullPolicy: Always/imagePullPolicy: IfNotPresent/g' examples/contour/*.yaml
-cd ..
-
 echo '> Downloading Antrea...'
 mkdir -p /root/download/antrea/templates
 ANTREA_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["antrea"].gitRepoTag')
@@ -44,14 +31,15 @@ curl -L https://github.com/vmware-tanzu/antrea/releases/download/${ANTREA_VERSIO
 ytt -f ${ANTREA_OVERLAY} -f ${ANTREA_TEMPLATE} > ${ANTREA_CONFIG}
 
 echo '> Downloading Knative...'
-KNATIVE_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["knative"].gitRepoTag')
-curl -L https://github.com/knative/serving/releases/download/${KNATIVE_VERSION}/serving-crds.yaml -o /root/download/serving-crds.yaml
-curl -L https://github.com/knative/serving/releases/download/${KNATIVE_VERSION}/serving-core.yaml -o /root/download/serving-core.yaml
+KNATIVE_SERVING_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["knative-serving"].gitRepoTag')
+curl -L https://github.com/knative/serving/releases/download/${KNATIVE_SERVING_VERSION}/serving-crds.yaml -o /root/download/serving-crds.yaml
+curl -L https://github.com/knative/serving/releases/download/${KNATIVE_SERVING_VERSION}/serving-core.yaml -o /root/download/serving-core.yaml
 
-curl -L https://github.com/knative/eventing/releases/download/${KNATIVE_VERSION}/eventing-crds.yaml -o /root/download/eventing-crds.yaml
-curl -L https://github.com/knative/eventing/releases/download/${KNATIVE_VERSION}/eventing-core.yaml -o /root/download/eventing-core.yaml
+KNATIVE_EVENTING_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["knative-eventing"].gitRepoTag')
+curl -L https://github.com/knative/eventing/releases/download/${KNATIVE_EVENTING_VERSION}/eventing-crds.yaml -o /root/download/eventing-crds.yaml
+curl -L https://github.com/knative/eventing/releases/download/${KNATIVE_EVENTING_VERSION}/eventing-core.yaml -o /root/download/eventing-core.yaml
 
-echo '> Downloading RabbitMQ...'
+echo '> Downloading RabbitMQ Broker/Operator...'
 mkdir -p /root/download/rabbitmq-operator/templates
 RABBITMQ_OPERATOR_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["rabbitmq-operator"].gitRepoTag')
 RABBITMQ_OPERATOR_TEMPLATE=/root/download/rabbitmq-operator/templates/cluster-operator-template.yml
@@ -63,15 +51,34 @@ ytt -f ${RABBITMQ_OPERATOR_OVERLAY} -f ${RABBITMQ_OPERATOR_TEMPLATE} > ${RABBITM
 RABBITMQ_BROKER_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["rabbitmq-broker"].gitRepoTag')
 curl -L https://github.com/knative-sandbox/eventing-rabbitmq/releases/download/${RABBITMQ_BROKER_VERSION}/rabbitmq-broker.yaml -o /root/download/rabbitmq-broker.yaml
 
+echo '> Downloading RabbitMQ Messaging Operator...'
+mkdir -p /root/download/rabbitmq-messaging-operator/templates
+RABBITMQ_MESSAGING_OPERATOR_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["rabbitmq-messaging-topology-operator"].gitRepoTag')
+RABBITMQ_MESSAGING_OPERATOR_TEMPLATE=/root/download/rabbitmq-messaging-operator/templates/messaging-topology-operator-with-certmanager-template.yaml
+curl -L https://github.com/rabbitmq/messaging-topology-operator/releases/download/${RABBITMQ_MESSAGING_OPERATOR_VERSION}/messaging-topology-operator-with-certmanager.yaml -o ${RABBITMQ_MESSAGING_OPERATOR_TEMPLATE}
+RABBITMQ_MESSAGING_OPERATOR_OVERLAY=/root/download/rabbitmq-messaging-operator/overlay.yaml
+RABBITMQ_MESSAGING_OPERATOR_CONFIG=/root/download/messaging-topology-operator-with-certmanager.yaml
+ytt -f ${RABBITMQ_MESSAGING_OPERATOR_OVERLAY} -f ${RABBITMQ_MESSAGING_OPERATOR_TEMPLATE} > ${RABBITMQ_MESSAGING_OPERATOR_CONFIG}
+
+echo '> Downloading Cert-Manager...'
+mkdir -p /root/download/cert-manager/templates
+CERT_MANAGER_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["cert-manager"].gitRepoTag')
+CERT_MANAGER_TEMPLATE=/root/download/cert-manager/templates/cert-manager-template.yaml
+curl -L https://github.com/jetstack/cert-manager/releases/download/${CERT_MANAGER_VERSION}/cert-manager.yaml -o ${CERT_MANAGER_TEMPLATE}
+CERT_MANAGER_OVERLAY=/root/download/cert-manager/overlay.yaml
+CERT_MANAGER_CONFIG=/root/download/cert-manager.yaml
+ytt -f ${CERT_MANAGER_OVERLAY} -f ${CERT_MANAGER_TEMPLATE} > ${CERT_MANAGER_CONFIG}
+
 echo '> Downloading Knative Contour...'
+KNATIVE_CONTOUR_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["knative-contour"].gitRepoTag')
 mkdir -p /root/download/knative-contour/templates
 KNATIVE_CONTOUR_TEMPLATE=/root/download/knative-contour/templates/knative-contour.yaml
 KNATIVE_CONTOUR_OVERLAY=/root/download/knative-contour/overlay.yaml
 KNATIVE_CONTOUR_CONFIG=/root/download/knative-contour.yaml
-curl -L https://github.com/knative/net-contour/releases/download/${KNATIVE_VERSION}/contour.yaml -o ${KNATIVE_CONTOUR_TEMPLATE}
+curl -L https://github.com/knative/net-contour/releases/download/${KNATIVE_CONTOUR_VERSION}/contour.yaml -o ${KNATIVE_CONTOUR_TEMPLATE}
 ytt -f ${KNATIVE_CONTOUR_OVERLAY} -f ${KNATIVE_CONTOUR_TEMPLATE} > ${KNATIVE_CONTOUR_CONFIG}
 
-curl -L https://github.com/knative/net-contour/releases/download/${KNATIVE_VERSION}/net-contour.yaml -o /root/download/net-contour.yaml
+curl -L https://github.com/knative/net-contour/releases/download/${KNATIVE_CONTOUR_VERSION}/net-contour.yaml -o /root/download/net-contour.yaml
 
 echo '> Downloading Local Path Provisioner...'
 mkdir -p /root/download/local-provisioner/templates
diff --git a/scripts/photon-settings.sh b/scripts/photon-settings.sh
index 3090bc989..c42f8d709 100644
--- a/scripts/photon-settings.sh
+++ b/scripts/photon-settings.sh
@@ -53,7 +53,7 @@ K8S_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["kubernetes"].gitRepoTag' | sed 's/v//
 tdnf install -y kubelet-${K8S_VERSION} kubectl-${K8S_VERSION} kubeadm-${K8S_VERSION}
 
 echo '> Downloading Kn CLI'
-KNATIVE_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["knative"].gitRepoTag')
+KNATIVE_VERSION=$(jq -r < ${VEBA_BOM_FILE} '.["knative-serving"].gitRepoTag')
 wget https://github.com/knative/client/releases/download/${KNATIVE_VERSION}/kn-linux-amd64
 chmod +x kn-linux-amd64
 mv kn-linux-amd64 /usr/local/bin/kn
diff --git a/veba-bom.json b/veba-bom.json
index f2506c2a9..e76b5449f 100644
--- a/veba-bom.json
+++ b/veba-bom.json
@@ -23,17 +23,6 @@
             "version": "v1.2.0"
         }]
     },
-    "contour": {
-        "gitRepoTag": "v1.9.0",
-        "containers": [{
-                "name": "projectcontour/contour",
-                "version": "v1.9.0"
-            },
-            {
-                "name": "envoyproxy/envoy",
-                "version": "v1.15.1"
-            }]
-    },
     "fluentbit": {
         "gitRepoTag": "v1.7.9",
         "containers": [{
@@ -87,47 +76,71 @@
             }
         ]
     },
-    "knative": {
-        "gitRepoTag": "v0.20.0",
-        "containers": [{
-                "name": "gcr.io/knative-releases/github.com/projectcontour/contour/cmd/contour@sha256",
-                "version": "3e88236949d49b0933318ef077741e9bf6f40ae84e8b79d7c229e1aaff53220f"
+    "knative-serving": {
+        "gitRepoTag": "v0.26.0",
+            "containers": [{
+                "name": "gcr.io/knative-releases/knative.dev/serving/cmd/queue@sha256",
+                "version": "5af97fa5e19c6fd1e04642e7cf6eb01e6982b4cfee19d8fd16649423277c2eb9"
             },
             {
-                "name": "envoyproxy/envoy",
-                "version": "v1.16.0"
+                "name": "gcr.io/knative-releases/knative.dev/serving/cmd/activator@sha256",
+                "version": "00aeb9267dc6445bbb11cb90636e9cde44404c6303d55b81aa074381b4989eef"
             },
             {
-                "name": "gcr.io/knative-releases/knative.dev/net-contour/cmd/controller@sha256",
-                "version": "5654ef5be4f506909bba6cbb59e7049d6c4bfc866066f2546bcabd2ff547307f"
+                "name": "gcr.io/knative-releases/knative.dev/serving/cmd/autoscaler@sha256",
+                "version": "ca3bad368a2ac40f33ad9e47c1075cc2b833301b4bc772fb84c51f52cc1c0a35"
             },
             {
-                "name": "gcr.io/knative-releases/knative.dev/serving/cmd/activator@sha256",
-                "version": "cbeb1cdcdde8b3b44bc5eb1c5a07512a36f4bd7fbee5e9677e8789ee2459b6ed"
+                "name": "gcr.io/knative-releases/knative.dev/serving/cmd/controller@sha256",
+                "version": "50fcbbc79b1078991280bf423e590c8904882dc8750c7f7d61bc06d944a052f2"
             },
             {
-                "name": "gcr.io/knative-releases/knative.dev/serving/cmd/autoscaler@sha256",
-                "version": "73d4d0503544ea930caa4fba07b701147339131de31a6aae8c52d6bb568f3c81"
+                "name": "gcr.io/knative-releases/knative.dev/serving/cmd/domain-mapping@sha256",
+                "version": "3b7da888fafca8cc5ba5e2aa62d6f97751d50890ed9d0b01aabce66a7d26351e"
             },
             {
-                "name": "gcr.io/knative-releases/knative.dev/serving/cmd/controller@sha256",
-                "version": "3054c326df9de07a2a1ce34a2515339201706995a16f8efc8228295a6b94fbdd"
+                "name": "gcr.io/knative-releases/knative.dev/serving/cmd/domain-mapping-webhook@sha256",
+                "version": "a6529f0625483c81741c92895e4d54be8a103ecc5801e7c3aa049d3b3ea7cc90"
             },
             {
                 "name": "gcr.io/knative-releases/knative.dev/serving/cmd/webhook@sha256",
-                "version": "07894526a4b49c61c5333e4f48190e830ce5124f0c18e1042cc15fcb594bfc37"
+                "version": "382a1d64ea0686da2b973c95be96fcae29ac25b256b90f5735b1479a93d19c7a"
+            }
+        ]
+    },
+    "knative-eventing": {
+        "gitRepoTag": "v0.25.1",
+            "containers": [{
+                "name": "gcr.io/knative-releases/knative.dev/eventing/cmd/controller@sha256",
+                "version": "c292f041c6716b7f61397d817ab28ea2411e6f3671f7fc811bf63e13d5316d6f"
             },
             {
-                "name": "gcr.io/knative-releases/controller-17550e04ebf9af897aa4b799ad074e13@sha256",
-                "version": "641c03911641bc86fc1b70db14e55caaa6a42c83fcc4f7cc9da50622afd6566e"
+                "name": "gcr.io/knative-releases/knative.dev/eventing/cmd/apiserver_receive_adapter@sha256",
+                "version": "7caa001a94797a6132b69d601063b535a25539f95d74e56f5bbe6598735874ff"
             },
             {
-                "name": "gcr.io/knative-releases/mtping-26ac4e6a49a610ffaac30cc0a8ab693a@sha256",
-                "version": "14c4da0990f2d6a27d62fe5c1d336d2663b034fa98835c672126afd719a1b03c"
+                "name": "gcr.io/knative-releases/knative.dev/eventing/cmd/mtping@sha256",
+                "version": "a7e1332c560702b7f5c59afdbba008d7c4fc4b1f032a50dd5b8520a5f25d2b22"
             },
             {
-                "name": "gcr.io/knative-releases/webhook-f31b5fdf3b3cdeb5a25aa0a5d79e4348@sha256",
-                "version": "eb480afef446b9f0b016cf82d88553c9a0adb4dde39505ca3d2e5830e79399e4"
+                "name": "gcr.io/knative-releases/knative.dev/eventing/cmd/webhook@sha256",
+                "version": "337f9964dbe870b822f994a95886a9dc6dcb075e8141e7efad7b3314990e1b71"
+            }
+        ]
+    },
+    "knative-contour": {
+        "gitRepoTag": "v0.25.1",
+            "containers": [{
+                "name": "gcr.io/knative-releases/github.com/projectcontour/contour/cmd/contour@sha256",
+                "version": "57f4a978b96a1b89e9ead502f3bbe1ff4fa74da5116183a45f91058a3ae48d9a"
+            },
+            {
+                "name": "docker.io/envoyproxy/envoy",
+                "version": "v1.14.4"
+            },
+            {
+                "name": "gcr.io/knative-releases/knative.dev/net-contour/cmd/controller@sha256",
+                "version": "23dabdbdb0ef4dec3c51b0493c36b180bab6f7c0f57b4c7501df77734d388e01"
             }
         ]
     },
@@ -140,30 +153,58 @@
         ]
     },
     "rabbitmq-operator": {
-        "gitRepoTag": "v1.4.0",
+        "gitRepoTag": "v1.8.2",
         "containers": [{
                 "name": "rabbitmqoperator/cluster-operator",
-                "version": "1.4.0"
+                "version": "1.8.2"
             },
             {
                 "name": "rabbitmq",
-                "version": "3.8.9-management"
+                "version": "3.8.21-management"
             }
         ]
     },
     "rabbitmq-broker": {
-        "gitRepoTag": "v0.20.0",
+        "gitRepoTag": "v0.25.1",
         "containers": [{
                 "name": "gcr.io/knative-releases/knative.dev/eventing-rabbitmq/cmd/controller/broker@sha256",
-                "version": "11863db6feeada9b34d63c8ef890349f35c4e6c03728462127431c96130c740b"
+                "version": "b2a618182fb484427c55516eb10fbae70104277e725ce5532fdb5490efbc4f56"
             },
             {
                 "name": "gcr.io/knative-releases/knative.dev/eventing-rabbitmq/cmd/ingress@sha256",
-                "version": "94232a856453d0761bf0ffd1fb13cb2a957591fabac8821c1be796098acc6d62"
+                "version": "3f51ea1d0a6515f2c2d0e7c33f0bcaefcfc6e9ef4ff5b46a292a06a6a0c6071b"
             },
             {
                 "name": "gcr.io/knative-releases/knative.dev/eventing-rabbitmq/cmd/dispatcher@sha256",
-                "version": "2f99ca7c62a68c213d17c23c17ec92e3b4815cec982631c3050d9ccee38fabcb"
+                "version": "594e185d8e8b52fa5ac85a23eb23934b7d6a4ffd1918d02dc58a34761687dfc9"
+            },
+            {
+                "name": "gcr.io/knative-releases/knative.dev/eventing-rabbitmq/cmd/webhook/broker@sha256",
+                "version": "bffd46864f78b83bff81116ef89de19d0c02eb103d36970083b109a602913ead"
+            }
+        ]
+    },
+    "rabbitmq-messaging-topology-operator": {
+        "gitRepoTag": "v0.8.0",
+        "containers": [{
+                "name": "rabbitmqoperator/messaging-topology-operator",
+                "version": "0.8.0"
+            }
+        ]
+    },
+    "cert-manager": {
+        "gitRepoTag": "v1.5.3",
+        "containers": [{
+                "name": "quay.io/jetstack/cert-manager-cainjector",
+                "version": "v1.5.3"
+            },
+            {
+                "name": "quay.io/jetstack/cert-manager-controller",
+                "version": "v1.5.3"
+            },
+            {
+                "name": "quay.io/jetstack/cert-manager-webhook",
+                "version": "v1.5.3"
             }
         ]
     },