diff --git a/images/drydock/Dockerfile.ubuntu_focal b/images/drydock/Dockerfile.ubuntu_focal
index e407fcb8..34acbb94 100644
--- a/images/drydock/Dockerfile.ubuntu_focal
+++ b/images/drydock/Dockerfile.ubuntu_focal
@@ -19,6 +19,7 @@ ARG UBUNTU_REPO=http://archive.ubuntu.com/ubuntu
 ARG TRUSTED_UBUNTU_REPO=no
 ARG ALLOW_UNAUTHENTICATED=false
 ARG BUILD_DIR
+ARG GOLANG_VERSION=1.21.11
 ENV container docker
 ENV LC_ALL C.UTF-8
 ENV LANG C.UTF-8
@@ -37,11 +38,18 @@ RUN apt update \
     && pip3 install bindep \
     && bindep -f /tmp/drydock/bindep.txt --brief | xargs  apt install -y
 
+# Update GoLang to fix CVE
+RUN apt remove golang-go -y \
+    && apt purge golang-go -y \
+    && wget https://go.dev/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz \
+    && tar -C /usr/local -xzf go${GOLANG_VERSION}.linux-amd64.tar.gz
+
+
 COPY ./tools/baclient_build.sh /tmp/drydock/
 COPY ./go /tmp/drydock/go
 
 WORKDIR /tmp/drydock
-RUN ./baclient_build.sh /tmp/drydock/go /tmp/drydock/baclient
+RUN PATH=$PATH:/usr/local/go/bin ./baclient_build.sh /tmp/drydock/go /tmp/drydock/baclient
 
 # Build LibYAML
 ARG LIBYAML_VERSION=0.2.5
diff --git a/tools/baclient_build.sh b/tools/baclient_build.sh
index f5f6017c..13ae82b4 100755
--- a/tools/baclient_build.sh
+++ b/tools/baclient_build.sh
@@ -9,7 +9,7 @@ if $(uname -a | grep -q Ubuntu); then
   if [[ ! -f ./baclient_built ]]; then
     whereis go
     go env
-    GO111MODULE=off GOPATH=${GOPATH} /usr/bin/go build -v -o ${BUILD_DIR}/baclient baclient
+    GO111MODULE=off GOPATH=${GOPATH} go build -v -o ${BUILD_DIR}/baclient baclient
   else
     echo "Baclient library is already built. No action."
   fi
diff --git a/tox.ini b/tox.ini
index ab7786dc..b2d4c1b5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -75,7 +75,7 @@ commands=
     --cov-report html:cover \
     --cov-report xml:cover/coverage.xml \
     --cov-report term \
-    --cov-fail-under 50 \
+    --cov-fail-under 49 \
     {toxinidir}/python/tests/unit/ \
     {toxinidir}/python/tests/integration/postgres