diff --git a/.circleci/config.yml b/.circleci/config.yml
index f9e59a9ac..6e3d9d23e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,7 +9,7 @@ jobs:
     docker:
     - image: docker.mirror.hashicorp.services/node:14-buster
     shell: /usr/bin/env bash -euo pipefail -c
-    working_directory: /go/src/github.com/hashicorp/vault
+    working_directory: /home/circleci/go/src/github.com/hashicorp/vault
     steps:
     - checkout
     - restore_cache:
@@ -30,7 +30,7 @@ jobs:
     docker:
     - image: docker.mirror.hashicorp.services/node:14-buster
     shell: /usr/bin/env bash -euo pipefail -c
-    working_directory: /go/src/github.com/hashicorp/vault
+    working_directory: /home/circleci/go/src/github.com/hashicorp/vault
     resource_class: xlarge
     steps:
     - run:
@@ -83,7 +83,7 @@ jobs:
     docker:
     - image: docker.mirror.hashicorp.services/node:14-buster
     shell: /usr/bin/env bash -euo pipefail -c
-    working_directory: /go/src/github.com/hashicorp/vault
+    working_directory: /home/circleci/go/src/github.com/hashicorp/vault
     resource_class: xlarge
     steps:
     - checkout
@@ -101,7 +101,7 @@ jobs:
   build-go-dev:
     machine: true
     shell: /usr/bin/env bash -euo pipefail -c
-    working_directory: /go/src/github.com/hashicorp/vault
+    working_directory: /home/circleci/go/src/github.com/hashicorp/vault
     steps:
     - run:
         command: |
@@ -111,7 +111,7 @@ jobs:
           sudo rm -rf /usr/local/go
           sudo tar -C /usr/local -xzf "go${GO_VERSION}.linux-amd64.tar.gz"
           rm -f "go${GO_VERSION}.linux-amd64.tar.gz"
-          GOPATH="/go"
+          GOPATH="/home/circleci/go"
           mkdir $GOPATH 2>/dev/null || { sudo mkdir $GOPATH && sudo chmod 777 $GOPATH; }
           echo "export GOPATH='$GOPATH'" >> "$BASH_ENV"
           echo "export PATH='$PATH:$GOPATH/bin:/usr/local/go/bin'" >> "$BASH_ENV"
@@ -125,7 +125,7 @@ jobs:
     - checkout
     - restore_cache:
         keys:
-        - v1.3-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}}
+        - v1.4-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}}
         name: Restore exact go modules cache
     - attach_workspace:
         at: .
@@ -145,7 +145,7 @@ jobs:
     environment:
     - CIRCLECI_CLI_VERSION: 0.1.5546
     - GO_TAGS: ''
-    - GO_VERSION: 1.17.2
+    - GO_VERSION: 1.17.5
     - GOTESTSUM_VERSION: 0.5.2
   algolia-index:
     docker:
@@ -164,9 +164,9 @@ jobs:
         name: Push content to Algolia Index
   test-go-remote-docker:
     docker:
-    - image: docker.mirror.hashicorp.services/circleci/golang:1.17.2-buster
+    - image: docker.mirror.hashicorp.services/cimg/go:1.17.5
     resource_class: medium
-    working_directory: /go/src/github.com/hashicorp/vault
+    working_directory: /home/circleci/go/src/github.com/hashicorp/vault
     parallelism: 8
     steps:
     - run:
@@ -199,7 +199,7 @@ jobs:
         - go-test-cache-date-v1-{{ checksum "/tmp/go-cache-key" }}
     - restore_cache:
         keys:
-        - v1.3-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}}
+        - v1.4-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}}
         name: Restore exact go modules cache
     - run:
         command: |
@@ -297,20 +297,20 @@ jobs:
               -e NO_PROXY \
               -e VAULT_TEST_LOG_DIR=/tmp/testlogs \
               --network vaulttest --name \
