diff --git a/deploy/connect-msk.yaml b/deploy/connect-msk.yaml
index 33df4b6f..1aae18db 100644
--- a/deploy/connect-msk.yaml
+++ b/deploy/connect-msk.yaml
@@ -283,7 +283,7 @@ objects:
         slot.name: debezium
         plugin.name: pgoutput
         slot.max.retries: 999999999
-        database.server.name: playbook-dispatcher
+        topic.prefix: playbook-dispatcher
         table.include.list: public.runs,public.run_hosts
         tombstones.on.delete: false
 
diff --git a/deploy/connect.yaml b/deploy/connect.yaml
index d3c19aae..04b050e1 100644
--- a/deploy/connect.yaml
+++ b/deploy/connect.yaml
@@ -274,7 +274,7 @@ objects:
         slot.name: debezium
         plugin.name: pgoutput
         slot.max.retries: 999999999
-        database.server.name: playbook-dispatcher
+        topic.prefix: playbook-dispatcher
         table.include.list: public.runs,public.run_hosts
         tombstones.on.delete: false
 
diff --git a/event-streams/Dockerfile b/event-streams/Dockerfile
index d6708be6..a92932b5 100644
--- a/event-streams/Dockerfile
+++ b/event-streams/Dockerfile
@@ -3,8 +3,8 @@ USER root
 
 ENV EXTRA_PLUGINS=/deps/plugins \
     EXTRA_LIBS=/deps/libs \
-    DEBEZIUM_VERSION=1.9.7.Final \
-    DEBEZIUM_CHECKSUM=161e362568163639fcde39da27e29456 \
+    DEBEZIUM_VERSION=2.5.3.Final \
+    DEBEZIUM_CHECKSUM=0e119e8fac1a0bc0c35c009786110508 \
     CONFIG_PROVIDERS_VERSION=0.1.0 \
     CONFIG_PROVIDERS_CHECKSUM=108e0bf4148a37676bed866ff45e1199
 
@@ -16,7 +16,7 @@ ADD schema/run.host.event.yaml /src
 RUN microdnf install gzip
 
 # Taken from https://github.com/debezium/docker-images/blob/master/connect-base/1.9/docker-maven-download.sh
-# Debezium PostgreSQL checksum from https://github.com/debezium/container-images/blob/main/connect/1.9/Dockerfile
+# Debezium PostgreSQL checksum from https://github.com/debezium/container-images/blob/main/connect/2.5/Dockerfile
 RUN mkdir -p $EXTRA_PLUGINS $EXTRA_LIBS && \
     MAVEN_DEP_DESTINATION=$EXTRA_PLUGINS /src/docker-maven-download.sh debezium postgres ${DEBEZIUM_VERSION} ${DEBEZIUM_CHECKSUM} && \
     MAVEN_DEP_DESTINATION=$EXTRA_LIBS /src/docker-maven-download.sh central com/redhat/insights/kafka config-providers ${CONFIG_PROVIDERS_VERSION} ${CONFIG_PROVIDERS_CHECKSUM}
diff --git a/event-streams/connector.json b/event-streams/connector.json
index b3bd84e5..5be43e4b 100644
--- a/event-streams/connector.json
+++ b/event-streams/connector.json
@@ -13,7 +13,7 @@
         "slot.name": "debezium",
         "plugin.name": "pgoutput",
         "slot.max.retries": 999999999,
-        "database.server.name": "playbook-dispatcher",
+        "topic.prefix": "playbook-dispatcher",
         "table.include.list": "public.runs,public.run_hosts",
         "tombstones.on.delete": false,
 
diff --git a/event-streams/docker-maven-download.sh b/event-streams/docker-maven-download.sh
index e42383b7..a6530ca0 100755
--- a/event-streams/docker-maven-download.sh
+++ b/event-streams/docker-maven-download.sh
@@ -84,11 +84,27 @@ maven_apicurio_converter() {
         return
     fi
     APICURIO_CONVERTER_PACKAGE="apicurio-registry-distro-connect-converter"
-    maven_dep $MAVEN_REPO_CENTRAL "io/apicurio" "$APICURIO_CONVERTER_PACKAGE" "$1" "$APICURIO_CONVERTER_PACKAGE-$1-converter.tar.gz" "$2"
+    maven_dep $MAVEN_REPO_CENTRAL "io/apicurio" "$APICURIO_CONVERTER_PACKAGE" "$1" "$APICURIO_CONVERTER_PACKAGE-$1.tar.gz" "$2"
     mkdir "$EXTERNAL_LIBS_DIR/apicurio"
     tar -xzf "$DOWNLOAD_FILE" -C "$EXTERNAL_LIBS_DIR/apicurio" && rm "$DOWNLOAD_FILE"
 }
 
