diff --git a/.travis.yml b/.travis.yml
index e99d100..0fe0a3e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ sudo: required
 language: go
 
 go:
-  - "1.15.14"
+  - "1.16.7"
 
 services:
   - docker
diff --git a/Dockerfile-server b/Dockerfile-server
index c93d481..a6c6f34 100644
--- a/Dockerfile-server
+++ b/Dockerfile-server
@@ -13,9 +13,9 @@
 # limitations under the License.
 
 ARG BASE_IMAGE=registry.redhat.io/ubi8/ubi-minimal
-ARG BASE_TAG=8.4-212
+ARG BASE_TAG=8.5-204
 ARG BUILDER_IMAGE=registry.redhat.io/ubi8/go-toolset
-ARG BUILDER_TAG=1.15.14-18
+ARG BUILDER_TAG=1.16.7-5
 ARG GO_WORKDIR=/opt/app-root/src/go/src/github.com/ibm-messaging/mq-container
 ARG MQ_URL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/9.2.4.0-IBM-MQ-Advanced-for-Developers-Non-Install-LinuxX64.tar.gz"
 ###############################################################################
@@ -37,6 +37,7 @@ RUN mkdir /opt/mqm \
   && INSTALL_SDK=1 install-mq.sh \
   && chown -R 1001:root /opt/mqm/*
 WORKDIR $GO_WORKDIR/
+COPY go.mod go.sum ./
 COPY cmd/ ./cmd
 COPY internal/ ./internal
 COPY pkg/ ./pkg
diff --git a/install-build-deps.sh b/install-build-deps.sh
index 8168d6c..b8d653f 100755
--- a/install-build-deps.sh
+++ b/install-build-deps.sh
@@ -22,5 +22,5 @@ set -ex
 sudo curl -Lo /usr/local/bin/dep https://github.com/golang/dep/releases/download/v0.5.1/dep-linux-$ARCH
 sudo chmod +x /usr/local/bin/dep
 
-go get -u golang.org/x/lint/golint
+go install golang.org/x/lint/golint@latest
 curl -sfL https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s -- -b $GOPATH/bin 2.0.0 || echo "Gosec not installed. Platform may not be supported."