-              testcontainer docker.mirror.hashicorp.services/circleci/golang:1.17.2-buster \
+              testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.5 \
               tail -f /dev/null
 
             # Run tests
             test -d /tmp/go-cache && docker cp /tmp/go-cache testcontainer:/tmp/gocache
-            docker exec testcontainer sh -c 'mkdir -p /go/src/github.com/hashicorp/vault'
-            docker cp . testcontainer:/go/src/github.com/hashicorp/vault/
+            docker exec testcontainer sh -c 'mkdir -p /home/circleci/go/src/github.com/hashicorp/vault'
+            docker cp . testcontainer:/home/circleci/go/src/github.com/hashicorp/vault/
             docker cp $DOCKER_CERT_PATH/ testcontainer:$DOCKER_CERT_PATH
 
             # Copy the downloaded modules inside the container.
-            docker exec testcontainer sh -c 'mkdir -p /go/pkg'
-            docker cp "$(go env GOPATH)/pkg/mod" testcontainer:/go/pkg/mod
+            docker exec testcontainer sh -c 'mkdir -p /home/circleci/go/pkg'
+            docker cp "$(go env GOPATH)/pkg/mod" testcontainer:/home/circleci/go/pkg/mod
 
-            docker exec -w /go/src/github.com/hashicorp/vault/ \
+            docker exec -w /home/circleci/go/src/github.com/hashicorp/vault/ \
               -e CIRCLECI -e VAULT_CI_GO_TEST_RACE \
               -e GOCACHE=/tmp/gocache \
               -e GO_TAGS \
@@ -346,7 +346,7 @@ jobs:
         no_output_timeout: 60m
     - run:
         command: |
-          docker cp testcontainer:/go/src/github.com/hashicorp/vault/test-results .
+          docker cp testcontainer:/home/circleci/go/src/github.com/hashicorp/vault/test-results .
           docker cp testcontainer:/tmp/gocache /tmp/go-cache
         name: Copy test results
         when: always
@@ -361,9 +361,9 @@ jobs:
     - GO_TAGS: ''
   test-go-race:
     docker:
-    - image: docker.mirror.hashicorp.services/circleci/golang:1.17.2-buster
+    - image: docker.mirror.hashicorp.services/cimg/go:1.17.5
     resource_class: xlarge
-    working_directory: /go/src/github.com/hashicorp/vault
+    working_directory: /home/circleci/go/src/github.com/hashicorp/vault
     parallelism: 8
     steps:
     - run:
@@ -393,7 +393,7 @@ jobs:
         - go-test-cache-date-v1-{{ checksum "/tmp/go-cache-key" }}
     - restore_cache:
         keys:
-        - v1.3-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}}
+        - v1.4-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}}
         name: Restore exact go modules cache
     - run:
         command: |
@@ -490,20 +490,20 @@ jobs:
               -e NO_PROXY \
               -e VAULT_TEST_LOG_DIR=/tmp/testlogs \
               --network vaulttest --name \
-              testcontainer docker.mirror.hashicorp.services/circleci/golang:1.17.2-buster \
+              testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.5 \
               tail -f /dev/null
 
             # Run tests
             test -d /tmp/go-cache && docker cp /tmp/go-cache testcontainer:/tmp/gocache
-            docker exec testcontainer sh -c 'mkdir -p /go/src/github.com/hashicorp/vault'
-            docker cp . testcontainer:/go/src/github.com/hashicorp/vault/
+            docker exec testcontainer sh -c 'mkdir -p /home/circleci/go/src/github.com/hashicorp/vault'
+            docker cp . testcontainer:/home/circleci/go/src/github.com/hashicorp/vault/
             docker cp $DOCKER_CERT_PATH/ testcontainer:$DOCKER_CERT_PATH
 
             # Copy the downloaded modules inside the container.
-            docker exec testcontainer sh -c 'mkdir -p /go/pkg'
-            docker cp "$(go env GOPATH)/pkg/mod" testcontainer:/go/pkg/mod
+            docker exec testcontainer sh -c 'mkdir -p /home/circleci/go/pkg'
+            docker cp "$(go env GOPATH)/pkg/mod" testcontainer:/home/circleci/go/pkg/mod
 
