diff --git a/.circleci/config.yml b/.circleci/config.yml
index 96f53ee40..c83ee10cf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,13 +4,13 @@ jobs:
     working_directory: /go/src/k8s.io/helm
     parallelism: 3
     docker:
-      - image: golang:1.11
+      - image: golang:1.12
     environment:
       PROJECT_NAME: "kubernetes-helm"
     steps:
       - checkout
       - setup_remote_docker:
-          version: 17.09.0-ce
+          version: 18.06.0-ce
       - restore_cache:
           keys:
             - glide-{{ checksum "glide.yaml" }}-{{ checksum "glide.lock" }}
diff --git a/Makefile b/Makefile
index 7248bbed2..f4b08ace8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 DOCKER_REGISTRY   ?= gcr.io
 IMAGE_PREFIX      ?= kubernetes-helm
-DEV_IMAGE         ?= golang:1.11
+DEV_IMAGE         ?= golang:1.12
 SHORT_NAME        ?= tiller
 SHORT_NAME_RUDDER ?= rudder
 TARGETS           ?= darwin/amd64 linux/amd64 linux/386 linux/arm linux/arm64 linux/ppc64le linux/s390x windows/amd64