diff --git a/.circleci/config.yml b/.circleci/config.yml
index fd6e62a..1a5beb5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -26,11 +26,11 @@ jobs:
             shellcheck -x scripts/install_plugin.sh
   untagged-build:
     docker:
-      - image: circleci/golang:1.17
+      - image: cimg/go:1.17
         auth:
           username: $DOCKER_USER
           password: $DOCKER_PASS
-    working_directory: /go/src/github.com/helm/helm-2to3
+    working_directory: $HOME/go/src/github.com/helm/helm-2to3
     steps:
       - checkout
       - run: 
@@ -38,11 +38,11 @@ jobs:
           no_output_timeout: 20m
   tagged-build:
     docker:
-      - image: circleci/golang:1.17
+      - image: cimg/go:1.17
         auth:
           username: $DOCKER_USER
           password: $DOCKER_PASS
-    working_directory: /go/src/github.com/helm/helm-2to3
+    working_directory: $HOME/go/src/github.com/helm/helm-2to3
     steps:
       - checkout
       - run: