diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1644f3142..f332a0aa4 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:
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 22f8204eb..a4622b9aa 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -20,7 +20,8 @@ jobs:
       - name: install Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.18.x
+          # golangci-lint is not read for Go 1.18 (https://github.com/golangci/golangci-lint/issues/2649)
+          go-version: 1.17.x
       - name: Lint
         uses: golangci/golangci-lint-action@v3.1.0
         with: