diff --git a/docker/ubi8/Dockerfile-fips b/docker/ubi8/Dockerfile-fips
index 8c6307498..5c74bd6f3 100644
--- a/docker/ubi8/Dockerfile-fips
+++ b/docker/ubi8/Dockerfile-fips
@@ -57,37 +57,6 @@ RUN dnf install -y \
     python3 \
     && dnf clean all
 
-# Install GNU M4
-RUN cd /usr/local/src \
-    && wget https://ftp.gnu.org/gnu/m4/m4-1.4.18.tar.gz \
-    && tar -xzf m4-1.4.18.tar.gz \
-    && cd m4-1.4.18 \
-    && ./configure \
-    && make \
-    && make install
-
-RUN cd /usr/local/src \
-    && wget https://ftp.gnu.org/gnu/bison/bison-3.7.4.tar.gz \
-    && tar -xzf bison-3.7.4.tar.gz  \
-    && cd bison-3.7.4 \
-    && ./configure \
-    && make \
-    && make install
-
-# Verify bison installation
-RUN bison --version
-  
-# Download and build glibc
-RUN cd /usr/local/src \
-    && wget https://ftp.gnu.org/gnu/libc/glibc-2.33.tar.gz \
-    && tar -xzf glibc-2.33.tar.gz \
-    && cd glibc-2.33 \
-    && mkdir build \
-    && cd build \
-    && ../configure --prefix=/opt/glibc-2.33 \
-    && make \
-    && make install
-
 
 #RUN yum -y remove tar vim vi
 RUN echo '#!/usr/bin/env bash' > /usr/local/bin/hal && \
@@ -101,26 +70,12 @@ RUN wget https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VER
 RUN curl -f -o  /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3-us-west-2.amazonaws.com/${KUBECTL_RELEASE}/${AWS_BINARY_RELEASE_DATE}/bin/linux/amd64/aws-iam-authenticator && \
     chmod +x /usr/local/bin/aws-iam-authenticator
 
-# Download and build glibc
-RUN cd /usr/local/src \
-    && wget https://ftp.gnu.org/gnu/libc/glibc-2.33.tar.gz \
-    && tar -xzf glibc-2.33.tar.gz \
-    && cd glibc-2.33 \
-    && mkdir build \
-    && cd build \
-    && ../configure --prefix=/opt/glibc-2.33 \
-    && make \
-    && make install
-
-# Set up environment to use the newly installed glibc
-ENV LD_LIBRARY_PATH=/opt/glibc-2.33/lib:$LD_LIBRARY_PATH \
-    PATH=/opt/glibc-2.33/bin:$PATH
 
 ## FOR OC binaries 
 RUN yum update glibc
-RUN wget https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest/openshift-client-linux.tar.gz
-RUN tar -xzf openshift-client-linux.tar.gz
-RUN rm -f openshift-client-linux.tar.gz
+RUN wget https://mirror.openshift.com/pub/openshift-v4/clients/ocp/4.1.0/openshift-client-linux-4.1.0.tar.gz
+RUN tar -xzf openshift-client-linux-4.1.0.tar.gz
+RUN rm -f openshift-client-linux-4.1.0.tar.gz
 RUN mv oc /usr/local/bin/
 
 RUN adduser spinnaker