+maven_otel_libs() {
+    if [[ -z "$EXTERNAL_LIBS_DIR" ]] ; then
+        echo "WARNING: EXTERNAL_LIBS_DIR is not set. Skipping loading OTEL libraries ..."
+        return
+    fi
+    if [[ ! -d "$EXTERNAL_LIBS_DIR" ]] ; then
+        echo "WARNING: EXTERNAL_LIBS_DIR is not a directory. Skipping loading OTEL libraries ..."
+        return
+    fi
+    if [[ ! -d "$EXTERNAL_LIBS_DIR/otel" ]] ; then
+	mkdir "$EXTERNAL_LIBS_DIR/otel"
+    fi
+    maven_dep $MAVEN_REPO_CENTRAL $1 $2 $3 "$2-$3.jar" $4
+    mv "$DOWNLOAD_FILE" $EXTERNAL_LIBS_DIR/otel
+}
+
 case $1 in
     "central" ) shift
             maven_central_dep ${@}
@@ -111,4 +127,7 @@ case $1 in
     "apicurio" ) shift
             maven_apicurio_converter ${@}
             ;;
+    "otel" ) shift
+            maven_otel_libs ${@}
+            ;;
 esac
diff --git a/examples/connector-local.json b/examples/connector-local.json
index d45321ec..dd17de6b 100644
--- a/examples/connector-local.json
+++ b/examples/connector-local.json
@@ -13,7 +13,7 @@
         "slot.name": "debezium",
         "plugin.name": "pgoutput",
         "slot.max.retries": 999999999,
-        "database.server.name": "playbook-dispatcher",
+        "topic.prefix": "playbook-dispatcher",
         "table.include.list": "public.runs,public.run_hosts",
 
         "key.converter": "org.apache.kafka.connect.storage.StringConverter",
diff --git a/pr_check.sh b/pr_check.sh
index 232145b1..16d6e5a3 100755
--- a/pr_check.sh
+++ b/pr_check.sh
@@ -30,7 +30,7 @@ source $CICD_ROOT/build.sh
 
 # IMAGE is set to the Connect image, setting dispatcher image as an extra arg
 # hardcode connect to use a ref that works in ephemeral
-EXTRA_DEPLOY_ARGS="--set-image-tag ${IMAGE_DISPATCHER}=${IMAGE_TAG} --set-template-ref ${CONNECT_COMPONENT_NAME}=709963354a31225591dd612f15c670a14ddf3c99"
+EXTRA_DEPLOY_ARGS="--set-image-tag ${IMAGE_DISPATCHER}=${IMAGE_TAG} --set-template-ref ${CONNECT_COMPONENT_NAME}=${GIT_COMMIT}"
 
 # Deploy to an ephemeral environment
 source $CICD_ROOT/deploy_ephemeral_env.sh
@@ -48,7 +48,7 @@ bonfire deploy playbook-dispatcher cloud-connector \
     --set-template-ref ${COMPONENT_NAME}=${GIT_COMMIT} \
     --set-image-tag ${IMAGE_DISPATCHER}=${IMAGE_TAG} \
     --set-image-tag ${IMAGE_CONNECT}=${IMAGE_TAG} \
-    --set-template-ref ${CONNECT_COMPONENT_NAME}=047e256da507f29d0e0ae803a4b1d688eb74a2cb \
+    --set-template-ref ${CONNECT_COMPONENT_NAME}=${GIT_COMMIT} \
     --namespace ${NAMESPACE} \
     --timeout ${DEPLOY_TIMEOUT} \
     --set-parameter playbook-dispatcher/CLOUD_CONNECTOR_IMPL=impl