-            docker exec -w /go/src/github.com/hashicorp/vault/ \
+            docker exec -w /home/circleci/go/src/github.com/hashicorp/vault/ \
               -e CIRCLECI -e VAULT_CI_GO_TEST_RACE \
               -e GOCACHE=/tmp/gocache \
               -e GO_TAGS \
@@ -571,9 +571,9 @@ jobs:
         name: Build Docker Image if Necessary
   test-go:
     docker:
-    - image: docker.mirror.hashicorp.services/circleci/golang:1.17.2-buster
+    - image: docker.mirror.hashicorp.services/cimg/go:1.17.5
     resource_class: large
-    working_directory: /go/src/github.com/hashicorp/vault
+    working_directory: /home/circleci/go/src/github.com/hashicorp/vault
     parallelism: 8
     steps:
     - run:
@@ -603,7 +603,7 @@ jobs:
         - go-test-cache-date-v1-{{ checksum "/tmp/go-cache-key" }}
     - restore_cache:
         keys:
-        - v1.3-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}}
+        - v1.4-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}}
         name: Restore exact go modules cache
     - run:
         command: |
@@ -700,20 +700,20 @@ jobs:
               -e NO_PROXY \
               -e VAULT_TEST_LOG_DIR=/tmp/testlogs \
               --network vaulttest --name \
-              testcontainer docker.mirror.hashicorp.services/circleci/golang:1.17.2-buster \
+              testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.5 \
               tail -f /dev/null
 
             # Run tests
             test -d /tmp/go-cache && docker cp /tmp/go-cache testcontainer:/tmp/gocache
-            docker exec testcontainer sh -c 'mkdir -p /go/src/github.com/hashicorp/vault'
-            docker cp . testcontainer:/go/src/github.com/hashicorp/vault/
+            docker exec testcontainer sh -c 'mkdir -p /home/circleci/go/src/github.com/hashicorp/vault'
+            docker cp . testcontainer:/home/circleci/go/src/github.com/hashicorp/vault/
             docker cp $DOCKER_CERT_PATH/ testcontainer:$DOCKER_CERT_PATH
 
             # Copy the downloaded modules inside the container.
-            docker exec testcontainer sh -c 'mkdir -p /go/pkg'
-            docker cp "$(go env GOPATH)/pkg/mod" testcontainer:/go/pkg/mod
+            docker exec testcontainer sh -c 'mkdir -p /home/circleci/go/pkg'
+            docker cp "$(go env GOPATH)/pkg/mod" testcontainer:/home/circleci/go/pkg/mod
 
-            docker exec -w /go/src/github.com/hashicorp/vault/ \
+            docker exec -w /home/circleci/go/src/github.com/hashicorp/vault/ \
               -e CIRCLECI -e VAULT_CI_GO_TEST_RACE \
               -e GOCACHE=/tmp/gocache \
               -e GO_TAGS \
@@ -759,7 +759,7 @@ jobs:
   pre-flight-checks:
     machine: true
     shell: /usr/bin/env bash -euo pipefail -c
-    working_directory: /go/src/github.com/hashicorp/vault
+    working_directory: /home/circleci/go/src/github.com/hashicorp/vault
     steps:
     - run:
         command: |
@@ -769,7 +769,7 @@ jobs:
           sudo rm -rf /usr/local/go
           sudo tar -C /usr/local -xzf "go${GO_VERSION}.linux-amd64.tar.gz"
           rm -f "go${GO_VERSION}.linux-amd64.tar.gz"
-          GOPATH="/go"
+          GOPATH="/home/circleci/go"
           mkdir $GOPATH 2>/dev/null || { sudo mkdir $GOPATH && sudo chmod 777 $GOPATH; }
           echo "export GOPATH='$GOPATH'" >> "$BASH_ENV"
           echo "export PATH='$PATH:$GOPATH/bin:/usr/local/go/bin'" >> "$BASH_ENV"
