diff --git a/Dockerfile b/Dockerfile
index 7410b85850573d95e451f49f3a9905bb965065dd..71c836ec9ade1dd66b7e82acb4dba8eae2b9b0c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,11 +2,15 @@ ARG BASE_REGISTRY=registry1.dso.mil
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
 ARG BASE_TAG=8.4
 
-FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as build
+ARG GOLANG_IMAGE=ironbank/google/golang/golang-1.16
+ARG GOLANG_TAG=1.16.7
 
+FROM ${BASE_REGISTRY}/${GOLANG_IMAGE}:${GOLANG_TAG} as build
+
+USER root
 COPY libgit2.tar.gz /
 
-RUN dnf install -y cmake gcc golang make openssl-devel python3 && \
+RUN dnf install -y cmake gcc make openssl-devel python3 && \
     mkdir -p /usr/local/src/libgit2/build && \
     tar -zxf /libgit2.tar.gz -C /usr/local/src/libgit2 --strip-components=1 && \
     cd /usr/local/src/libgit2/build && \
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index d997691e8e079c1874513e570a01f91364e5695b..408f280f05fef0217605a92c4c1f718ce28bf064 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -15,6 +15,8 @@ tags:
 args:
   BASE_IMAGE: "redhat/ubi/ubi8"
   BASE_TAG: "8.4"
+  GOLANG_IMAGE: "google/golang/golang-1.16"
+  GOLANG_TAG: "1.16.7"
 
 # Docker image labels
 labels: