diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9dfabe5e..a31d78d0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,7 +17,7 @@ aliases:
     - image: dockereng/kube-compose-ci-golang
       auth: *docker-login
   public-golang: &public-golang
-    - image: circleci/golang:1.13.0
+    - image: circleci/golang:1.16
       user: root
 
   e2e-kind-steps: &e2e-kind-steps
diff --git a/docker.Makefile b/docker.Makefile
index fcc25677..267b4156 100644
--- a/docker.Makefile
+++ b/docker.Makefile
@@ -1,8 +1,8 @@
 include common.mk
 
-export BUILD_BASE_IMAGE = golang:1.13.0-alpine3.10
-export TEST_BASE_IMAGE = golang:1.13.0
-export RUN_BASE_IMAGE = alpine:3.10.2
+export BUILD_BASE_IMAGE = golang:1.16.13-alpine3.14
+export TEST_BASE_IMAGE = golang:1.16.13
+export RUN_BASE_IMAGE = alpine:3.14
 export KUBERNETES_VERSION ?= 1.16.1
 KIND_VERSION ?= 0.5.1
 IMAGES = ${IMAGE_REPO_PREFIX}controller ${IMAGE_REPO_PREFIX}controller-coverage ${IMAGE_REPO_PREFIX}e2e-tests ${IMAGE_REPO_PREFIX}e2e-benchmark ${IMAGE_REPO_PREFIX}api-server ${IMAGE_REPO_PREFIX}api-server-coverage ${IMAGE_REPO_PREFIX}installer