diff --git a/.circleci/config.yml b/.circleci/config.yml
index a111ea967..943b93a76 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,7 +10,7 @@ references:
 executors:
   go:
     docker:
-      - image: docker.mirror.hashicorp.services/circleci/golang:1.16
+      - image: docker.mirror.hashicorp.services/cimg/go:1.16
     environment:
       CONSUL_VERSION: 1.7.2
       GOMAXPROCS: 4
diff --git a/.go-version b/.go-version
index c807441cf..a23207367 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.16.3
+1.16.4