diff --git a/Dockerfile b/rhel8.Dockerfile
similarity index 78%
rename from Dockerfile
rename to rhel8.Dockerfile
index 84f1388d1..d51137c27 100644
--- a/Dockerfile
+++ b/rhel8.Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi8/go-toolset@sha256:be796155c0908cd48375bf1f7150036bcd3ad415dfb6cae135f1cf184d61964c AS builder
+FROM registry.access.redhat.com/ubi8/go-toolset:1.22 AS builder
 
 ENV S2I_GIT_VERSION="1.5.0" \
     S2I_GIT_MAJOR="1" \
@@ -11,7 +11,7 @@ COPY . .
 RUN CGO_ENABLED=1 GO111MODULE=on go build -a -mod=vendor -ldflags="-s -w" -tags="strictfipsruntime exclude_graphdriver_btrfs" -o /tmp/s2i ./cmd/s2i
 
 
-FROM registry.access.redhat.com/ubi8@sha256:37cdac4ec130a64050d6df4e1f2ef3f53868bea55d11f623d141f139ee342bd8
+FROM registry.redhat.io/ubi8/ubi-minimal:8.10
 
 COPY --from=builder /tmp/s2i /usr/local/bin/s2i
 
@@ -23,7 +23,7 @@ LABEL \
     name="source-to-image/source-to-image" \
     description="Source-to-Image is a builder image" \
     summary="Source-to-Image is a builder image" \
-    version="1.5.0" \
+    version="1.6.0" \
     vendor="Red Hat, Inc." \
     com.redhat.component="source-to-image-container" \
     maintainer="openshift-builds@redhat.com" \
diff --git a/rhel9.Dockerfile b/rhel9.Dockerfile
new file mode 100644
index 000000000..bb0cb2d22
--- /dev/null
+++ b/rhel9.Dockerfile
@@ -0,0 +1,33 @@
+FROM registry.access.redhat.com/ubi8/go-toolset:1.22 AS builder
+ENV S2I_GIT_VERSION="1.5.0" \
+    S2I_GIT_MAJOR="1" \
+    S2I_GIT_MINOR="5"
+
+ENV GOEXPERIMENT=strictfipsruntime
+
+COPY . .
+
+RUN CGO_ENABLED=1 GO111MODULE=on go build -a -mod=vendor -ldflags="-s -w" -tags="strictfipsruntime exclude_graphdriver_btrfs" -o /tmp/s2i ./cmd/s2i
+
+
+FROM registry.redhat.io/ubi9/ubi-minimal:9.6
+
+COPY --from=builder /tmp/s2i /usr/local/bin/s2i
+
+USER 1001
+
+ENTRYPOINT [ "/usr/local/bin/s2i" ]
+
+LABEL \
+    name="source-to-image/source-to-image-rhel9" \
+    description="Source-to-Image is a builder image" \
+    summary="Source-to-Image is a builder image" \
+    version="1.6.0" \
+    vendor="Red Hat, Inc." \
+    com.redhat.component="source-to-image-container" \
+    maintainer="openshift-builds@redhat.com" \
+    io.k8s.description="Source-to-Image is a builder image" \
+    io.k8s.display-name="Source-to-Image" \
+    io.openshift.tags="source-to-image,s2i" \
+    io.openshift.maintainer.product="OpenShift Container Platform" \
+    io.openshift.maintainer.component="Source-to-Image"