diff --git a/.circleci/config.yml b/.circleci/config.yml
index abd8b04cf4..0f889e21a9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,9 +5,10 @@
 # Orb 'circleci/slack@3.4.2' resolved to 'circleci/slack@3.4.2'
 version: 2
 jobs:
-  cache-builder-images:
+  build-common-layers:
     docker:
     - image: circleci/buildpack-deps
+    shell: /usr/bin/env bash -euo pipefail -c
     steps:
     - setup_remote_docker:
         version: 19.03.12
@@ -42,7 +43,6 @@ jobs:
 
           eval "$(ssh-agent -s)"
           ssh-add ~/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98
-          ssh-add -l -E md5
 
           make -f packages*.lock/layer.mk 00-install-deps-96bbfeaab51d40cfb3c45afc0035516c11d6d737-image
         name: Build layer 00-install-deps-96bbfeaab51d40cfb3c45afc0035516c11d6d737
@@ -51,7 +51,6 @@ jobs:
 
           eval "$(ssh-agent -s)"
           ssh-add ~/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98
-          ssh-add -l -E md5
 
           make -f packages*.lock/layer.mk 01-download-modules-eb80c020d26fa5a44b8e8bf9cc6a41d328e82f4c-image
         name: Build layer 01-download-modules-eb80c020d26fa5a44b8e8bf9cc6a41d328e82f4c
@@ -60,7 +59,6 @@ jobs:
 
           eval "$(ssh-agent -s)"
           ssh-add ~/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98
-          ssh-add -l -E md5
 
           make -f packages*.lock/layer.mk 02-copy-source-cb2d5919f5b68088a1068bd1bc610eb63dc06def-image
         name: Build layer 02-copy-source-cb2d5919f5b68088a1068bd1bc610eb63dc06def
@@ -89,6 +87,7 @@ jobs:
   darwin_amd64_package:
     docker:
     - image: circleci/buildpack-deps
+    shell: /usr/bin/env bash -euo pipefail -c
     environment:
     - AUTO_INSTALL_TOOLS: 'YES'
     - BUILDKIT_PROGRESS: plain
@@ -133,7 +132,6 @@ jobs:
 
           eval "$(ssh-agent -s)"
           ssh-add ~/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98
-          ssh-add -l -E md5
 
           make -C packages*.lock package
         name: Compile Package
@@ -146,6 +144,7 @@ jobs:
   linux_amd64_package:
     docker:
     - image: circleci/buildpack-deps
+    shell: /usr/bin/env bash -euo pipefail -c
     environment:
     - AUTO_INSTALL_TOOLS: 'YES'
     - BUILDKIT_PROGRESS: plain
@@ -190,7 +189,6 @@ jobs:
 
           eval "$(ssh-agent -s)"
           ssh-add ~/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98
-          ssh-add -l -E md5
 
           make -C packages*.lock package
         name: Compile Package
@@ -396,13 +394,13 @@ jobs:
 workflows:
   build-standalone:
     jobs:
-    - cache-builder-images
+    - build-common-layers
     - darwin_amd64_package:
         requires:
-        - cache-builder-images
+        - build-common-layers
     - linux_amd64_package:
         requires:
-        - cache-builder-images
+        - build-common-layers
     - bundle-releases:
         requires:
         - darwin_amd64_package
diff --git a/.circleci/config/@build-release.yml b/.circleci/config/@build-release.yml
index 56e88448e2..2deb6e7acc 100644
--- a/.circleci/config/@build-release.yml
+++ b/.circleci/config/@build-release.yml
@@ -13,28 +13,21 @@ executors:
       PRODUCT_REVISION: ""
       AUTO_INSTALL_TOOLS: 'YES'
       BUILDKIT_PROGRESS: plain
-  releaser:
-    docker:
-      - image: circleci/buildpack-deps
-    environment:
-      PRODUCT_REVISION: ""
-      AUTO_INSTALL_TOOLS: 'YES'
-      BUILDKIT_PROGRESS: plain
     shell: /usr/bin/env bash -euo pipefail -c
 
 workflows:
   version: 2
   build-standalone:
     jobs:
-      - cache-builder-images
-      - darwin_amd64_package: { requires: [ cache-builder-images ] }
-      - linux_amd64_package: { requires: [ cache-builder-images ] }
+      - build-common-layers
+      - darwin_amd64_package: { requires: [ build-common-layers ] }
+      - linux_amd64_package: { requires: [ build-common-layers ] }
       - bundle-releases:
           requires:
             - darwin_amd64_package
             - linux_amd64_package
 jobs:
-  cache-builder-images:
+  build-common-layers:
     executor: builder
     steps:
       
@@ -72,7 +65,6 @@ jobs:
             
             eval "$(ssh-agent -s)"
             ssh-add ~/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98
-            ssh-add -l -E md5
 
             make -f packages*.lock/layer.mk 00-install-deps-96bbfeaab51d40cfb3c45afc0035516c11d6d737-image
       - run:
@@ -81,7 +73,6 @@ jobs:
             
             eval "$(ssh-agent -s)"
             ssh-add ~/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98
-            ssh-add -l -E md5
 
             make -f packages*.lock/layer.mk 01-download-modules-eb80c020d26fa5a44b8e8bf9cc6a41d328e82f4c-image
       - run:
@@ -90,7 +81,6 @@ jobs:
             
             eval "$(ssh-agent -s)"
             ssh-add ~/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98
-            ssh-add -l -E md5
 
             make -f packages*.lock/layer.mk 02-copy-source-cb2d5919f5b68088a1068bd1bc610eb63dc06def-image
       - run: make -f packages*.lock/layer.mk 02-copy-source-cb2d5919f5b68088a1068bd1bc610eb63dc06def-save
@@ -156,7 +146,6 @@ jobs:
             
             eval "$(ssh-agent -s)"
             ssh-add ~/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98
-            ssh-add -l -E md5
 
             make -C packages*.lock package
 
@@ -217,7 +206,6 @@ jobs:
             
             eval "$(ssh-agent -s)"
             ssh-add ~/.ssh/id_rsa_c6969882dc046c39ddac8305e3151c98
-            ssh-add -l -E md5
 
             make -C packages*.lock package
 
@@ -232,7 +220,7 @@ jobs:
 
 
   bundle-releases:
-    executor: releaser
+    executor: builder
     steps:
       - checkout
       - write-all-package-cache-keys