diff --git a/.gitignore b/.gitignore
index e110914f3..1df37c409 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 /.atom-build.yml
 /.project
 /.vagrant
+/.idea
 cmd/s2i/debug
 *~
 
diff --git a/Dockerfile b/Dockerfile
index c5f189199..7f97aab2a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.redhat.io/ubi9/go-toolset:1.21.13 AS builder
+FROM registry.redhat.io/ubi8/go-toolset:1.21 AS builder
 
 ENV S2I_GIT_VERSION="" \
     S2I_GIT_MAJOR="" \
@@ -12,7 +12,7 @@ RUN CGO_ENABLED=0 go build -a -ldflags="-s -w" -o /tmp/s2i ./cmd/s2i
 # Runner Image
 #
 
-FROM registry.redhat.io/ubi9/ubi-minimal:9.4
+FROM registry.redhat.io/ubi8/ubi-minimal:8.10
 
 COPY --from=builder /tmp/s2i /usr/local/bin/s2i