diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1644f3142..2fd04e74f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  go: circleci/go@0.2.0
+  go: circleci/go@1.7.1
   prometheus: prometheus/prometheus@0.16.0
 jobs:
   test:
@@ -17,8 +17,8 @@ jobs:
         type: boolean
         default: true
     docker:
-      - image: circleci/golang:<< parameters.go_version >>
-    working_directory: /go/src/github.com/prometheus/client_golang
+      - image: cimg/go:<< parameters.go_version >>
+#    working_directory: /go/src/github.com/prometheus/client_golang
     steps:
       - checkout
       - when:
@@ -51,18 +51,22 @@ workflows:
           name: go-1-15
           go_version: "1.15"
           run_lint: true
+#          use_gomod_cache: false
       - test:
           name: go-1-16
           go_version: "1.16"
           run_lint: true
+#          use_gomod_cache: false
       - test:
           name: go-1-17
           go_version: "1.17"
           run_lint: true
+#          use_gomod_cache: false
       - test:
           name: go-1-18
           go_version: "1.18"
           run_lint: true
+#          use_gomod_cache: false
           # Style and unused/missing packages are only checked against
           # the latest supported Go version.
           run_style_and_unused: true