diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2a82c84..d0142ce 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -9,7 +9,7 @@ on: [push, pull_request]
 jobs:
   unit-tests:
     name: Unit tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
diff --git a/build/Dockerfile b/build/Dockerfile
index 0cab30b..a0e4a0b 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,8 +1,8 @@
 # --- Build the bridge
-FROM registry.access.redhat.com/ubi8 AS builder
+FROM registry.access.redhat.com/ubi9 AS builder
 
 # dependencies for qpid-proton-c
-COPY build/repos/opstools.repo /etc/yum.repos.d/opstools.repo
+COPY build/repos/centos9-caracal.repo /etc/yum.repos.d/centos9-caracal.repo
 
 # redhat-rpm-config is required to provide hardening compiling instructions
 # (such as /usr/lib/rpm/redhat/redhat-hardened-cc1) even though we're not
@@ -11,19 +11,19 @@ RUN dnf install qpid-proton-c-devel --setopt=tsflags=nodocs -y && \
         dnf install gcc make redhat-rpm-config -y && \
         dnf clean all
 
-ENV D=/home/bridge
+ENV SGBRIDGE_DIR=/home/bridge
 
-WORKDIR $D
-COPY . $D/
+WORKDIR $SGBRIDGE_DIR
+COPY . $SGBRIDGE_DIR/
 
 RUN     make && \
         mv bridge /tmp/
 
 # --- end build, create bridge runtime layer ---
-FROM registry.access.redhat.com/ubi8
+FROM registry.access.redhat.com/ubi9
 
 # dependencies for qpid-proton-c
-COPY build/repos/opstools.repo /etc/yum.repos.d/opstools.repo
+COPY build/repos/centos9-caracal.repo /etc/yum.repos.d/centos9-caracal.repo
 
 RUN dnf install qpid-proton-c --setopt=tsflags=nodocs -y && \
         dnf clean all && \
diff --git a/build/repos/centos9-caracal.repo b/build/repos/centos9-caracal.repo
new file mode 100644
index 0000000..f00fa33
--- /dev/null
+++ b/build/repos/centos9-caracal.repo
@@ -0,0 +1,18 @@
+# CentOS 9 OpenStack repos
+#
+# Please see https://trunk.rdoproject.org/ and
+# https://trunk.rdoproject.org/centos9-caracal/report.html for more information
+
+[delorean-caracal-testing]
+name=dlrn-caracal-testing
+baseurl=https://trunk.rdoproject.org/centos9-caracal/deps/latest/
+enabled=1
+gpgcheck=0
+module_hotfixes=1
+
+[centos9-opstools]
+name=centos9-opstools
+baseurl=http://mirror.stream.centos.org/SIGs/9-stream/opstools/$basearch/collectd-5/
+enabled=1
+gpgcheck=0
+module_hotfixes=1
diff --git a/build/repos/opstools.repo b/build/repos/opstools.repo
deleted file mode 100644
index 2d95a92..0000000
--- a/build/repos/opstools.repo
+++ /dev/null
@@ -1,19 +0,0 @@
-# CentOS-OpsTools.repo
-#
-# Please see http://wiki.centos.org/SpecialInterestGroup/OpsTools for more
-# information
-
-[centos-opstools-testing]
-name=CentOS-OpsTools - testing repo
-baseurl=https://buildlogs.centos.org/centos/$releasever-stream/opstools/$basearch/collectd-5/
-gpgcheck=0
-enabled=0
-
-[centos-opstools]
-name=CentOS-OpsTools - collectd
-#mirrorlist=http://mirrorlist.centos.org/?arch=$basearch&release=$releasever-stream&repo=opstools-collectd-5
-baseurl=http://vault.centos.org/$releasever-stream/opstools/$basearch/collectd-5/
-gpgcheck=0
-enabled=1
-skip_if_unavailable=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools