diff --git a/.circleci/config.yml b/.circleci/config.yml
index 51af0f54..ba4b1dca 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,12 +2,12 @@ version: 2
 jobs:
   build:
     docker:
-      # CircleCI Go images available at: https://hub.docker.com/r/circleci/golang/
-      - image: circleci/golang:1.17.2
+      # CircleCI Go images available at: https://hub.docker.com/r/cimg/go
+      - image: cimg/go:1.18
         environment:
           GO111MODULE: "on"
 
-    working_directory: /go/src/bitbucket.org/ausocean/av
+    working_directory: ~/go/src/bitbucket.org/ausocean/av
 
     environment:
       TEST_RESULTS: /tmp/test-results