diff --git a/Dockerfile b/Dockerfile
index 8b137891791fe96927ad78e64b0aad7bded08bdc..7d28d8806389a20bc92058edd684d30ba2af94e6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1 +1,84 @@
+ARG BASE_REGISTRY=registry1.dso.mil
+ARG BASE_IMAGE=redhat/ubi/ubi8
+ARG BASE_TAG=8.3
 
+
+
+#change this for deployment!!!
+
+FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
+    
+
+RUN yum -y update \
+  && yum clean all
+
+
+
+#TO fix CCE-80935-0
+#RUN yum -y install crypto-policies
+#RUN  yum -y install gnutls-utils 
+
+# for https://access.redhat.com/security/cve/CVE-2021-23240
+RUN rm -rf /usr/libexec/sudo/sesh 
+
+
+ARG CODESONAR_PACKAGE=codesonar-6.1p0.20210802-x86_64-pc-linux.tar.gz  
+ARG CODESONAR_HOME=/opt/codesonar-6.1p0
+COPY ["${CODESONAR_PACKAGE}", "/opt"]
+RUN tar -zxvf /opt/${CODESONAR_PACKAGE} -C /opt
+RUN rm -rf /opt/${CODESONAR_PACKAGE}
+RUN ln -s ${CODESONAR_HOME} /opt/codesonar
+RUN useradd -ms /bin/bash codesonar
+
+# Remove older software versions no longer needed
+RUN rm -rf ${CODESONAR_HOME}/third-party/postgresql-8.3
+RUN rm -rf ${CODESONAR_HOME}/third-party/postgresql-8.4
+RUN rm -rf ${CODESONAR_HOME}/third-party/postgresql-9.0
+RUN rm -rf ${CODESONAR_HOME}/third-party/postgresql-9.1
+RUN rm -rf ${CODESONAR_HOME}/third-party/postgresql-9.2
+RUN rm -rf ${CODESONAR_HOME}/third-party/postgresql-9.3
+RUN rm -rf ${CODESONAR_HOME}/third-party/postgresql-9.6
+
+RUN rm -rf ${CODESONAR_HOME}/csonar-eclipse/com.grammatech.codesonar.jar
+RUN rm -rf ${CODESONAR_HOME}/csonar-eclipse/eclipse_tests/CodeSonarTest_1.0.0.jar
+RUN rm -rf ${CODESONAR_HOME}/csurf/lib/codesonarj-runtimes/androidAPI23/android-6.0.1_r1.jar
+
+RUN rm -rf ${CODESONAR_HOME}/third-party/python/inst/lib/python3.9/site-packages/urllib3* ${CODESONAR_HOME}/third-party/python/instmt/lib/python3.9/site-packages/urllib3*
+
+
+#Remove unused certs
+RUN rm -rf /opt/codesonar-6.1p0/third-party/python/inst/lib/python3.9/test
+RUN rm -rf /opt/codesonar-6.1p0/third-party/python/instmt/lib/python3.9/test
+RUN rm /opt/codesonar-6.1p0/third-party/python/inst/lib/python3.9/site-packages/slapdtest/certs/client.key
+RUN rm /opt/codesonar-6.1p0/third-party/python/inst/lib/python3.9/site-packages/slapdtest/certs/server.key
+RUN rm /opt/codesonar-6.1p0/third-party/python/instmt/lib/python3.9/site-packages/slapdtest/certs/client.key
+RUN rm /opt/codesonar-6.1p0/third-party/python/instmt/lib/python3.9/site-packages/slapdtest/certs/server.key
+
+
+RUN mkdir /home/codesonar/hub \
+    && chown codesonar.codesonar /home/codesonar/hub
+
+#The following is needed as RH8 does not have libnsl.so.1
+RUN ln -s /usr/lib64/libnsl.so.2 /usr/lib64/libnsl.so.1
+
+COPY scripts/* /opt/
+RUN chmod +x /opt/codesonar-exec.sh && \
+    chmod +x /opt/codesonar-health-check.sh
+
+VOLUME [ /home/codesonar ]
+
+HEALTHCHECK --interval=30s --timeout=30s --start-period=180s --retries=3 CMD /opt/codesonar-health-check.sh
+
+
+#adjust some options
+RUN rm /opt/codesonar/UNACCEPTED_LICENSE.txt
+RUN touch /opt/codesonar/TELEMETRY_DISABLED
+
+
+
+
+USER codesonar
+WORKDIR /home/codesonar
+
+EXPOSE 7340/tcp
+CMD ["sh", "-c", "/opt/codesonar-exec.sh"]