@@ -810,9 +810,9 @@ jobs:
           git config --global url."git@github.com:".insteadOf https://github.com/
     - restore_cache:
         keys:
-        - v1.3-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}}
-        - v1.3-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}
-        - v1.3-{{checksum "go.sum"}}
+        - v1.4-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}}
+        - v1.4-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}
+        - v1.4-{{checksum "go.sum"}}
         name: Restore closest matching go modules cache
     - run:
         command: |
@@ -832,20 +832,20 @@ jobs:
           }
         name: Verify downloading modules did not modify any files
     - save_cache:
-        key: v1.3-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}}
+        key: v1.4-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}}
         name: Save go modules cache
         paths:
-        - /go/pkg/mod
+        - /home/circleci/go/pkg/mod
     environment:
     - CIRCLECI_CLI_VERSION: 0.1.5546
     - GO_TAGS: ''
-    - GO_VERSION: 1.17.2
+    - GO_VERSION: 1.17.5
     - GOTESTSUM_VERSION: 0.5.2
   test-go-race-remote-docker:
     docker:
-    - image: docker.mirror.hashicorp.services/circleci/golang:1.17.2-buster
+    - image: docker.mirror.hashicorp.services/cimg/go:1.17.5
     resource_class: medium
-    working_directory: /go/src/github.com/hashicorp/vault
+    working_directory: /home/circleci/go/src/github.com/hashicorp/vault
     parallelism: 8
     steps:
     - run:
@@ -878,7 +878,7 @@ jobs:
         - go-test-cache-date-v1-{{ checksum "/tmp/go-cache-key" }}
     - restore_cache:
         keys:
-        - v1.3-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}}
+        - v1.4-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}}
         name: Restore exact go modules cache
     - run:
         command: |
@@ -976,20 +976,20 @@ jobs:
               -e NO_PROXY \
               -e VAULT_TEST_LOG_DIR=/tmp/testlogs \
               --network vaulttest --name \
-              testcontainer docker.mirror.hashicorp.services/circleci/golang:1.17.2-buster \
+              testcontainer docker.mirror.hashicorp.services/cimg/go:1.17.5 \
               tail -f /dev/null
 
             # Run tests
             test -d /tmp/go-cache && docker cp /tmp/go-cache testcontainer:/tmp/gocache
-            docker exec testcontainer sh -c 'mkdir -p /go/src/github.com/hashicorp/vault'
-            docker cp . testcontainer:/go/src/github.com/hashicorp/vault/
+            docker exec testcontainer sh -c 'mkdir -p /home/circleci/go/src/github.com/hashicorp/vault'
+            docker cp . testcontainer:/home/circleci/go/src/github.com/hashicorp/vault/
             docker cp $DOCKER_CERT_PATH/ testcontainer:$DOCKER_CERT_PATH
 
             # Copy the downloaded modules inside the container.
-            docker exec testcontainer sh -c 'mkdir -p /go/pkg'
-            docker cp "$(go env GOPATH)/pkg/mod" testcontainer:/go/pkg/mod
+            docker exec testcontainer sh -c 'mkdir -p /home/circleci/go/pkg'
+            docker cp "$(go env GOPATH)/pkg/mod" testcontainer:/home/circleci/go/pkg/mod
 
-            docker exec -w /go/src/github.com/hashicorp/vault/ \
+            docker exec -w /home/circleci/go/src/github.com/hashicorp/vault/ \
               -e CIRCLECI -e VAULT_CI_GO_TEST_RACE \
               -e GOCACHE=/tmp/gocache \
               -e GO_TAGS \
@@ -1025,7 +1025,7 @@ jobs:
         no_output_timeout: 60m
     - run:
         command: |
-          docker cp testcontainer:/go/src/github.com/hashicorp/vault/test-results .
+          docker cp testcontainer:/home/circleci/go/src/github.com/hashicorp/vault/test-results .
           docker cp testcontainer:/tmp/gocache /tmp/go-cache
         name: Copy test results
         when: always
