diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml
index ffe441fbd..d5ecc1817 100644
--- a/.gitlab/.gitlab-ci.yml
+++ b/.gitlab/.gitlab-ci.yml
@@ -4,7 +4,7 @@ include:
   - template: Security/Dependency-Scanning.gitlab-ci.yml
 
 variables:
-  GOVERSION: "1.16.13"
+  GOVERSION: "1.17.7"
 
 stages:
   - lint
diff --git a/Dockerfile-clustertests b/Dockerfile-clustertests
index be67afe75..a7a441112 100644
--- a/Dockerfile-clustertests
+++ b/Dockerfile-clustertests
@@ -1,7 +1,7 @@
 # This Dockerfile is used for cluster testing - it produces a much larger image
 # and includes all of Go as well as some utilities.
 
-FROM golang:1.16
+FROM golang:1.17
 
 LABEL maintainer "dev@pilosa.com"
 
diff --git a/Dockerfile-clustertests-client b/Dockerfile-clustertests-client
index 2fb8cedf9..8e845a9f6 100644
--- a/Dockerfile-clustertests-client
+++ b/Dockerfile-clustertests-client
@@ -1,7 +1,7 @@
 # This Dockerfile is used for cluster testing - it produces a much larger image
 # and includes all of Go as well as some utilities.
 
-FROM golang:1.16
+FROM golang:1.17
 
 LABEL maintainer "dev@pilosa.com"
 
diff --git a/Makefile b/Makefile
index a35dc42cd..fbd33204c 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ BUILD_TIME := $(shell date -u +%FT%T%z)
 SHARD_WIDTH = 20
 COMMIT := $(shell git describe --exact-match >/dev/null 2>&1 || git rev-parse --short HEAD)
 LDFLAGS="-X github.com/molecula/featurebase/v3.Version=$(VERSION) -X github.com/molecula/featurebase/v3.BuildTime=$(BUILD_TIME) -X github.com/molecula/featurebase/v3.Variant=$(VARIANT) -X github.com/molecula/featurebase/v3.Commit=$(COMMIT) -X github.com/molecula/featurebase/v3.TrialDeadline=$(TRIAL_DEADLINE)"
-GO_VERSION=1.16.10
+GO_VERSION=1.17.7
 DOCKER_BUILD= # set to 1 to use `docker-build` instead of `build` when creating a release
 BUILD_TAGS += shardwidth$(SHARD_WIDTH)
 TEST_TAGS = roaringparanoia