diff --git a/distribution/Dockerfile-fauxauth b/distribution/Dockerfile-fauxauth
index 24337a6c9..8eba3de25 100644
--- a/distribution/Dockerfile-fauxauth
+++ b/distribution/Dockerfile-fauxauth
@@ -1,10 +1,10 @@
-FROM registry.access.redhat.com/ubi8/go-toolset:latest AS builder
+FROM registry.access.redhat.com/ubi9/go-toolset:latest AS builder
 COPY . .
 ENV GOFLAGS=-mod=vendor
 RUN go install ./cmd/osbuild-mock-openid-provider/
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
-RUN microdnf install python3
+FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
+RUN microdnf install -y python3
 RUN mkdir -p "/usr/libexec/osbuild-composer"
 RUN mkdir -p "/etc/osbuild-composer/"
 
diff --git a/distribution/Dockerfile-ubi b/distribution/Dockerfile-ubi
index f79b1ed76..6c7bac75d 100644
--- a/distribution/Dockerfile-ubi
+++ b/distribution/Dockerfile-ubi
@@ -1,5 +1,5 @@
-FROM registry.access.redhat.com/ubi8/go-toolset:latest AS builder
-# We need to be root to install packages, but ubi8/go-toolset defaults to uid 1001
+FROM registry.access.redhat.com/ubi9/go-toolset:latest AS builder
+# We need to be root to install packages, but ubi9/go-toolset defaults to uid 1001
 USER 0
 # The go package `proglottis/gpgme` a dependency of `containers/image/v5` package
 # uses `libgpgme` so we need to install it and its build dependencies
@@ -9,11 +9,11 @@ COPY . .
 ENV GOFLAGS=-mod=vendor
 RUN go install ./cmd/osbuild-composer/
 
-FROM registry.access.redhat.com/ubi8/go-toolset:latest AS builder2
+FROM registry.access.redhat.com/ubi9/go-toolset:latest AS builder2
 RUN go install github.com/jackc/tern@latest
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
-RUN microdnf install python3 python3-dnf
+FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
+RUN microdnf install -y python3 python3-dnf
 RUN mkdir -p "/usr/libexec/osbuild-composer"
 RUN mkdir -p "/etc/osbuild-composer/"
 RUN mkdir -p "/run/osbuild-composer/"
diff --git a/distribution/Dockerfile-ubi-maintenance b/distribution/Dockerfile-ubi-maintenance
index b1c054a5a..38e4d7936 100644
--- a/distribution/Dockerfile-ubi-maintenance
+++ b/distribution/Dockerfile-ubi-maintenance
@@ -1,9 +1,9 @@
-FROM registry.access.redhat.com/ubi8/go-toolset:latest AS builder
+FROM registry.access.redhat.com/ubi9/go-toolset:latest AS builder
 COPY . .
 ENV GOFLAGS=-mod=vendor
 RUN go install ./cmd/osbuild-service-maintenance/
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
+FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
 RUN mkdir -p "/usr/libexec/osbuild-composer"
 RUN mkdir -p "/etc/osbuild-composer/"
 COPY --from=builder /opt/app-root/src/go/bin/osbuild-service-maintenance /usr/libexec/osbuild-composer/osbuild-service-maintenance