diff --git a/build/Dockerfile.buildenv b/build/Dockerfile.buildenv
index 278fa782df..c98ca8a154 100644
--- a/build/Dockerfile.buildenv
+++ b/build/Dockerfile.buildenv
@@ -1,3 +1,3 @@
-FROM golang:1.15.5
+FROM golang:1.16.7
 
 RUN apt-get update && apt-get install -y make git apt-transport-https ca-certificates curl software-properties-common build-essential zip xmlsec1 jq
diff --git a/go.mod b/go.mod
index 9ef0fafdb4..7fca8e803f 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/mattermost/mattermost-server/v6
 
-go 1.15
+go 1.16
 
 require (
 	code.sajari.com/docconv v1.1.1-0.20210427001343-7b3472bc323a