diff --git a/docker/Dockerfile b/docker/Dockerfile
index e0c7fe7..60c394a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -34,7 +34,7 @@ USER ${USER_UID}
 
 #############################################################
 
-FROM registry.access.redhat.com/ubi7/ubi-minimal:7.9 AS builder-ubi
+FROM redhat/ubi8-minimal:8.9 AS builder-ubi
 
 # Update the builder packages and create user
 RUN microdnf update && rm -rf /var/cache/yum && \
@@ -43,49 +43,6 @@ RUN microdnf update && rm -rf /var/cache/yum && \
 
 #############################################################
 
-FROM registry.access.redhat.com/ubi7/ubi-minimal:7.9 as cass-config-builder-ubi
-
-LABEL maintainer="DataStax, Inc <info@datastax.com>"
-LABEL name="cass-config-builder"
-LABEL vendor="DataStax, Inc"
-LABEL release="1.0.0"
-LABEL summary="Configuration templating engine for Apache Cassandra®."
-LABEL description="Configuration templating engine for Apache Cassandra®. Powers the configuration of containers deployed via the DataStax Kubernetes Operator for Apache Cassandra."
-
-# Update base packages
-RUN microdnf update && \
-    rm -rf /var/cache/yum && \
-    microdnf install java-1.8.0-openjdk-headless && \
-    microdnf clean all
-
-# Copy user accounts information
-COPY --from=builder-ubi /etc/passwd /etc/passwd
-COPY --from=builder-ubi /etc/shadow /etc/shadow
-COPY --from=builder-ubi /etc/group /etc/group
-COPY --from=builder-ubi /etc/gshadow /etc/gshadow
-
-# Install the uber jar
-COPY --from=builder --chown=cassandra:root --chmod=444 build/docker/*.jar /usr/local/bin/
-
-# Install definition files
-COPY --from=builder --chown=cassandra:root --chmod=444 build/docker/definitions /definitions
-
-COPY --from=builder --chown=cassandra:root --chmod=555 build/docker/bin/* /usr/local/bin/
-
-COPY --from=builder --chown=cassandra:root --chmod=444 build/docker/LICENSE /licenses/
-
-# Fix permissions
-RUN chown cassandra:root -Rv /usr/local/bin/* && \
-    chmod -Rv g+x /usr/local/bin
-
-USER cassandra:root
-
-ENV PATH=$PATH:/usr/local/bin
-
-ENTRYPOINT ["/usr/local/bin/entrypoint"]
-
-#############################################################
-
 # Build the UBI8 image
 FROM redhat/ubi8-minimal:8.9 as cass-config-builder-ubi-8
 LABEL maintainer="DataStax, Inc <info@datastax.com>"