diff --git a/Dockerfile b/Dockerfile
index 38816e4..4c55f6f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@
 # Dockerfile for building HMS bss.
 
 # Build base just has the packages installed we need.
-FROM arti.dev.cray.com/baseos-docker-master-local/golang:1.14-alpine3.12 AS build-base
+FROM arti.dev.cray.com/baseos-docker-master-local/golang:1.16-alpine3.13 AS build-base
 
 RUN set -ex \
     && apk update \
@@ -32,6 +32,8 @@ RUN set -ex \
 # Base copies in the files we need to test/build.
 FROM build-base AS base
 
+RUN go env -w GO111MODULE=auto
+
 # Copy all the necessary files to the image.
 COPY cmd $GOPATH/src/stash.us.cray.com/HMS/hms-bss/cmd
 COPY pkg $GOPATH/src/stash.us.cray.com/HMS/hms-bss/pkg
@@ -60,8 +62,8 @@ FROM base AS builder
 RUN set -ex && go build -v -i -o /usr/local/bin/boot-script-service stash.us.cray.com/HMS/hms-bss/cmd/boot-script-service
 
 ### Final Stage ###
-FROM arti.dev.cray.com/baseos-docker-master-local/alpine:3.12
-LABEL maintainer="Cray, Inc."
+FROM arti.dev.cray.com/baseos-docker-master-local/alpine:3.13
+LABEL maintainer="Hewlett Packard Enterprise"
 EXPOSE 27778
 STOPSIGNAL SIGTERM
 
diff --git a/go.mod b/go.mod
index 44eb3f2..0510b99 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module stash.us.cray.com/HMS/hms-bss
 
-go 1.12
+go 1.16
 
 require (
 	github.com/evanphx/json-patch v4.9.0+incompatible