diff --git a/.circleci/config.yml b/.circleci/config.yml
index 25a6f0d31..db74de14f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,9 +18,6 @@ jobs:
     - run:
         command: mkdir -p .buildcache && echo "*" > .buildcache/.gitignore
         name: Ignore .buildcache
-    - restore_cache:
-        key: package-4d5c8238521df42de23b52310a3415cb695d4fb2-{{checksum ".buildcache/cache-keys/package-4d5c8238521df42de23b52310a3415cb695d4fb2"}}
-        name: Restore package cache
     - restore_cache:
         key: package-83aaf1a9b14f45042b699ab313455cd2b4ee9fb1-{{checksum ".buildcache/cache-keys/package-83aaf1a9b14f45042b699ab313455cd2b4ee9fb1"}}
         name: Restore package cache
@@ -76,20 +73,20 @@ jobs:
         command: ls -lahR .buildcache
         name: List Build Cache
     - run:
-        command: cp packages*.lock/pkgs.yml lockfile-d4738432dabd028a.yml
+        command: cp packages*.lock/pkgs.yml lockfile-439e958000af378a.yml
         name: Update Lockfile Name
     - run:
-        command: tar -czf packages-d4738432dabd028a.tar.gz .buildcache/packages lockfile-d4738432dabd028a.yml
+        command: tar -czf packages-439e958000af378a.tar.gz .buildcache/packages lockfile-439e958000af378a.yml
         name: Create Raw Package Tarball
     - run:
