diff --git a/.circleci/config.yml b/.circleci/config.yml
index 65d5c39165..a38b6de482 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,7 +10,7 @@ jobs:
     - run: make check-lint
   e2e:
     docker:
-    - image: circleci/golang:1.17 # If you update this, update it in the Makefile too
+    - image: cimg/go:1.17.0 # If you update this, update it in the Makefile too
       environment:
         # This version of TF will be downloaded before Atlantis is started.
         # We do this instead of setting --default-tf-version because setting
@@ -50,7 +50,7 @@ jobs:
   # Build and push Docker tag.
   docker_tag:
     docker:
-    - image: circleci/golang:1.17 # If you update this, update it in the Makefile too
+    - image: cimg/go:1.17.0 # If you update this, update it in the Makefile too
     steps:
     - checkout
     - run: make build-service
diff --git a/Makefile b/Makefile
index 7b06fe573c..a23c893ec1 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@ dist: ## Package up everything in static/ using go-bindata-assetfs so it can be
 	rm -f server/static/bindata_assetfs.go && go-bindata-assetfs -pkg static -prefix server server/static/... && mv bindata_assetfs.go server/static
 
 release: ## Create packages for a release
-	docker run -v $$(pwd):/go/src/github.com/runatlantis/atlantis circleci/golang:1.17 sh -c 'cd /go/src/github.com/runatlantis/atlantis && scripts/binary-release.sh'
+	docker run -v $$(pwd):/go/src/github.com/runatlantis/atlantis cimg/go:1.17.0 sh -c 'cd /go/src/github.com/runatlantis/atlantis && scripts/binary-release.sh'
 
 fmt: ## Run goimports (which also formats)
 	goimports -w $$(find . -type f -name '*.go' ! -path "./vendor/*" ! -path "./server/static/bindata_assetfs.go" ! -path "**/mocks/*")
diff --git a/testing/Dockerfile b/testing/Dockerfile
index 4ebeaab04e..b7bc2184ab 100644
--- a/testing/Dockerfile
+++ b/testing/Dockerfile
@@ -2,7 +2,7 @@
 # We need terraform installed for our full test suite so it installs that.
 # It's updated by running make build-testing-image which will also push a new
 # image.
-FROM circleci/golang:1.17
+FROM cimg/go:1.17.0
 
 # Install Terraform
 ENV TERRAFORM_VERSION=1.0.4