diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7cd235b6..d5a6b202 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,7 +4,7 @@ jobs:
 
   build:
     docker:
-      - image: circleci/golang:1.14.2
+      - image: circleci/golang:1.16.3
     environment:
       GOPATH: /go
     working_directory: /home/circleci/workspace/helmfile
@@ -27,7 +27,7 @@ jobs:
             - .
   image:
     docker:
-    - image: circleci/golang:1.14.2
+    - image: circleci/golang:1.16.3
     working_directory: /home/circleci/workspace/helmfile
     steps:
     - checkout
@@ -44,7 +44,7 @@ jobs:
 
   image_helm3:
     docker:
-    - image: circleci/golang:1.14.2
+    - image: circleci/golang:1.16.3
     working_directory: /home/circleci/workspace/helmfile
     steps:
     - checkout
@@ -63,7 +63,7 @@ jobs:
     environment:
       GOPATH: /go
     docker:
-      - image: circleci/golang:1.14.2
+      - image: circleci/golang:1.16.3
     working_directory: /home/circleci/workspace/helmfile
     steps:
       - checkout
@@ -120,7 +120,7 @@ jobs:
 
   release:
     docker:
-      - image: circleci/golang:1.14.2
+      - image: circleci/golang:1.16.3
     working_directory: /home/circleci/workspace/helmfile
     steps:
     - checkout
@@ -149,7 +149,7 @@ workflows:
             - build
           matrix:
             parameters:
-              helm-version: ["v2.17.0", "v3.4.2"]
+              helm-version: ["v2.17.0", "v3.4.2", "v3.5.4"]
       - release:
           filters:
             branches:
diff --git a/Dockerfile b/Dockerfile
index 00e2cc78..65813f94 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.14.2-alpine3.11 as builder
+FROM golang:1.16.3-alpine3.13 as builder
 
 RUN apk add --no-cache make git
 WORKDIR /workspace/helmfile
diff --git a/Dockerfile.helm3 b/Dockerfile.helm3
index 337384e4..393100df 100644
--- a/Dockerfile.helm3
+++ b/Dockerfile.helm3
@@ -1,4 +1,4 @@
-FROM golang:1.14.2-alpine3.11 as builder
+FROM golang:1.16.3-alpine3.13 as builder
 
 RUN apk add --no-cache make git
 WORKDIR /workspace/helmfile