diff --git a/.circleci/config.yml b/.circleci/config.yml
index a842337bee..f533501668 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,9 +21,6 @@ jobs:
     - restore_cache:
         key: package-cbdbdba3a25dc848c96b3600c11eff858392b7b1-{{checksum ".buildcache/cache-keys/package-cbdbdba3a25dc848c96b3600c11eff858392b7b1"}}
         name: Restore package cache
-    - restore_cache:
-        key: package-97a54b601b4f8e95e365b6cbfb7ced2db20a19fb-{{checksum ".buildcache/cache-keys/package-97a54b601b4f8e95e365b6cbfb7ced2db20a19fb"}}
-        name: Restore package cache
     - restore_cache:
         key: package-0724dc55f36e7d43ff29c7712c868c97495e1093-{{checksum ".buildcache/cache-keys/package-0724dc55f36e7d43ff29c7712c868c97495e1093"}}
         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-c92e36137d5c5886.yml
+        command: cp packages*.lock/pkgs.yml lockfile-295bfc01d2f779fc.yml
         name: Update Lockfile Name
     - run:
-        command: tar -czf packages-c92e36137d5c5886.tar.gz .buildcache/packages lockfile-c92e36137d5c5886.yml
+        command: tar -czf packages-295bfc01d2f779fc.tar.gz .buildcache/packages lockfile-295bfc01d2f779fc.yml
         name: Create Raw Package Tarball
     - run:
-        command: tar -czf meta-c92e36137d5c5886.tar.gz .buildcache/packages/store/*.json lockfile-c92e36137d5c5886.yml
+        command: tar -czf meta-295bfc01d2f779fc.tar.gz .buildcache/packages/store/*.json lockfile-295bfc01d2f779fc.yml
         name: Create Metadata Tarball
     - store_artifacts:
-        path: lockfile-c92e36137d5c5886.yml
+        path: lockfile-295bfc01d2f779fc.yml
     - store_artifacts:
-        path: packages-c92e36137d5c5886.tar.gz
+        path: packages-295bfc01d2f779fc.tar.gz
     - store_artifacts:
-        path: meta-c92e36137d5c5886.tar.gz
+        path: meta-295bfc01d2f779fc.tar.gz
     - store_artifacts:
         path: .buildcache/packages
     environment:
@@ -174,84 +171,6 @@ jobs:
         name: Save package cache
         paths:
         - .buildcache/packages/store
-  darwin_arm64_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: 97a54b601b4f8e95e365b6cbfb7ced2db20a19fb
-    steps:
-    - setup_remote_docker:
-        docker_layer_caching: false
-        version: 19.03.12
-    - add_ssh_keys:
-        fingerprints:
-        - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
-    - checkout:
-        path: .
-    - run:
-        command: make -C packages*.lock write-package-cache-key
-        name: Write package cache key
-    - restore_cache:
-        key: package-97a54b601b4f8e95e365b6cbfb7ced2db20a19fb-{{checksum ".buildcache/cache-keys/package-97a54b601b4f8e95e365b6cbfb7ced2db20a19fb"}}
-        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_f4d8_{{checksum ".buildcache/cache-keys/copy-source-f4d858fefd04dbc5852777d5c75257a58a52e1ad"}}
-        keys:
-        - warm-go-build-vendor-cache_dcbb_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-dcbb2085ceca726bbb20e68e590b7745bdfc34a3"}}
-        - build-static-assets_373e_{{checksum ".buildcache/cache-keys/build-static-assets-373ea9e750a0bd0fe70f0e11fc92d848bfe14dbc"}}
-        - build-ui_993e_{{checksum ".buildcache/cache-keys/build-ui-993e50cbb3d37120b1391442177827b615c77f82"}}
-        - ui-dependencies_5132_{{checksum ".buildcache/cache-keys/ui-dependencies-513283a98d2b8a1570bf027e95364b888df651a9"}}
-        - install-yarn_6b98_{{checksum ".buildcache/cache-keys/install-yarn-6b98fb22387ba58bb85acb0cc5909e6b6b2dbfea"}}
-        - set-workdir_577a_{{checksum ".buildcache/cache-keys/set-workdir-577aad3893a929a48a2ce7319179c253507dee67"}}
-        - install-go-tools_a10e_{{checksum ".buildcache/cache-keys/install-go-tools-a10e38af920222100809a5d52ac413e922688b48"}}
-        - install-go_d3cf_{{checksum ".buildcache/cache-keys/install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b"}}
-        - 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-97a54b601b4f8e95e365b6cbfb7ced2db20a19fb-{{checksum ".buildcache/cache-keys/package-97a54b601b4f8e95e365b6cbfb7ced2db20a19fb"}}
-        name: Save package cache
-        paths:
-        - .buildcache/packages/store
   windows_386_package:
     docker:
     - image: docker.mirror.hashicorp.services/circleci/buildpack-deps
@@ -2488,7 +2407,7 @@ jobs:
     - GO_TAGS: ''
     - GO111MODULE: 'off'
 workflows:
-  build-c92e36137d5c5886:
+  build-295bfc01d2f779fc:
     jobs:
     - build-common-layers
     - darwin_amd64_package:
@@ -2497,7 +2416,6 @@ workflows:
     - bundle-releases:
         requires:
         - darwin_amd64_package
-        - darwin_arm64_package
         - freebsd_386_package
         - freebsd_amd64_package
         - freebsd_arm_package
@@ -2512,9 +2430,6 @@ workflows:
         - solaris_amd64_package
         - windows_386_package
         - windows_amd64_package
-    - darwin_arm64_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 be95d22c68..95bca15166 100644
--- a/.circleci/config/@build-release.yml
+++ b/.circleci/config/@build-release.yml
@@ -189,9 +189,6 @@ jobs:
       - restore_cache:
           key: package-cbdbdba3a25dc848c96b3600c11eff858392b7b1-{{checksum ".buildcache/cache-keys/package-cbdbdba3a25dc848c96b3600c11eff858392b7b1"}}
           name: Restore package cache
-      - restore_cache:
-          key: package-97a54b601b4f8e95e365b6cbfb7ced2db20a19fb-{{checksum ".buildcache/cache-keys/package-97a54b601b4f8e95e365b6cbfb7ced2db20a19fb"}}
-          name: Restore package cache
       - restore_cache:
           key: package-0724dc55f36e7d43ff29c7712c868c97495e1093-{{checksum ".buildcache/cache-keys/package-0724dc55f36e7d43ff29c7712c868c97495e1093"}}
           name: Restore package cache
@@ -244,20 +241,20 @@ jobs:
           command: ls -lahR .buildcache
           name: List Build Cache
       - run:
-          command: cp packages*.lock/pkgs.yml lockfile-c92e36137d5c5886.yml
+          command: cp packages*.lock/pkgs.yml lockfile-295bfc01d2f779fc.yml
           name: Update Lockfile Name
       - run:
-          command: tar -czf packages-c92e36137d5c5886.tar.gz .buildcache/packages lockfile-c92e36137d5c5886.yml
+          command: tar -czf packages-295bfc01d2f779fc.tar.gz .buildcache/packages lockfile-295bfc01d2f779fc.yml
           name: Create Raw Package Tarball
       - run:
-          command: tar -czf meta-c92e36137d5c5886.tar.gz .buildcache/packages/store/*.json lockfile-c92e36137d5c5886.yml
+          command: tar -czf meta-295bfc01d2f779fc.tar.gz .buildcache/packages/store/*.json lockfile-295bfc01d2f779fc.yml
           name: Create Metadata Tarball
       - store_artifacts:
-          path: lockfile-c92e36137d5c5886.yml
+          path: lockfile-295bfc01d2f779fc.yml
       - store_artifacts:
-          path: packages-c92e36137d5c5886.tar.gz
+          path: packages-295bfc01d2f779fc.tar.gz
       - store_artifacts:
-          path: meta-c92e36137d5c5886.tar.gz
+          path: meta-295bfc01d2f779fc.tar.gz
       - store_artifacts:
           path: .buildcache/packages
   darwin_amd64_package:
@@ -333,79 +330,6 @@ jobs:
           name: Save package cache
     environment:
       PACKAGE_SPEC_ID: cbdbdba3a25dc848c96b3600c11eff858392b7b1
-  darwin_arm64_package:
-    executor: builder
-    steps:
-      - setup_remote_docker:
-          version: 19.03.12
-          docker_layer_caching: false
-      - add_ssh_keys:
-          fingerprints:
-            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
-      - checkout:
-          path: .
-      - run:
-          command: make -C packages*.lock write-package-cache-key
-          name: Write package cache key
-      - restore_cache:
-          key: package-97a54b601b4f8e95e365b6cbfb7ced2db20a19fb-{{checksum ".buildcache/cache-keys/package-97a54b601b4f8e95e365b6cbfb7ced2db20a19fb"}}
-          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_f4d8_{{checksum ".buildcache/cache-keys/copy-source-f4d858fefd04dbc5852777d5c75257a58a52e1ad"}}
-          keys:
-            - warm-go-build-vendor-cache_dcbb_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-dcbb2085ceca726bbb20e68e590b7745bdfc34a3"}}
-            - build-static-assets_373e_{{checksum ".buildcache/cache-keys/build-static-assets-373ea9e750a0bd0fe70f0e11fc92d848bfe14dbc"}}
-            - build-ui_993e_{{checksum ".buildcache/cache-keys/build-ui-993e50cbb3d37120b1391442177827b615c77f82"}}
-            - ui-dependencies_5132_{{checksum ".buildcache/cache-keys/ui-dependencies-513283a98d2b8a1570bf027e95364b888df651a9"}}
-            - install-yarn_6b98_{{checksum ".buildcache/cache-keys/install-yarn-6b98fb22387ba58bb85acb0cc5909e6b6b2dbfea"}}
-            - set-workdir_577a_{{checksum ".buildcache/cache-keys/set-workdir-577aad3893a929a48a2ce7319179c253507dee67"}}
-            - install-go-tools_a10e_{{checksum ".buildcache/cache-keys/install-go-tools-a10e38af920222100809a5d52ac413e922688b48"}}
-            - install-go_d3cf_{{checksum ".buildcache/cache-keys/install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b"}}
-            - 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-97a54b601b4f8e95e365b6cbfb7ced2db20a19fb-{{checksum ".buildcache/cache-keys/package-97a54b601b4f8e95e365b6cbfb7ced2db20a19fb"}}
-          name: Save package cache
-    environment:
-      PACKAGE_SPEC_ID: 97a54b601b4f8e95e365b6cbfb7ced2db20a19fb
   freebsd_386_package:
     executor: builder
     steps:
@@ -1429,7 +1353,7 @@ jobs:
     environment:
       PACKAGE_SPEC_ID: abcc2f1feaa4aa4bf7ee90971cb41812c895970f
 workflows:
-  build-c92e36137d5c5886:
+  build-295bfc01d2f779fc:
     jobs:
       - build-common-layers: {}
       - darwin_amd64_package:
@@ -1438,7 +1362,6 @@ workflows:
       - bundle-releases:
           requires:
             - darwin_amd64_package
-            - darwin_arm64_package
             - freebsd_386_package
             - freebsd_amd64_package
             - freebsd_arm_package
@@ -1453,9 +1376,6 @@ workflows:
             - solaris_amd64_package
             - windows_386_package
             - windows_amd64_package
-      - darwin_arm64_package:
-          requires:
-            - build-common-layers
       - freebsd_386_package:
           requires:
             - build-common-layers
diff --git a/packages-oss.lock/layers/layers.mk b/packages-oss.lock/layers/layers.mk
index 7b4a688f08..443efa4bb5 100755
--- a/packages-oss.lock/layers/layers.mk
+++ b/packages-oss.lock/layers/layers.mk
@@ -83,15 +83,6 @@ LAYER_08-warm-go-build-vendor-cache-341f60b74bdff9dfdfadb4d48703263123e3da68_CAC
 LAYER_08-warm-go-build-vendor-cache-341f60b74bdff9dfdfadb4d48703263123e3da68_ARCHIVE_FILE   := .buildcache/archives/08-warm-go-build-vendor-cache-341f60b74bdff9dfdfadb4d48703263123e3da68.tar.gz
 $(eval $(call LAYER,$(LAYER_08-warm-go-build-vendor-cache-341f60b74bdff9dfdfadb4d48703263123e3da68_ID),$(LAYER_08-warm-go-build-vendor-cache-341f60b74bdff9dfdfadb4d48703263123e3da68_TYPE),$(LAYER_08-warm-go-build-vendor-cache-341f60b74bdff9dfdfadb4d48703263123e3da68_BASE_LAYER),$(LAYER_08-warm-go-build-vendor-cache-341f60b74bdff9dfdfadb4d48703263123e3da68_SOURCE_INCLUDE),$(LAYER_08-warm-go-build-vendor-cache-341f60b74bdff9dfdfadb4d48703263123e3da68_SOURCE_EXCLUDE),$(LAYER_08-warm-go-build-vendor-cache-341f60b74bdff9dfdfadb4d48703263123e3da68_CACHE_KEY_FILE),$(LAYER_08-warm-go-build-vendor-cache-341f60b74bdff9dfdfadb4d48703263123e3da68_ARCHIVE_FILE)))
 
-LAYER_08-warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e_ID             := 08-warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e
-LAYER_08-warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e_TYPE           := warm-go-build-vendor-cache
-LAYER_08-warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e_BASE_LAYER     := 07-build-static-assets-373ea9e750a0bd0fe70f0e11fc92d848bfe14dbc
-LAYER_08-warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e_SOURCE_INCLUDE := vendor/
-LAYER_08-warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e_SOURCE_EXCLUDE := 
-LAYER_08-warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e_CACHE_KEY_FILE := .buildcache/cache-keys/warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e
-LAYER_08-warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e_ARCHIVE_FILE   := .buildcache/archives/08-warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e.tar.gz
-$(eval $(call LAYER,$(LAYER_08-warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e_ID),$(LAYER_08-warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e_TYPE),$(LAYER_08-warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e_BASE_LAYER),$(LAYER_08-warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e_SOURCE_INCLUDE),$(LAYER_08-warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e_SOURCE_EXCLUDE),$(LAYER_08-warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e_CACHE_KEY_FILE),$(LAYER_08-warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e_ARCHIVE_FILE)))
-
 LAYER_08-warm-go-build-vendor-cache-4d95e24e5b6e3eb95e5d13824b299b8e9fb0cf70_ID             := 08-warm-go-build-vendor-cache-4d95e24e5b6e3eb95e5d13824b299b8e9fb0cf70
 LAYER_08-warm-go-build-vendor-cache-4d95e24e5b6e3eb95e5d13824b299b8e9fb0cf70_TYPE           := warm-go-build-vendor-cache
 LAYER_08-warm-go-build-vendor-cache-4d95e24e5b6e3eb95e5d13824b299b8e9fb0cf70_BASE_LAYER     := 07-build-static-assets-373ea9e750a0bd0fe70f0e11fc92d848bfe14dbc
@@ -344,15 +335,6 @@ LAYER_09-copy-source-db0de160f831cbbb555e3f36e48440b680ebc7d1_CACHE_KEY_FILE :=
 LAYER_09-copy-source-db0de160f831cbbb555e3f36e48440b680ebc7d1_ARCHIVE_FILE   := .buildcache/archives/09-copy-source-db0de160f831cbbb555e3f36e48440b680ebc7d1.tar.gz
 $(eval $(call LAYER,$(LAYER_09-copy-source-db0de160f831cbbb555e3f36e48440b680ebc7d1_ID),$(LAYER_09-copy-source-db0de160f831cbbb555e3f36e48440b680ebc7d1_TYPE),$(LAYER_09-copy-source-db0de160f831cbbb555e3f36e48440b680ebc7d1_BASE_LAYER),$(LAYER_09-copy-source-db0de160f831cbbb555e3f36e48440b680ebc7d1_SOURCE_INCLUDE),$(LAYER_09-copy-source-db0de160f831cbbb555e3f36e48440b680ebc7d1_SOURCE_EXCLUDE),$(LAYER_09-copy-source-db0de160f831cbbb555e3f36e48440b680ebc7d1_CACHE_KEY_FILE),$(LAYER_09-copy-source-db0de160f831cbbb555e3f36e48440b680ebc7d1_ARCHIVE_FILE)))
 
-LAYER_09-copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991_ID             := 09-copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991
-LAYER_09-copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991_TYPE           := copy-source
-LAYER_09-copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991_BASE_LAYER     := 08-warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e
-LAYER_09-copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991_SOURCE_INCLUDE := .
-LAYER_09-copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991_SOURCE_EXCLUDE := vendor/ ui/
-LAYER_09-copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991_CACHE_KEY_FILE := .buildcache/cache-keys/copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991
-LAYER_09-copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991_ARCHIVE_FILE   := .buildcache/archives/09-copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991.tar.gz
-$(eval $(call LAYER,$(LAYER_09-copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991_ID),$(LAYER_09-copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991_TYPE),$(LAYER_09-copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991_BASE_LAYER),$(LAYER_09-copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991_SOURCE_INCLUDE),$(LAYER_09-copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991_SOURCE_EXCLUDE),$(LAYER_09-copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991_CACHE_KEY_FILE),$(LAYER_09-copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991_ARCHIVE_FILE)))
-
 LAYER_09-copy-source-f4d858fefd04dbc5852777d5c75257a58a52e1ad_ID             := 09-copy-source-f4d858fefd04dbc5852777d5c75257a58a52e1ad
 LAYER_09-copy-source-f4d858fefd04dbc5852777d5c75257a58a52e1ad_TYPE           := copy-source
 LAYER_09-copy-source-f4d858fefd04dbc5852777d5c75257a58a52e1ad_BASE_LAYER     := 08-warm-go-build-vendor-cache-dcbb2085ceca726bbb20e68e590b7745bdfc34a3
diff --git a/packages-oss.lock/pkgs.yml b/packages-oss.lock/pkgs.yml
index daf565b3b2..ce79f7b502 100644
--- a/packages-oss.lock/pkgs.yml
+++ b/packages-oss.lock/pkgs.yml
@@ -1,8 +1,8 @@
 # ***
 # WARNING: Do not EDIT or MERGE this file, it is generated by packagespec.
 # ***
-lockid: c92e36137d5c5886
-packagespec-version: 0.2.5
+lockid: 295bfc01d2f779fc
+packagespec-version: 0.2.6
 cache-version: 10
 packages:
   - packagespecid: cbdbdba3a25dc848c96b3600c11eff858392b7b1
@@ -73,74 +73,6 @@ packages:
         path: vault_0.0.0-snapshot_darwin_amd64.zip
       - type: public-hc-releases
         path: vault/vault_0.0.0-snapshot/vault_0.0.0-snapshot_darwin_amd64.zip
-  - packagespecid: 97a54b601b4f8e95e365b6cbfb7ced2db20a19fb
-    inputs:
-      BINARY_NAME: vault
-      CGO_ENABLED: "0"
-      GO_VERSION: 1.16.2
-      GO111MODULE: "off"
-      GOARCH: arm64
-      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_arm64_package
-      BUNDLE_NAME: vault_0.0.0-snapshot
-      builtin:
-        BUILD_LAYERS:
-          - type: copy-source
-            name: 09-copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991
-            archive: .buildcache/archives/09-copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991.tar.gz
-          - type: warm-go-build-vendor-cache
-            name: 08-warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e
-            archive: .buildcache/archives/08-warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e.tar.gz
-          - type: build-static-assets
-            name: 07-build-static-assets-373ea9e750a0bd0fe70f0e11fc92d848bfe14dbc
-            archive: .buildcache/archives/07-build-static-assets-373ea9e750a0bd0fe70f0e11fc92d848bfe14dbc.tar.gz
-          - type: build-ui
-            name: 06-build-ui-993e50cbb3d37120b1391442177827b615c77f82
-            archive: .buildcache/archives/06-build-ui-993e50cbb3d37120b1391442177827b615c77f82.tar.gz
-          - type: ui-dependencies
-            name: 05-ui-dependencies-513283a98d2b8a1570bf027e95364b888df651a9
-            archive: .buildcache/archives/05-ui-dependencies-513283a98d2b8a1570bf027e95364b888df651a9.tar.gz
-          - type: install-yarn
-            name: 04-install-yarn-6b98fb22387ba58bb85acb0cc5909e6b6b2dbfea
-            archive: .buildcache/archives/04-install-yarn-6b98fb22387ba58bb85acb0cc5909e6b6b2dbfea.tar.gz
-          - type: set-workdir
-            name: 03-set-workdir-577aad3893a929a48a2ce7319179c253507dee67
-            archive: .buildcache/archives/03-set-workdir-577aad3893a929a48a2ce7319179c253507dee67.tar.gz
-          - type: install-go-tools
-            name: 02-install-go-tools-a10e38af920222100809a5d52ac413e922688b48
-            archive: .buildcache/archives/02-install-go-tools-a10e38af920222100809a5d52ac413e922688b48.tar.gz
-          - type: install-go
-            name: 01-install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b
-            archive: .buildcache/archives/01-install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b.tar.gz
-          - type: base
-            name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c
-            archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz
-        PACKAGE_CACHE_KEY_FILE: .buildcache/cache-keys/package-97a54b601b4f8e95e365b6cbfb7ced2db20a19fb
-        POST_PROCESSORS: apple-notarize av-scan
-      circleci:
-        BUILDER_CACHE_KEY_PREFIX_LIST:
-          - copy-source_dd0d_{{checksum ".buildcache/cache-keys/copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991"}}
-          - warm-go-build-vendor-cache_434d_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e"}}
-          - build-static-assets_373e_{{checksum ".buildcache/cache-keys/build-static-assets-373ea9e750a0bd0fe70f0e11fc92d848bfe14dbc"}}
-          - build-ui_993e_{{checksum ".buildcache/cache-keys/build-ui-993e50cbb3d37120b1391442177827b615c77f82"}}
-          - ui-dependencies_5132_{{checksum ".buildcache/cache-keys/ui-dependencies-513283a98d2b8a1570bf027e95364b888df651a9"}}
-          - install-yarn_6b98_{{checksum ".buildcache/cache-keys/install-yarn-6b98fb22387ba58bb85acb0cc5909e6b6b2dbfea"}}
-          - set-workdir_577a_{{checksum ".buildcache/cache-keys/set-workdir-577aad3893a929a48a2ce7319179c253507dee67"}}
-          - install-go-tools_a10e_{{checksum ".buildcache/cache-keys/install-go-tools-a10e38af920222100809a5d52ac413e922688b48"}}
-          - install-go_d3cf_{{checksum ".buildcache/cache-keys/install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b"}}
-          - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-        PACKAGE_CACHE_KEY: package-97a54b601b4f8e95e365b6cbfb7ced2db20a19fb-{{checksum ".buildcache/cache-keys/package-97a54b601b4f8e95e365b6cbfb7ced2db20a19fb"}}
-    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_arm64.zip
-      - type: public-hc-releases
-        path: vault/vault_0.0.0-snapshot/vault_0.0.0-snapshot_darwin_arm64.zip
   - packagespecid: 0724dc55f36e7d43ff29c7712c868c97495e1093
     inputs:
       BINARY_NAME: vault
@@ -1461,7 +1393,7 @@ layers:
           - install-go-tools_a10e_{{checksum ".buildcache/cache-keys/install-go-tools-a10e38af920222100809a5d52ac413e922688b48"}}
           - install-go_d3cf_{{checksum ".buildcache/cache-keys/install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b"}}
           - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-    childcount: 16
+    childcount: 15
   - depth: 8
     final: false
     type: warm-go-build-vendor-cache
@@ -1531,75 +1463,6 @@ layers:
           - install-go_d3cf_{{checksum ".buildcache/cache-keys/install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b"}}
           - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
     childcount: 1
-  - depth: 8
-    final: false
-    type: warm-go-build-vendor-cache
-    id: 434d8c719fd4c65ec213c71c7dc9ded9d87c785e
-    name: 08-warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e
-    parentname: 07-build-static-assets-373ea9e750a0bd0fe70f0e11fc92d848bfe14dbc
-    parenttype: build-static-assets
-    parentid: 373ea9e750a0bd0fe70f0e11fc92d848bfe14dbc
-    cachekeyfile: .buildcache/cache-keys/warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e
-    sourceinclude: vendor/
-    sourceexclude: ""
-    archivefile: .buildcache/archives/08-warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e.tar.gz
-    dockerfile: |-
-      # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental
-      ARG BASE_IMAGE
-      FROM $BASE_IMAGE
-      COPY . ./
-      ENV GOOS=darwin
-      ENV GOARCH=arm64
-      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-434d8c719fd4c65ec213c71c7dc9ded9d87c785e
-            archive: .buildcache/archives/08-warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e.tar.gz
-          - type: build-static-assets
-            name: 07-build-static-assets-373ea9e750a0bd0fe70f0e11fc92d848bfe14dbc
-            archive: .buildcache/archives/07-build-static-assets-373ea9e750a0bd0fe70f0e11fc92d848bfe14dbc.tar.gz
-          - type: build-ui
-            name: 06-build-ui-993e50cbb3d37120b1391442177827b615c77f82
-            archive: .buildcache/archives/06-build-ui-993e50cbb3d37120b1391442177827b615c77f82.tar.gz
-          - type: ui-dependencies
-            name: 05-ui-dependencies-513283a98d2b8a1570bf027e95364b888df651a9
-            archive: .buildcache/archives/05-ui-dependencies-513283a98d2b8a1570bf027e95364b888df651a9.tar.gz
-          - type: install-yarn
-            name: 04-install-yarn-6b98fb22387ba58bb85acb0cc5909e6b6b2dbfea
-            archive: .buildcache/archives/04-install-yarn-6b98fb22387ba58bb85acb0cc5909e6b6b2dbfea.tar.gz
-          - type: set-workdir
-            name: 03-set-workdir-577aad3893a929a48a2ce7319179c253507dee67
-            archive: .buildcache/archives/03-set-workdir-577aad3893a929a48a2ce7319179c253507dee67.tar.gz
-          - type: install-go-tools
-            name: 02-install-go-tools-a10e38af920222100809a5d52ac413e922688b48
-            archive: .buildcache/archives/02-install-go-tools-a10e38af920222100809a5d52ac413e922688b48.tar.gz
-          - type: install-go
-            name: 01-install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b
-            archive: .buildcache/archives/01-install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b.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_434d_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e"}}
-          - build-static-assets_373e_{{checksum ".buildcache/cache-keys/build-static-assets-373ea9e750a0bd0fe70f0e11fc92d848bfe14dbc"}}
-          - build-ui_993e_{{checksum ".buildcache/cache-keys/build-ui-993e50cbb3d37120b1391442177827b615c77f82"}}
-          - ui-dependencies_5132_{{checksum ".buildcache/cache-keys/ui-dependencies-513283a98d2b8a1570bf027e95364b888df651a9"}}
-          - install-yarn_6b98_{{checksum ".buildcache/cache-keys/install-yarn-6b98fb22387ba58bb85acb0cc5909e6b6b2dbfea"}}
-          - set-workdir_577a_{{checksum ".buildcache/cache-keys/set-workdir-577aad3893a929a48a2ce7319179c253507dee67"}}
-          - install-go-tools_a10e_{{checksum ".buildcache/cache-keys/install-go-tools-a10e38af920222100809a5d52ac413e922688b48"}}
-          - install-go_d3cf_{{checksum ".buildcache/cache-keys/install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b"}}
-          - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
-    childcount: 1
   - depth: 8
     final: false
     type: warm-go-build-vendor-cache
@@ -3448,69 +3311,6 @@ layers:
           - install-go_d3cf_{{checksum ".buildcache/cache-keys/install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b"}}
           - base_c6cd_{{checksum ".buildcache/cache-keys/base-c6cdf1b224722d2520e082320f2a71875913247c"}}
     childcount: 0
-  - depth: 9
-    final: true
-    type: copy-source
-    id: dd0dc694505493c7f1a8a68d088d576b8c3ba991
-    name: 09-copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991
-    parentname: 08-warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e
-    parenttype: warm-go-build-vendor-cache
-    parentid: 434d8c719fd4c65ec213c71c7dc9ded9d87c785e
-    cachekeyfile: .buildcache/cache-keys/copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991
-    sourceinclude: .
-    sourceexclude: vendor/ ui/
-    archivefile: .buildcache/archives/09-copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991.tar.gz
-    dockerfile: |
-      # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental
-      ARG BASE_IMAGE
-      FROM $BASE_IMAGE
-      COPY . ./
-    meta:
-      builtin:
-        LAYER_LIST:
-          - type: copy-source
-            name: 09-copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991
-            archive: .buildcache/archives/09-copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991.tar.gz
-          - type: warm-go-build-vendor-cache
-            name: 08-warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e
-            archive: .buildcache/archives/08-warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e.tar.gz
-          - type: build-static-assets
-            name: 07-build-static-assets-373ea9e750a0bd0fe70f0e11fc92d848bfe14dbc
-            archive: .buildcache/archives/07-build-static-assets-373ea9e750a0bd0fe70f0e11fc92d848bfe14dbc.tar.gz
-          - type: build-ui
-            name: 06-build-ui-993e50cbb3d37120b1391442177827b615c77f82
-            archive: .buildcache/archives/06-build-ui-993e50cbb3d37120b1391442177827b615c77f82.tar.gz
-          - type: ui-dependencies
-            name: 05-ui-dependencies-513283a98d2b8a1570bf027e95364b888df651a9
-            archive: .buildcache/archives/05-ui-dependencies-513283a98d2b8a1570bf027e95364b888df651a9.tar.gz
-          - type: install-yarn
-            name: 04-install-yarn-6b98fb22387ba58bb85acb0cc5909e6b6b2dbfea
-            archive: .buildcache/archives/04-install-yarn-6b98fb22387ba58bb85acb0cc5909e6b6b2dbfea.tar.gz
-          - type: set-workdir
-            name: 03-set-workdir-577aad3893a929a48a2ce7319179c253507dee67
-            archive: .buildcache/archives/03-set-workdir-577aad3893a929a48a2ce7319179c253507dee67.tar.gz
-          - type: install-go-tools
-            name: 02-install-go-tools-a10e38af920222100809a5d52ac413e922688b48
-            archive: .buildcache/archives/02-install-go-tools-a10e38af920222100809a5d52ac413e922688b48.tar.gz
-          - type: install-go
-            name: 01-install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b
-            archive: .buildcache/archives/01-install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b.tar.gz
-          - type: base
-            name: 00-base-c6cdf1b224722d2520e082320f2a71875913247c
-            archive: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz
-      circleci:
-        CACHE_KEY_PREFIX_LIST:
-          - copy-source_dd0d_{{checksum ".buildcache/cache-keys/copy-source-dd0dc694505493c7f1a8a68d088d576b8c3ba991"}}
-          - warm-go-build-vendor-cache_434d_{{checksum ".buildcache/cache-keys/warm-go-build-vendor-cache-434d8c719fd4c65ec213c71c7dc9ded9d87c785e"}}
-          - build-static-assets_373e_{{checksum ".buildcache/cache-keys/build-static-assets-373ea9e750a0bd0fe70f0e11fc92d848bfe14dbc"}}
-          - build-ui_993e_{{checksum ".buildcache/cache-keys/build-ui-993e50cbb3d37120b1391442177827b615c77f82"}}
-          - ui-dependencies_5132_{{checksum ".buildcache/cache-keys/ui-dependencies-513283a98d2b8a1570bf027e95364b888df651a9"}}
-          - install-yarn_6b98_{{checksum ".buildcache/cache-keys/install-yarn-6b98fb22387ba58bb85acb0cc5909e6b6b2dbfea"}}
-          - set-workdir_577a_{{checksum ".buildcache/cache-keys/set-workdir-577aad3893a929a48a2ce7319179c253507dee67"}}
-          - install-go-tools_a10e_{{checksum ".buildcache/cache-keys/install-go-tools-a10e38af920222100809a5d52ac413e922688b48"}}
-          - install-go_d3cf_{{checksum ".buildcache/cache-keys/install-go-d3cfbf34edb1074513e0377a86595f5e740cd03b"}}
-          - 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 c678c08f2b..6253b33c15 100644
--- a/packages-oss.yml
+++ b/packages-oss.yml
@@ -103,7 +103,6 @@ build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/has
 # is a useful data source for building CI/CD pipelines.
 packages:
   - inputs: { GOOS: darwin, GOARCH: amd64 }
-  - inputs: { GOOS: darwin, GOARCH: arm64 }
   - inputs: { GOOS: freebsd, GOARCH: 386 }
   - inputs: { GOOS: freebsd, GOARCH: amd64 }
   - inputs: { GOOS: freebsd, GOARCH: arm }