diff --git a/.circleci/config.yml b/.circleci/config.yml
index f9fe22c40..08d280816 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -33,7 +33,7 @@ default_environment: &default_environment
 executors:
   golang:
     docker:
-      - image: circleci/golang:1.15.2
+      - image: cimg/go:1.16.4
     working_directory: ~/ipfs/go-ipfs
     environment:
       <<: *default_environment
@@ -60,7 +60,7 @@ executors:
       E2E_IPFSD_TYPE: go
   dockerizer:
     docker:
-      - image: circleci/golang:1.15.2
+      - image: cimg/go:1.16.4
     environment:
       IMAGE_NAME: ipfs/go-ipfs
       WIP_IMAGE_TAG: wip
diff --git a/Dockerfile b/Dockerfile
index 113c6599d..9d70b0f63 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Note: when updating the go minor version here, also update the go-channel in snap/snapcraft.yml
-FROM golang:1.15.2-buster
+FROM golang:1.16.3-buster
 LABEL maintainer="Steven Allen <steven@stebalien.com>"
 
 # Install deps