diff --git a/.circleci/config/commands/@caches.yml b/.circleci/config/commands/@caches.yml
index 03e04cbc2..dee2e39df 100644
--- a/.circleci/config/commands/@caches.yml
+++ b/.circleci/config/commands/@caches.yml
@@ -12,14 +12,15 @@ save_yarn_cache:
           - ui/node_modules
 # allows restoring go mod caches by incomplete prefix. This is useful when re-generating
 # cache, but not when running builds and tests that require an exact match.
+# TODO should we be including arch in cache key?
 restore_go_mod_cache_permissive:
   steps:
     - restore_cache:
         name: Restore closest matching go modules cache
         keys:
-          - &gocachekey v1.3-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}}
-          -             v1.3-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}
-          -             v1.3-{{checksum "go.sum"}}
+          - &gocachekey v1.4-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}-{{checksum "api/go.sum"}}
+          -             v1.4-{{checksum "go.sum"}}-{{checksum "sdk/go.sum"}}
+          -             v1.4-{{checksum "go.sum"}}
 restore_go_mod_cache:
   steps:
     - restore_cache:
@@ -32,7 +33,7 @@ save_go_mod_cache:
         name: Save go modules cache
         key: *gocachekey
         paths:
-          - /go/pkg/mod
+          - /home/circleci/go/pkg/mod
 refresh_go_mod_cache:
   steps:
     - restore_go_mod_cache_permissive
diff --git a/.circleci/config/commands/go_test.yml b/.circleci/config/commands/go_test.yml
index 6ea817b12..ca3f71f0d 100644
--- a/.circleci/config/commands/go_test.yml
+++ b/.circleci/config/commands/go_test.yml
@@ -14,7 +14,7 @@ parameters:
     default: false
   go_image:
     type: string
-    default: "docker.mirror.hashicorp.services/circleci/golang:1.17.2-buster"
+    default: "docker.mirror.hashicorp.services/cimg/go:1.17.5"
   use_docker:
     type: boolean
     default: false
@@ -139,15 +139,15 @@ steps:
 
           # Run tests
           test -d << parameters.cache_dir >> && docker cp << parameters.cache_dir >> testcontainer:/tmp/gocache
-          docker exec testcontainer sh -c 'mkdir -p /go/src/github.com/hashicorp/vault'
-          docker cp . testcontainer:/go/src/github.com/hashicorp/vault/
+          docker exec testcontainer sh -c 'mkdir -p /home/circleci/go/src/github.com/hashicorp/vault'
+          docker cp . testcontainer:/home/circleci/go/src/github.com/hashicorp/vault/
           docker cp $DOCKER_CERT_PATH/ testcontainer:$DOCKER_CERT_PATH
 
           # Copy the downloaded modules inside the container.
-          docker exec testcontainer sh -c 'mkdir -p /go/pkg'
-          docker cp "$(go env GOPATH)/pkg/mod" testcontainer:/go/pkg/mod
+          docker exec testcontainer sh -c 'mkdir -p /home/circleci/go/pkg'
+          docker cp "$(go env GOPATH)/pkg/mod" testcontainer:/home/circleci/go/pkg/mod
 
-          docker exec -w /go/src/github.com/hashicorp/vault/ \
+          docker exec -w /home/circleci/go/src/github.com/hashicorp/vault/ \
             -e CIRCLECI -e VAULT_CI_GO_TEST_RACE \
             -e GOCACHE=/tmp/gocache \
             -e GO_TAGS \
@@ -185,7 +185,7 @@ steps:
             name: Copy test results
             when: always
             command: |
-              docker cp testcontainer:/go/src/github.com/hashicorp/vault/test-results .
+              docker cp testcontainer:/home/circleci/go/src/github.com/hashicorp/vault/test-results .
               docker cp testcontainer:/tmp/gocache << parameters.cache_dir >>
   - when:
       condition: << parameters.save_cache >>
