diff --git a/images/ska-tango-images-tango-cpp/Dockerfile b/images/ska-tango-images-tango-cpp/Dockerfile
index b97603cfb95632b807a5e80b89eb11682c4c37e1..a1085e7d877b72747c9514fd5ac0ecab49b464e1 100644
--- a/images/ska-tango-images-tango-cpp/Dockerfile
+++ b/images/ska-tango-images-tango-cpp/Dockerfile
@@ -4,8 +4,8 @@
 # binaries.
 #
 ARG CAR_OCI_REGISTRY_HOST
-ARG BUILD_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-dependencies:9.3.10"
-ARG BASE_IMAGE="ubuntu:20.04"
+ARG BUILD_IMAGE="${CAR_OCI_REGISTRY_HOST}/ska-tango-images-tango-dependencies:9.3.5"
+ARG BASE_IMAGE="ubuntu:22.04"
 FROM $BUILD_IMAGE as buildenv
 
 ENV DEBIAN_FRONTEND=noninteractive
diff --git a/images/ska-tango-images-tango-dependencies/Dockerfile b/images/ska-tango-images-tango-dependencies/Dockerfile
index 86115a14a753920eee834559bfb3de0d0cd645c5..86047817eedb80390cd524888483b1dc7638f866 100644
--- a/images/ska-tango-images-tango-dependencies/Dockerfile
+++ b/images/ska-tango-images-tango-dependencies/Dockerfile
@@ -3,7 +3,7 @@
 # intermediate image, then creates a release image containing the compiled
 # binaries.
 #
-ARG BASE_IMAGE="ubuntu:20.04"
+ARG BASE_IMAGE="ubuntu:22.04"
 FROM $BASE_IMAGE as buildenv
 
 ENV ZEROMQ_DOWNLOAD_URL=https://github.com/zeromq/libzmq/archive/v4.3.4.tar.gz