-        command: tar -czf meta-d4738432dabd028a.tar.gz .buildcache/packages/store/*.json lockfile-d4738432dabd028a.yml
+        command: tar -czf meta-439e958000af378a.tar.gz .buildcache/packages/store/*.json lockfile-439e958000af378a.yml
         name: Create Metadata Tarball
     - store_artifacts:
-        path: lockfile-d4738432dabd028a.yml
+        path: lockfile-439e958000af378a.yml
     - store_artifacts:
-        path: packages-d4738432dabd028a.tar.gz
+        path: packages-439e958000af378a.tar.gz
     - store_artifacts:
-        path: meta-d4738432dabd028a.tar.gz
+        path: meta-439e958000af378a.tar.gz
     - store_artifacts:
         path: .buildcache/packages
     environment:
@@ -134,9 +131,9 @@ jobs:
         command: make -C packages*.lock write-builder-cache-keys
         name: Write builder layer cache keys
     - restore_cache:
-        key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+        key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
         keys:
-        - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+        - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
         - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
         - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
         - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -212,9 +209,9 @@ jobs:
         command: make -C packages*.lock write-builder-cache-keys
         name: Write builder layer cache keys
     - restore_cache:
-        key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+        key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
         keys:
-        - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+        - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
         - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
         - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
         - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -473,9 +470,9 @@ jobs:
         command: make -C packages*.lock write-builder-cache-keys
         name: Write builder layer cache keys
     - restore_cache:
-        key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+        key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
         keys:
-        - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+        - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
         - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
         - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
         - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -589,9 +586,9 @@ jobs:
         command: make -C packages*.lock write-builder-cache-keys
         name: Write builder layer cache keys
     - restore_cache:
-        key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+        key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
         keys:
-        - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+        - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
         - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
         - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
         - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -647,84 +644,6 @@ jobs:
           export PATH="${PWD}"/bin:${PATH}
           make test-ui-browserstack
         name: Run Browserstack Tests
-  darwin_386_package:
-    docker:
-    - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
-    shell: /usr/bin/env bash -euo pipefail -c
-    environment:
-    - AUTO_INSTALL_TOOLS: 'YES'
-    - BUILDKIT_PROGRESS: plain
-    - PRODUCT_REVISION: ''
-    - PACKAGE_SPEC_ID: 4d5c8238521df42de23b52310a3415cb695d4fb2
-    steps:
-    - setup_remote_docker:
-        docker_layer_caching: false
-        version: 19.03.12
-    - add_ssh_keys:
-        fingerprints:
-        - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
-    - checkout:
-        path: .
-    - run:
-        command: make -C packages*.lock write-package-cache-key
-        name: Write package cache key
-    - restore_cache:
-        key: package-4d5c8238521df42de23b52310a3415cb695d4fb2-{{checksum ".buildcache/cache-keys/package-4d5c8238521df42de23b52310a3415cb695d4fb2"}}
-        name: Restore package cache
-    - run:
-        command: |2
-
-          if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
-            echo "No package found, continuing with build."
-            exit 0
-          fi
-          echo "Package already cached, skipping build."
-          circleci-agent step halt
-        name: Check cache status
-    - run:
-        command: make -C packages*.lock write-builder-cache-keys
-        name: Write builder layer cache keys
-    - restore_cache:
-        key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
-        keys:
-        - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
-        - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
-        - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
-        - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
-        - install-yarn_bbaf_{{checksum ".buildcache/cache-keys/install-yarn-bbaf7b58ff71fac3d054dba364ea5aa9169cf9f7"}}
-        - set-workdir_f573_{{checksum ".buildcache/cache-keys/set-workdir-f57397d33d7a62ba66ebcc200ecf774e5b8bda25"}}
-        - install-go-tools_93ff_{{checksum ".buildcache/cache-keys/install-go-tools-93ff4bda3b82e8d26d9ed37fb2b8843639dd4761"}}
-        - install-go_8dde_{{checksum ".buildcache/cache-keys/install-go-8dde98d41082e5612aa95b0984d75c52c11c2802"}}
-        - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        name: 'Restore Builder Image Cache: copy-source'
-    - run:
-        command: make -C packages*.lock load-builder-cache
-        name: Load whatever builder cache we have (if any) into the Docker daemon
-        no_output_timeout: 30m
-    - run:
-        command: |2-
-
-          KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
-          eval "$(ssh-agent -s)"
-          if [ -f "$KEYFILE" ]; then
-            ssh-add "$KEYFILE"
-          else
-            echo "==> INFO: SSH key for github.com not found"
-            echo "    Attempts to access private repositories from within"
-            echo "    the build will fail, e.g. for private go modules, or"
-            echo "    attempts to directly clone private repositories."
-          fi
-
-          make -C packages*.lock package
-        name: Compile Package
-    - run:
-        command: ls -lahR .buildcache/packages
-        name: List packages
-    - save_cache:
-        key: package-4d5c8238521df42de23b52310a3415cb695d4fb2-{{checksum ".buildcache/cache-keys/package-4d5c8238521df42de23b52310a3415cb695d4fb2"}}
-        name: Save package cache
-        paths:
-        - .buildcache/packages/store
   build-go-dev:
     machine: true
     shell: /usr/bin/env bash -euo pipefail -c
@@ -822,9 +741,9 @@ jobs:
         command: make -C packages*.lock write-builder-cache-keys
         name: Write builder layer cache keys
     - restore_cache:
-        key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+        key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
         keys:
-        - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+        - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
         - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
         - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
         - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -952,7 +871,7 @@ jobs:
               -e DOCKER_CERT_PATH -e DOCKER_HOST -e DOCKER_MACHINE_NAME -e DOCKER_TLS_VERIFY -e NO_PROXY \
               -e VAULT_TEST_LOG_DIR=/tmp/testlogs \
               --network vaulttest --name \
-              testcontainer circleci/golang:1.14.7-stretch \
+              testcontainer circleci/golang:1.15.3-buster \
               tail -f /dev/null
 
             # Run tests
@@ -1041,9 +960,9 @@ jobs:
         command: make -C packages*.lock write-builder-cache-keys
         name: Write builder layer cache keys
     - restore_cache:
-        key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+        key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
         keys:
-        - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+        - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
         - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
         - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
         - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -1167,7 +1086,7 @@ jobs:
               -e DOCKER_CERT_PATH -e DOCKER_HOST -e DOCKER_MACHINE_NAME -e DOCKER_TLS_VERIFY -e NO_PROXY \
               -e VAULT_TEST_LOG_DIR=/tmp/testlogs \
               --network vaulttest --name \
-              testcontainer circleci/golang:1.14.7-stretch \
+              testcontainer circleci/golang:1.15.3-buster \
               tail -f /dev/null
 
             # Run tests
@@ -1250,9 +1169,9 @@ jobs:
         command: make -C packages*.lock write-builder-cache-keys
         name: Write builder layer cache keys
     - restore_cache:
-        key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+        key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
         keys:
-        - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+        - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
         - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
         - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
         - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -1328,9 +1247,9 @@ jobs:
         command: make -C packages*.lock write-builder-cache-keys
         name: Write builder layer cache keys
     - restore_cache:
-        key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+        key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
         keys:
-        - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+        - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
         - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
         - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
         - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -1406,9 +1325,9 @@ jobs:
         command: make -C packages*.lock write-builder-cache-keys
         name: Write builder layer cache keys
     - restore_cache:
-        key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+        key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
         keys:
-        - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+        - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
         - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
         - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
         - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -1507,9 +1426,9 @@ jobs:
         command: make -C packages*.lock write-builder-cache-keys
         name: Write builder layer cache keys
     - restore_cache:
-        key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+        key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
         keys:
-        - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+        - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
         - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
         - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
         - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -1633,7 +1552,7 @@ jobs:
               -e DOCKER_CERT_PATH -e DOCKER_HOST -e DOCKER_MACHINE_NAME -e DOCKER_TLS_VERIFY -e NO_PROXY \
               -e VAULT_TEST_LOG_DIR=/tmp/testlogs \
               --network vaulttest --name \
-              testcontainer circleci/golang:1.14.7-stretch \
+              testcontainer circleci/golang:1.15.3-buster \
               tail -f /dev/null
 
             # Run tests
@@ -1779,7 +1698,7 @@ jobs:
               -e DOCKER_CERT_PATH -e DOCKER_HOST -e DOCKER_MACHINE_NAME -e DOCKER_TLS_VERIFY -e NO_PROXY \
               -e VAULT_TEST_LOG_DIR=/tmp/testlogs \
               --network vaulttest --name \
-              testcontainer circleci/golang:1.14.7-stretch \
+              testcontainer circleci/golang:1.15.3-buster \
               tail -f /dev/null
 
             # Run tests
@@ -1869,9 +1788,9 @@ jobs:
         command: make -C packages*.lock write-builder-cache-keys
         name: Write builder layer cache keys
     - restore_cache:
-        key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+        key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
         keys:
-        - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+        - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
         - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
         - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
         - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -1947,9 +1866,9 @@ jobs:
         command: make -C packages*.lock write-builder-cache-keys
         name: Write builder layer cache keys
     - restore_cache:
-        key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+        key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
         keys:
-        - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+        - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
         - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
         - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
         - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -2025,9 +1944,9 @@ jobs:
         command: make -C packages*.lock write-builder-cache-keys
         name: Write builder layer cache keys
     - restore_cache:
-        key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+        key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
         keys:
-        - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+        - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
         - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
         - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
         - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -2103,9 +2022,9 @@ jobs:
         command: make -C packages*.lock write-builder-cache-keys
         name: Write builder layer cache keys
     - restore_cache:
-        key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+        key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
         keys:
-        - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+        - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
         - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
         - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
         - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -2181,9 +2100,9 @@ jobs:
         command: make -C packages*.lock write-builder-cache-keys
         name: Write builder layer cache keys
     - restore_cache:
-        key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+        key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
         keys:
-        - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+        - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
         - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
         - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
         - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -2340,7 +2259,7 @@ jobs:
               -e DOCKER_CERT_PATH -e DOCKER_HOST -e DOCKER_MACHINE_NAME -e DOCKER_TLS_VERIFY -e NO_PROXY \
               -e VAULT_TEST_LOG_DIR=/tmp/testlogs \
               --network vaulttest --name \
-              testcontainer circleci/golang:1.14.7-stretch \
+              testcontainer circleci/golang:1.15.3-buster \
               tail -f /dev/null
 
             # Run tests
@@ -2392,15 +2311,14 @@ jobs:
     - GO_TAGS: ''
     - GO111MODULE: 'off'
 workflows:
-  build-d4738432dabd028a:
+  build-439e958000af378a:
     jobs:
     - build-common-layers
-    - darwin_386_package:
+    - darwin_amd64_package:
         requires:
         - build-common-layers
     - bundle-releases:
         requires:
-        - darwin_386_package
         - darwin_amd64_package
         - freebsd_386_package
         - freebsd_amd64_package
@@ -2416,9 +2334,6 @@ workflows:
         - solaris_amd64_package
         - windows_386_package
         - windows_amd64_package
-    - darwin_amd64_package:
-        requires:
-        - build-common-layers
     - freebsd_386_package:
         requires:
         - build-common-layers
diff --git a/.circleci/config/@build-release.yml b/.circleci/config/@build-release.yml
index 4008e7e6b..4be716b42 100644
--- a/.circleci/config/@build-release.yml
+++ b/.circleci/config/@build-release.yml
@@ -186,9 +186,6 @@ jobs:
       - run:
           command: mkdir -p .buildcache && echo "*" > .buildcache/.gitignore
           name: Ignore .buildcache
-      - restore_cache:
-          key: package-4d5c8238521df42de23b52310a3415cb695d4fb2-{{checksum ".buildcache/cache-keys/package-4d5c8238521df42de23b52310a3415cb695d4fb2"}}
-          name: Restore package cache
       - restore_cache:
           key: package-83aaf1a9b14f45042b699ab313455cd2b4ee9fb1-{{checksum ".buildcache/cache-keys/package-83aaf1a9b14f45042b699ab313455cd2b4ee9fb1"}}
           name: Restore package cache
@@ -244,95 +241,22 @@ jobs:
           command: ls -lahR .buildcache
           name: List Build Cache
       - run:
-          command: cp packages*.lock/pkgs.yml lockfile-d4738432dabd028a.yml
+          command: cp packages*.lock/pkgs.yml lockfile-439e958000af378a.yml
           name: Update Lockfile Name
       - run:
-          command: tar -czf packages-d4738432dabd028a.tar.gz .buildcache/packages lockfile-d4738432dabd028a.yml
+          command: tar -czf packages-439e958000af378a.tar.gz .buildcache/packages lockfile-439e958000af378a.yml
           name: Create Raw Package Tarball
       - run:
-          command: tar -czf meta-d4738432dabd028a.tar.gz .buildcache/packages/store/*.json lockfile-d4738432dabd028a.yml
+          command: tar -czf meta-439e958000af378a.tar.gz .buildcache/packages/store/*.json lockfile-439e958000af378a.yml
           name: Create Metadata Tarball
       - store_artifacts:
-          path: lockfile-d4738432dabd028a.yml
+          path: lockfile-439e958000af378a.yml
       - store_artifacts:
-          path: packages-d4738432dabd028a.tar.gz
+          path: packages-439e958000af378a.tar.gz
       - store_artifacts:
-          path: meta-d4738432dabd028a.tar.gz
+          path: meta-439e958000af378a.tar.gz
       - store_artifacts:
           path: .buildcache/packages
-  darwin_386_package:
-    executor: builder
-    steps:
-      - setup_remote_docker:
-          version: 19.03.12
-          docker_layer_caching: false
-      - add_ssh_keys:
-          fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
-      - checkout:
-          path: .
-      - run:
-          command: make -C packages*.lock write-package-cache-key
-          name: Write package cache key
-      - restore_cache:
-          key: package-4d5c8238521df42de23b52310a3415cb695d4fb2-{{checksum ".buildcache/cache-keys/package-4d5c8238521df42de23b52310a3415cb695d4fb2"}}
-          name: Restore package cache
-      - run:
-          command: |2
-
-            if ! { PKG=$(find .buildcache/packages/store -maxdepth 1 -mindepth 1 -name '*.zip' 2> /dev/null) && [ -n "$PKG" ]; }; then
-              echo "No package found, continuing with build."
-              exit 0
-            fi
-            echo "Package already cached, skipping build."
-            circleci-agent step halt
-          name: Check cache status
-      - run:
-          command: make -C packages*.lock write-builder-cache-keys
-          name: Write builder layer cache keys
-      - restore_cache:
-          key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
-          keys:
-            - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
-            - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
-            - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
-            - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
-            - install-yarn_bbaf_{{checksum ".buildcache/cache-keys/install-yarn-bbaf7b58ff71fac3d054dba364ea5aa9169cf9f7"}}
-            - set-workdir_f573_{{checksum ".buildcache/cache-keys/set-workdir-f57397d33d7a62ba66ebcc200ecf774e5b8bda25"}}
-            - install-go-tools_93ff_{{checksum ".buildcache/cache-keys/install-go-tools-93ff4bda3b82e8d26d9ed37fb2b8843639dd4761"}}
-            - install-go_8dde_{{checksum ".buildcache/cache-keys/install-go-8dde98d41082e5612aa95b0984d75c52c11c2802"}}
-            - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-          name: 'Restore Builder Image Cache: copy-source'
-      - run:
-          command: make -C packages*.lock load-builder-cache
-          name: Load whatever builder cache we have (if any) into the Docker daemon
-          no_output_timeout: 30m
-      - run:
-          command: |2-
-
-            KEYFILE="$HOME/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98"
-            eval "$(ssh-agent -s)"
-            if [ -f "$KEYFILE" ]; then
-              ssh-add "$KEYFILE"
-            else
-              echo "==> INFO: SSH key for github.com not found"
-              echo "    Attempts to access private repositories from within"
-              echo "    the build will fail, e.g. for private go modules, or"
-              echo "    attempts to directly clone private repositories."
-            fi
-
-            make -C packages*.lock package
-          name: Compile Package
-      - run:
-          command: ls -lahR .buildcache/packages
-          name: List packages
-      - save_cache:
-          paths:
-            - .buildcache/packages/store
-          key: package-4d5c8238521df42de23b52310a3415cb695d4fb2-{{checksum ".buildcache/cache-keys/package-4d5c8238521df42de23b52310a3415cb695d4fb2"}}
-          name: Save package cache
-    environment:
-      PACKAGE_SPEC_ID: 4d5c8238521df42de23b52310a3415cb695d4fb2
   darwin_amd64_package:
     executor: builder
     steps:
@@ -364,9 +288,9 @@ jobs:
           command: make -C packages*.lock write-builder-cache-keys
           name: Write builder layer cache keys
       - restore_cache:
-          key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+          key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
           keys:
-            - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+            - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
             - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
             - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
             - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -437,9 +361,9 @@ jobs:
           command: make -C packages*.lock write-builder-cache-keys
           name: Write builder layer cache keys
       - restore_cache:
-          key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+          key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
           keys:
-            - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+            - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
             - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
             - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
             - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -510,9 +434,9 @@ jobs:
           command: make -C packages*.lock write-builder-cache-keys
           name: Write builder layer cache keys
       - restore_cache:
-          key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+          key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
           keys:
-            - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+            - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
             - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
             - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
             - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -583,9 +507,9 @@ jobs:
           command: make -C packages*.lock write-builder-cache-keys
           name: Write builder layer cache keys
       - restore_cache:
-          key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+          key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
           keys:
-            - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+            - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
             - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
             - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
             - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -656,9 +580,9 @@ jobs:
           command: make -C packages*.lock write-builder-cache-keys
           name: Write builder layer cache keys
       - restore_cache:
-          key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+          key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
           keys:
-            - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+            - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
             - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
             - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
             - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -729,9 +653,9 @@ jobs:
           command: make -C packages*.lock write-builder-cache-keys
           name: Write builder layer cache keys
       - restore_cache:
-          key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+          key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
           keys:
-            - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+            - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
             - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
             - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
             - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -802,9 +726,9 @@ jobs:
           command: make -C packages*.lock write-builder-cache-keys
           name: Write builder layer cache keys
       - restore_cache:
-          key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+          key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
           keys:
-            - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+            - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
             - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
             - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
             - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -875,9 +799,9 @@ jobs:
           command: make -C packages*.lock write-builder-cache-keys
           name: Write builder layer cache keys
       - restore_cache:
-          key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+          key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
           keys:
-            - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+            - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
             - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
             - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
             - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -948,9 +872,9 @@ jobs:
           command: make -C packages*.lock write-builder-cache-keys
           name: Write builder layer cache keys
       - restore_cache:
-          key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+          key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
           keys:
-            - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+            - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
             - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
             - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
             - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -1021,9 +945,9 @@ jobs:
           command: make -C packages*.lock write-builder-cache-keys
           name: Write builder layer cache keys
       - restore_cache:
-          key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+          key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
           keys:
-            - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+            - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
             - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
             - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
             - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -1094,9 +1018,9 @@ jobs:
           command: make -C packages*.lock write-builder-cache-keys
           name: Write builder layer cache keys
       - restore_cache:
-          key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+          key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
           keys:
-            - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+            - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
             - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
             - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
             - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -1167,9 +1091,9 @@ jobs:
           command: make -C packages*.lock write-builder-cache-keys
           name: Write builder layer cache keys
       - restore_cache:
-          key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+          key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
           keys:
-            - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+            - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
             - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
             - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
             - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -1240,9 +1164,9 @@ jobs:
           command: make -C packages*.lock write-builder-cache-keys
           name: Write builder layer cache keys
       - restore_cache:
-          key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+          key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
           keys:
-            - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+            - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
             - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
             - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
             - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -1313,9 +1237,9 @@ jobs:
           command: make -C packages*.lock write-builder-cache-keys
           name: Write builder layer cache keys
       - restore_cache:
-          key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+          key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
           keys:
-            - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+            - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
             - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
             - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
             - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -1386,9 +1310,9 @@ jobs:
           command: make -C packages*.lock write-builder-cache-keys
           name: Write builder layer cache keys
       - restore_cache:
-          key: copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
+          key: copy-source_06ef_{{checksum ".buildcache/cache-keys/copy-source-06ef506e66bbcb20bd02ee09a472afa30f5f1fdc"}}
           keys:
-            - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
+            - warm-go-build-vendor-cache_934a_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-934adbf0c61d08f133350a0d6a25bb0d173fea84"}}
             - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
             - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
             - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
@@ -1429,15 +1353,14 @@ jobs:
     environment:
       PACKAGE_SPEC_ID: ad5e8d34df02b5ad2dd18d56208d1806c3f2a721
 workflows:
-  build-d4738432dabd028a:
+  build-439e958000af378a:
     jobs:
       - build-common-layers: {}
-      - darwin_386_package:
+      - darwin_amd64_package:
           requires:
             - build-common-layers
       - bundle-releases:
           requires:
-            - darwin_386_package
             - darwin_amd64_package
             - freebsd_386_package
             - freebsd_amd64_package
@@ -1453,9 +1376,6 @@ workflows:
             - solaris_amd64_package
             - windows_386_package
             - windows_amd64_package
-      - darwin_amd64_package:
-          requires:
-            - build-common-layers
       - freebsd_386_package:
           requires:
             - build-common-layers
diff --git a/.circleci/config/commands/go_test.yml b/.circleci/config/commands/go_test.yml
index e5f6880bc..bb35d8fff 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: "circleci/golang:1.14.7-stretch"
+    default: "circleci/golang:1.15.3-buster"
   use_docker:
     type: boolean
     default: false
diff --git a/README.md b/README.md
index 5a4404c86..b62bc22e0 100644
--- a/README.md
+++ b/README.md
@@ -70,7 +70,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.14.7+ is *required*.
+1.15.3+ 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/packages-oss.lock/layers/layers.mk b/packages-oss.lock/layers/layers.mk
index f0d777091..35b22c730 100755
--- a/packages-oss.lock/layers/layers.mk
+++ b/packages-oss.lock/layers/layers.mk
@@ -92,15 +92,6 @@ LAYER_08-warm-go-build-vendor-cache-288885788227a6677b0957f2e74c37fab736d98f_CAC
 LAYER_08-warm-go-build-vendor-cache-288885788227a6677b0957f2e74c37fab736d98f_ARCHIVE_FILE   := .buildcache/archives/08-warm-go-build-vendor-cache-288885788227a6677b0957f2e74c37fab736d98f.tar.gz
 $(eval $(call LAYER,$(LAYER_08-warm-go-build-vendor-cache-288885788227a6677b0957f2e74c37fab736d98f_ID),$(LAYER_08-warm-go-build-vendor-cache-288885788227a6677b0957f2e74c37fab736d98f_TYPE),$(LAYER_08-warm-go-build-vendor-cache-288885788227a6677b0957f2e74c37fab736d98f_BASE_LAYER),$(LAYER_08-warm-go-build-vendor-cache-288885788227a6677b0957f2e74c37fab736d98f_SOURCE_INCLUDE),$(LAYER_08-warm-go-build-vendor-cache-288885788227a6677b0957f2e74c37fab736d98f_SOURCE_EXCLUDE),$(LAYER_08-warm-go-build-vendor-cache-288885788227a6677b0957f2e74c37fab736d98f_CACHE_KEY_FILE),$(LAYER_08-warm-go-build-vendor-cache-288885788227a6677b0957f2e74c37fab736d98f_ARCHIVE_FILE)))
 
-LAYER_08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2_ID             := 08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2
-LAYER_08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2_TYPE           := warm-go-build-vendor-cache
-LAYER_08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2_BASE_LAYER     := 07-build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532
-LAYER_08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2_SOURCE_INCLUDE := vendor/
-LAYER_08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2_SOURCE_EXCLUDE := 
-LAYER_08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2_CACHE_KEY_FILE := .buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2
-LAYER_08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2_ARCHIVE_FILE   := .buildcache/archives/08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2.tar.gz
-$(eval $(call LAYER,$(LAYER_08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2_ID),$(LAYER_08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2_TYPE),$(LAYER_08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2_BASE_LAYER),$(LAYER_08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2_SOURCE_INCLUDE),$(LAYER_08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2_SOURCE_EXCLUDE),$(LAYER_08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2_CACHE_KEY_FILE),$(LAYER_08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2_ARCHIVE_FILE)))
-
 LAYER_08-warm-go-build-vendor-cache-2df4359fc2c482e1799a9fb6fcf5309b5d6c0b03_ID             := 08-warm-go-build-vendor-cache-2df4359fc2c482e1799a9fb6fcf5309b5d6c0b03
 LAYER_08-warm-go-build-vendor-cache-2df4359fc2c482e1799a9fb6fcf5309b5d6c0b03_TYPE           := warm-go-build-vendor-cache
 LAYER_08-warm-go-build-vendor-cache-2df4359fc2c482e1799a9fb6fcf5309b5d6c0b03_BASE_LAYER     := 07-build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532
@@ -254,15 +245,6 @@ LAYER_09-copy-source-366886a2ac7e9b8928c0753d89808c6577ca5647_CACHE_KEY_FILE :=
 LAYER_09-copy-source-366886a2ac7e9b8928c0753d89808c6577ca5647_ARCHIVE_FILE   := .buildcache/archives/09-copy-source-366886a2ac7e9b8928c0753d89808c6577ca5647.tar.gz
 $(eval $(call LAYER,$(LAYER_09-copy-source-366886a2ac7e9b8928c0753d89808c6577ca5647_ID),$(LAYER_09-copy-source-366886a2ac7e9b8928c0753d89808c6577ca5647_TYPE),$(LAYER_09-copy-source-366886a2ac7e9b8928c0753d89808c6577ca5647_BASE_LAYER),$(LAYER_09-copy-source-366886a2ac7e9b8928c0753d89808c6577ca5647_SOURCE_INCLUDE),$(LAYER_09-copy-source-366886a2ac7e9b8928c0753d89808c6577ca5647_SOURCE_EXCLUDE),$(LAYER_09-copy-source-366886a2ac7e9b8928c0753d89808c6577ca5647_CACHE_KEY_FILE),$(LAYER_09-copy-source-366886a2ac7e9b8928c0753d89808c6577ca5647_ARCHIVE_FILE)))
 
-LAYER_09-copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129_ID             := 09-copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129
-LAYER_09-copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129_TYPE           := copy-source
-LAYER_09-copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129_BASE_LAYER     := 08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2
-LAYER_09-copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129_SOURCE_INCLUDE := .
-LAYER_09-copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129_SOURCE_EXCLUDE := vendor/ ui/
-LAYER_09-copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129_CACHE_KEY_FILE := .buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129
-LAYER_09-copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129_ARCHIVE_FILE   := .buildcache/archives/09-copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129.tar.gz
-$(eval $(call LAYER,$(LAYER_09-copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129_ID),$(LAYER_09-copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129_TYPE),$(LAYER_09-copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129_BASE_LAYER),$(LAYER_09-copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129_SOURCE_INCLUDE),$(LAYER_09-copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129_SOURCE_EXCLUDE),$(LAYER_09-copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129_CACHE_KEY_FILE),$(LAYER_09-copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129_ARCHIVE_FILE)))
-
 LAYER_09-copy-source-53416d2f34d47941b4e082c5dde5555797b35cf3_ID             := 09-copy-source-53416d2f34d47941b4e082c5dde5555797b35cf3
 LAYER_09-copy-source-53416d2f34d47941b4e082c5dde5555797b35cf3_TYPE           := copy-source
 LAYER_09-copy-source-53416d2f34d47941b4e082c5dde5555797b35cf3_BASE_LAYER     := 08-warm-go-build-vendor-cache-0d366556f734e7a9a1a9a1fe319c07a45a4f95f5
diff --git a/packages-oss.lock/pkgs.yml b/packages-oss.lock/pkgs.yml
index b80becb29..182122657 100644
--- a/packages-oss.lock/pkgs.yml
+++ b/packages-oss.lock/pkgs.yml
@@ -1,78 +1,10 @@
 # ***
 # WARNING: Do not EDIT or MERGE this file, it is generated by packagespec.
 # ***
-lockid: d4738432dabd028a
+lockid: 439e958000af378a
 packagespec-version: 0.1.8
 cache-version: 10
 packages:
-  - packagespecid: 4d5c8238521df42de23b52310a3415cb695d4fb2
-    inputs:
-      BINARY_NAME: vault
-      CGO_ENABLED: "0"
-      GO_VERSION: 1.15.3
-      GO111MODULE: "off"
-      GOARCH: "386"
-      GOOS: darwin
-      PRODUCT_VERSION: 0.0.0-snapshot
-      PRODUCT_VERSION_MMP: 0.0.0
-      PRODUCT_VERSION_PRE: snapshot
-      YARN_VERSION: 1.19.1-1
-    meta:
-      BUILD_JOB_NAME: darwin_386_package
-      BUNDLE_NAME: vault_0.0.0-snapshot
-      builtin:
-        BUILD_LAYERS:
-          - type: copy-source
-            name: 09-copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129
-            archive: .buildcache/archives/09-copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129.tar.gz
-          - type: warm-go-build-vendor-cache
-            name: 08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2
-            archive: .buildcache/archives/08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2.tar.gz
-          - type: build-static-assets
-            name: 07-build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532
-            archive: .buildcache/archives/07-build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532.tar.gz
-          - type: build-ui
-            name: 06-build-ui-d4103be58748b6e071db728cbd54220aa1e4326e
-            archive: .buildcache/archives/06-build-ui-d4103be58748b6e071db728cbd54220aa1e4326e.tar.gz
-          - type: ui-dependencies
-            name: 05-ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8
-            archive: .buildcache/archives/05-ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8.tar.gz
-          - type: install-yarn
-            name: 04-install-yarn-bbaf7b58ff71fac3d054dba364ea5aa9169cf9f7
-            archive: .buildcache/archives/04-install-yarn-bbaf7b58ff71fac3d054dba364ea5aa9169cf9f7.tar.gz
-          - type: set-workdir
-            name: 03-set-workdir-f57397d33d7a62ba66ebcc200ecf774e5b8bda25
-            archive: .buildcache/archives/03-set-workdir-f57397d33d7a62ba66ebcc200ecf774e5b8bda25.tar.gz
-          - type: install-go-tools
-            name: 02-install-go-tools-93ff4bda3b82e8d26d9ed37fb2b8843639dd4761
-            archive: .buildcache/archives/02-install-go-tools-93ff4bda3b82e8d26d9ed37fb2b8843639dd4761.tar.gz
-          - type: install-go
-            name: 01-install-go-8dde98d41082e5612aa95b0984d75c52c11c2802
-            archive: .buildcache/archives/01-install-go-8dde98d41082e5612aa95b0984d75c52c11c2802.tar.gz
-          - type: base
-            name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c
-            archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz
-        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-4d5c8238521df42de23b52310a3415cb695d4fb2
-        POST_PROCESSORS: av-scan
-      circleci:
-        BUILDER_CACHE_KEY_PREFIX_LIST:
-          - copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
-          - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
-          - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
-          - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
-          - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
-          - install-yarn_bbaf_{{checksum ".buildcache/cache-keys/install-yarn-bbaf7b58ff71fac3d054dba364ea5aa9169cf9f7"}}
-          - set-workdir_f573_{{checksum ".buildcache/cache-keys/set-workdir-f57397d33d7a62ba66ebcc200ecf774e5b8bda25"}}
-          - install-go-tools_93ff_{{checksum ".buildcache/cache-keys/install-go-tools-93ff4bda3b82e8d26d9ed37fb2b8843639dd4761"}}
-          - install-go_8dde_{{checksum ".buildcache/cache-keys/install-go-8dde98d41082e5612aa95b0984d75c52c11c2802"}}
-          - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        PACKAGE_CACHE_KEY: package-4d5c8238521df42de23b52310a3415cb695d4fb2-{{checksum ".buildcache/cache-keys/package-4d5c8238521df42de23b52310a3415cb695d4fb2"}}
-    build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version; go build -v -tags ui -ldflags " -X $VERSION_PKG_PATH.GitCommit=$PACKAGE_SOURCE_ID -X $VERSION_PKG_PATH.Version=0.0.0 -X $VERSION_PKG_PATH.VersionPrerelease=snapshot" -o $OUTPUT_DIR/vault && cd $OUTPUT_DIR && zip $PACKAGE_ZIP_NAME vault
-    aliases:
-      - type: local
-        path: vault_0.0.0-snapshot_darwin_386.zip
-      - type: public-hc-releases
-        path: vault/vault_0.0.0-snapshot/vault_0.0.0-snapshot_darwin_386.zip
   - packagespecid: 83aaf1a9b14f45042b699ab313455cd2b4ee9fb1
     inputs:
       BINARY_NAME: vault
@@ -1461,7 +1393,7 @@ layers:
           - install-go-tools_93ff_{{checksum ".buildcache/cache-keys/install-go-tools-93ff4bda3b82e8d26d9ed37fb2b8843639dd4761"}}
           - install-go_8dde_{{checksum ".buildcache/cache-keys/install-go-8dde98d41082e5612aa95b0984d75c52c11c2802"}}
           - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-    childcount: 16
+    childcount: 15
   - depth: 8
     final: false
     type: warm-go-build-vendor-cache
@@ -1600,75 +1532,6 @@ layers:
           - install-go_8dde_{{checksum ".buildcache/cache-keys/install-go-8dde98d41082e5612aa95b0984d75c52c11c2802"}}
           - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
     childcount: 1
-  - depth: 8
-    final: false
-    type: warm-go-build-vendor-cache
-    id: 2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2
-    name: 08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2
-    parentname: 07-build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532
-    parenttype: build-static-assets
-    parentid: c16c92ba6efaac1d8ce78e253494d5990e673532
-    cachekeyfile: .buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2
-    sourceinclude: vendor/
-    sourceexclude: ""
-    archivefile: .buildcache/archives/08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2.tar.gz
-    dockerfile: |-
-      # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental
-      ARG BASE_IMAGE
-      FROM $BASE_IMAGE
-      COPY . ./
-      ENV GOOS=darwin
-      ENV GOARCH=386
-      ENV CGO_ENABLED=0
-      # Try to build vendored packages. We first filter out packages which report
-      # errors in 'go list', because trying to run go build ./vendor/... fails early
-      # if we include them. We also don't care about the exit code here, because
-      # some of the vendored packages may fail to build, but this won't necessarily
-      # mean that the final package will fail to build, and we will still get a
-      # usefully warmed cache.
-      RUN go list -f '{{.ImportPath}}{{if or .Error .DepsErrors}} ERROR{{end}}' ./vendor/... | grep -v ERROR | xargs go build -v || true
-    meta:
-      builtin:
-        LAYER_LIST:
-          - type: warm-go-build-vendor-cache
-            name: 08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2
-            archive: .buildcache/archives/08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2.tar.gz
-          - type: build-static-assets
-            name: 07-build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532
-            archive: .buildcache/archives/07-build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532.tar.gz
-          - type: build-ui
-            name: 06-build-ui-d4103be58748b6e071db728cbd54220aa1e4326e
-            archive: .buildcache/archives/06-build-ui-d4103be58748b6e071db728cbd54220aa1e4326e.tar.gz
-          - type: ui-dependencies
-            name: 05-ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8
-            archive: .buildcache/archives/05-ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8.tar.gz
-          - type: install-yarn
-            name: 04-install-yarn-bbaf7b58ff71fac3d054dba364ea5aa9169cf9f7
-            archive: .buildcache/archives/04-install-yarn-bbaf7b58ff71fac3d054dba364ea5aa9169cf9f7.tar.gz
-          - type: set-workdir
-            name: 03-set-workdir-f57397d33d7a62ba66ebcc200ecf774e5b8bda25
-            archive: .buildcache/archives/03-set-workdir-f57397d33d7a62ba66ebcc200ecf774e5b8bda25.tar.gz
-          - type: install-go-tools
-            name: 02-install-go-tools-93ff4bda3b82e8d26d9ed37fb2b8843639dd4761
-            archive: .buildcache/archives/02-install-go-tools-93ff4bda3b82e8d26d9ed37fb2b8843639dd4761.tar.gz
-          - type: install-go
-            name: 01-install-go-8dde98d41082e5612aa95b0984d75c52c11c2802
-            archive: .buildcache/archives/01-install-go-8dde98d41082e5612aa95b0984d75c52c11c2802.tar.gz
-          - type: base
-            name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c
-            archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz
-      circleci:
-        CACHE_KEY_PREFIX_LIST:
-          - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
-          - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
-          - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
-          - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
-          - install-yarn_bbaf_{{checksum ".buildcache/cache-keys/install-yarn-bbaf7b58ff71fac3d054dba364ea5aa9169cf9f7"}}
-          - set-workdir_f573_{{checksum ".buildcache/cache-keys/set-workdir-f57397d33d7a62ba66ebcc200ecf774e5b8bda25"}}
-          - install-go-tools_93ff_{{checksum ".buildcache/cache-keys/install-go-tools-93ff4bda3b82e8d26d9ed37fb2b8843639dd4761"}}
-          - install-go_8dde_{{checksum ".buildcache/cache-keys/install-go-8dde98d41082e5612aa95b0984d75c52c11c2802"}}
-          - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-    childcount: 1
   - depth: 8
     final: false
     type: warm-go-build-vendor-cache
@@ -2818,69 +2681,6 @@ layers:
           - install-go_8dde_{{checksum ".buildcache/cache-keys/install-go-8dde98d41082e5612aa95b0984d75c52c11c2802"}}
           - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
     childcount: 0
-  - depth: 9
-    final: true
-    type: copy-source
-    id: 4fbd883dbd1ea85319e94369ecd85de99f7ec129
-    name: 09-copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129
-    parentname: 08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2
-    parenttype: warm-go-build-vendor-cache
-    parentid: 2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2
-    cachekeyfile: .buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129
-    sourceinclude: .
-    sourceexclude: vendor/ ui/
-    archivefile: .buildcache/archives/09-copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129.tar.gz
-    dockerfile: |
-      # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental
-      ARG BASE_IMAGE
-      FROM $BASE_IMAGE
-      COPY . ./
-    meta:
-      builtin:
-        LAYER_LIST:
-          - type: copy-source
-            name: 09-copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129
-            archive: .buildcache/archives/09-copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129.tar.gz
-          - type: warm-go-build-vendor-cache
-            name: 08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2
-            archive: .buildcache/archives/08-warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2.tar.gz
-          - type: build-static-assets
-            name: 07-build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532
-            archive: .buildcache/archives/07-build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532.tar.gz
-          - type: build-ui
-            name: 06-build-ui-d4103be58748b6e071db728cbd54220aa1e4326e
-            archive: .buildcache/archives/06-build-ui-d4103be58748b6e071db728cbd54220aa1e4326e.tar.gz
-          - type: ui-dependencies
-            name: 05-ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8
-            archive: .buildcache/archives/05-ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8.tar.gz
-          - type: install-yarn
-            name: 04-install-yarn-bbaf7b58ff71fac3d054dba364ea5aa9169cf9f7
-            archive: .buildcache/archives/04-install-yarn-bbaf7b58ff71fac3d054dba364ea5aa9169cf9f7.tar.gz
-          - type: set-workdir
-            name: 03-set-workdir-f57397d33d7a62ba66ebcc200ecf774e5b8bda25
-            archive: .buildcache/archives/03-set-workdir-f57397d33d7a62ba66ebcc200ecf774e5b8bda25.tar.gz
-          - type: install-go-tools
-            name: 02-install-go-tools-93ff4bda3b82e8d26d9ed37fb2b8843639dd4761
-            archive: .buildcache/archives/02-install-go-tools-93ff4bda3b82e8d26d9ed37fb2b8843639dd4761.tar.gz
-          - type: install-go
-            name: 01-install-go-8dde98d41082e5612aa95b0984d75c52c11c2802
-            archive: .buildcache/archives/01-install-go-8dde98d41082e5612aa95b0984d75c52c11c2802.tar.gz
-          - type: base
-            name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c
-            archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz
-      circleci:
-        CACHE_KEY_PREFIX_LIST:
-          - copy-source_4fbd_{{checksum ".buildcache/cache-keys/copy-source-4fbd883dbd1ea85319e94369ecd85de99f7ec129"}}
-          - warm-go-build-vendor-cache_2d2f_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-2d2f851f7fd3b3d15efa5eddfb198a2fc0fee7c2"}}
-          - build-static-assets_c16c_{{checksum ".buildcache/cache-keys/build-static-assets-c16c92ba6efaac1d8ce78e253494d5990e673532"}}
-          - build-ui_d410_{{checksum ".buildcache/cache-keys/build-ui-d4103be58748b6e071db728cbd54220aa1e4326e"}}
-          - ui-dependencies_91f5_{{checksum ".buildcache/cache-keys/ui-dependencies-91f59cc67fec4697ade6f0c892970ba7bd23e0a8"}}
-          - install-yarn_bbaf_{{checksum ".buildcache/cache-keys/install-yarn-bbaf7b58ff71fac3d054dba364ea5aa9169cf9f7"}}
-          - set-workdir_f573_{{checksum ".buildcache/cache-keys/set-workdir-f57397d33d7a62ba66ebcc200ecf774e5b8bda25"}}
-          - install-go-tools_93ff_{{checksum ".buildcache/cache-keys/install-go-tools-93ff4bda3b82e8d26d9ed37fb2b8843639dd4761"}}
-          - install-go_8dde_{{checksum ".buildcache/cache-keys/install-go-8dde98d41082e5612aa95b0984d75c52c11c2802"}}
-          - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-    childcount: 0
   - depth: 9
     final: true
     type: copy-source
diff --git a/packages-oss.yml b/packages-oss.yml
index f697854d4..6828bb9b7 100644
--- a/packages-oss.yml
+++ b/packages-oss.yml
@@ -102,7 +102,6 @@ build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/has
 # The fully expanded set of packages are written to packages.lock. That file
 # is a useful data source for building CI/CD pipelines.
 packages:
-  - inputs: { GOOS: darwin, GOARCH: 386 }
   - inputs: { GOOS: darwin, GOARCH: amd64 }
   - inputs: { GOOS: freebsd, GOARCH: 386 }
   - inputs: { GOOS: freebsd, GOARCH: amd64 }