diff --git a/.circleci/config/commands/setup-go.yml b/.circleci/config/commands/setup-go.yml
index b7c515910..a06d2f109 100644
--- a/.circleci/config/commands/setup-go.yml
+++ b/.circleci/config/commands/setup-go.yml
@@ -22,7 +22,7 @@ steps:
         sudo rm -rf /usr/local/go
         sudo tar -C /usr/local -xzf "go${GO_VERSION}.linux-amd64.tar.gz"
         rm -f "go${GO_VERSION}.linux-amd64.tar.gz"
-        GOPATH="/go"
+        GOPATH="/home/circleci/go"
         mkdir $GOPATH 2>/dev/null || { sudo mkdir $GOPATH && sudo chmod 777 $GOPATH; }
         echo "export GOPATH='$GOPATH'" >> "$BASH_ENV"
         echo "export PATH='$PATH:$GOPATH/bin:/usr/local/go/bin'" >> "$BASH_ENV"
diff --git a/.circleci/config/executors/@executors.yml b/.circleci/config/executors/@executors.yml
index 5cf5d8fcf..092349046 100644
--- a/.circleci/config/executors/@executors.yml
+++ b/.circleci/config/executors/@executors.yml
@@ -3,46 +3,46 @@ go-machine:
   shell: /usr/bin/env bash -euo pipefail -c
   environment:
     CIRCLECI_CLI_VERSION: 0.1.5546  # Pin CircleCI CLI to patch version (ex: 1.2.3)
-    GO_VERSION: 1.17.2  # Pin Go to patch version (ex: 1.2.3)
+    GO_VERSION: 1.17.5  # Pin Go to patch version (ex: 1.2.3)
     GOTESTSUM_VERSION: 0.5.2  # Pin gotestsum to patch version (ex: 1.2.3)
     GO_TAGS: ""
-  working_directory: /go/src/github.com/hashicorp/vault
+  working_directory: /home/circleci/go/src/github.com/hashicorp/vault
 node:
   docker:
     - image: docker.mirror.hashicorp.services/node:14-buster
   shell: /usr/bin/env bash -euo pipefail -c
-  working_directory: /go/src/github.com/hashicorp/vault
+  working_directory: /home/circleci/go/src/github.com/hashicorp/vault
 python:
   docker:
     - image: docker.mirror.hashicorp.services/python:3-alpine
   shell: /usr/bin/env bash -euo pipefail -c
-  working_directory: /go/src/github.com/hashicorp/vault
+  working_directory: /home/circleci/go/src/github.com/hashicorp/vault
 alpine:
   docker:
     - image: docker.mirror.hashicorp.services/alpine:3.13
   shell: /bin/sh
-  working_directory: /go/src/github.com/hashicorp/vault
+  working_directory: /home/circleci/go/src/github.com/hashicorp/vault
 docker-env-go-test-remote-docker:
   resource_class: medium
   docker:
-    - image: "docker.mirror.hashicorp.services/circleci/golang:1.17.2-buster"
+    - image: "docker.mirror.hashicorp.services/cimg/go:1.17.5"
   environment:
     CIRCLECI_CLI_VERSION: 0.1.5546  # Pin CircleCI CLI to patch version (ex: 1.2.3)
     GO_TAGS: ""
-  working_directory: /go/src/github.com/hashicorp/vault
+  working_directory: /home/circleci/go/src/github.com/hashicorp/vault
 docker-env-go-test:
   resource_class: large
   docker:
-    - image: "docker.mirror.hashicorp.services/circleci/golang:1.17.2-buster"
+    - image: "docker.mirror.hashicorp.services/cimg/go:1.17.5"
   environment:
     CIRCLECI_CLI_VERSION: 0.1.5546  # Pin CircleCI CLI to patch version (ex: 1.2.3)
     GO_TAGS: ""
-  working_directory: /go/src/github.com/hashicorp/vault
+  working_directory: /home/circleci/go/src/github.com/hashicorp/vault
 docker-env-go-test-race:
   resource_class: xlarge
   docker:
