diff --git a/Dockerfile.ignition-manifests-and-kubeconfig-generate b/Dockerfile.ignition-manifests-and-kubeconfig-generate
index 48d1981..9dde7b7 100644
--- a/Dockerfile.ignition-manifests-and-kubeconfig-generate
+++ b/Dockerfile.ignition-manifests-and-kubeconfig-generate
@@ -6,7 +6,7 @@ FROM quay.io/ocpmetal/bm-inventory:latest AS inventory
 
 
 FROM centos:8
-RUN dnf install -y libvirt-libs python3 findutils && \
+RUN dnf install -y libvirt-libs python3 findutils wget && \
    yum clean all && \
    rm -rf /var/cache/yum
 
@@ -20,14 +20,21 @@ RUN find /build/pip/ -name 'setup.py' -exec dirname {} \; | xargs pip3 install
 RUN rm /tmp/*requirements.txt
 
 ARG WORK_DIR=/data
+ARG TAR_DIR=/tar
+ARG CLIENT_PACKAGE_LOCATION=https://mirror.openshift.com/pub/openshift-v4/clients/ocp/latest
+ARG CLIENT_PACKAGE_NAME=openshift-client-linux.tar.gz
 
 RUN mkdir $WORK_DIR
 RUN chmod 777 $WORK_DIR
+RUN mkdir $TAR_DIR
+RUN wget --directory-prefix=$TAR_DIR $CLIENT_PACKAGE_LOCATION/$CLIENT_PACKAGE_NAME
+RUN tar -C $TAR_DIR  -xvzf $TAR_DIR/$CLIENT_PACKAGE_NAME
 
 RUN mkdir /root/.docker
 
 # [TODO] - change this line to use openshift-installer from the release, once we are ready
 COPY --from=0 /root/installer/openshift-install $WORK_DIR
+RUN cp $TAR_DIR/oc $WORK_DIR/oc
 #COPY --from=0 /root/oc/oc $WORK_DIR
 COPY ./render_files.py $WORK_DIR
 COPY ./utils.py $WORK_DIR
diff --git a/installer_dir/test_env.txt b/installer_dir/test_env.txt
new file mode 100644
index 0000000..dc44641
--- /dev/null
+++ b/installer_dir/test_env.txt
@@ -0,0 +1 @@
+OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE=quay.io/openshift-release-dev/ocp-release@sha256:029d56f7cf4a0de420f84f9178e030a3cfb83a480f3d086a7f5ed31b62bc08d0