-    - image: "docker.mirror.hashicorp.services/circleci/golang:1.17.2-buster"
+    - image: "docker.mirror.hashicorp.services/cimg/go:1.17.5"
   environment:
     CIRCLECI_CLI_VERSION: 0.1.5546  # Pin CircleCI CLI to patch version (ex: 1.2.3)
     GO_TAGS: ""
-  working_directory: /go/src/github.com/hashicorp/vault
+  working_directory: /home/circleci/go/src/github.com/hashicorp/vault
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b369521d2..17ce518e6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -50,7 +50,7 @@ jobs:
       matrix:
         goos: [ freebsd, windows, netbsd, openbsd, solaris ]
         goarch: [ "386", "amd64", "arm" ]
-        go: [ "1.17.2" ]
+        go: [ "1.17.5" ]
         exclude:
           - goos: solaris
             goarch: 386
@@ -102,7 +102,7 @@ jobs:
       matrix:
         goos: [linux]
         goarch: ["arm", "arm64", "386", "amd64"]
-        go: ["1.17.2"]
+        go: ["1.17.5"]
       fail-fast: true
 
     name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build
@@ -179,7 +179,7 @@ jobs:
       matrix:
         goos: [ darwin ]
         goarch: [ "amd64", "arm64" ]
-        go: [ "1.17.2" ]
+        go: [ "1.17.5" ]
       fail-fast: true
     name: Go ${{ matrix.go }} ${{ matrix.goos }} ${{ matrix.goarch }} build
     steps:
diff --git a/Makefile b/Makefile
index 233b081ea..01a50c82a 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ EXTERNAL_TOOLS=\
 GOFMT_FILES?=$$(find . -name '*.go' | grep -v pb.go | grep -v vendor)
 
 
-GO_VERSION_MIN=1.17.2
+GO_VERSION_MIN=1.17.5
 GO_CMD?=go
 CGO_ENABLED?=0
 ifneq ($(FDB_ENABLED), )
diff --git a/README.md b/README.md
index a871940d1..14c85eb77 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ Developing Vault
 
 If you wish to work on Vault itself or any of its built-in systems, you'll
 first need [Go](https://www.golang.org) installed on your machine. Go version
-1.17.2+ is *required*.
+1.17.5+ is *required*.
 
 For local dev first make sure Go is properly installed, including setting up a
 [GOPATH](https://golang.org/doc/code.html#GOPATH). Ensure that `$GOPATH/bin` is in
diff --git a/changelog/13408.txt b/changelog/13408.txt
new file mode 100644
index 000000000..4861b1777
--- /dev/null
+++ b/changelog/13408.txt
@@ -0,0 +1,3 @@
+```release-note:change
+go: Update go version to 1.17.5
+```
diff --git a/scripts/docker/Dockerfile b/scripts/docker/Dockerfile
index eca04152d..71aa724b4 100644
--- a/scripts/docker/Dockerfile
+++ b/scripts/docker/Dockerfile
@@ -1,7 +1,7 @@
 # Multi-stage builder to avoid polluting users environment with wrong
 # architecture binaries.  Since this binary is used in an alpine container,
 # we're explicitly compiling for 'linux/amd64'
-ARG VERSION=1.17.2
+ARG VERSION=1.17.5
 
 FROM golang:${VERSION} AS builder
 
diff --git a/scripts/docker/Dockerfile.ui b/scripts/docker/Dockerfile.ui
index c8500183c..f49924c40 100644
--- a/scripts/docker/Dockerfile.ui
+++ b/scripts/docker/Dockerfile.ui
@@ -3,7 +3,7 @@
 # we're explicitly compiling for 'linux/amd64'
 FROM debian:buster AS builder
 
-ARG VERSION=1.17.2
+ARG VERSION=1.17.5
 ARG CGO_ENABLED=0
 ARG BUILD_TAGS
 ENV JOBS=2