diff --git a/.circleci/config.yml b/.circleci/config.yml
index 710cca187..8225a70c6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -342,16 +342,6 @@ jobs:
               --include "*.rpm" \
               --include "*.zip" \
               --acl public-read
-  package-consolidate:
-    executor:
-        name: win/default
-        shell: powershell.exe
-    steps:
-      - attach_workspace:
-          at: '/build'
-      - store_artifacts:
-          path: './build/dist'
-          destination: 'build/dist'
   package-sign-windows:
     executor:
         name: win/default
@@ -370,9 +360,6 @@ jobs:
           root: './build'
           paths:
             - 'dist'
-      - store_artifacts:
-          path: './build/dist'
-          destination: 'build/dist'
   package-sign-mac:
     executor: mac
     working_directory: /Users/distiller/project
@@ -388,15 +375,22 @@ jobs:
       - run:
           command: |
             sh ./scripts/mac-signing.sh
+      - persist_to_workspace:
+          root: './build'
+          paths:
+            - 'dist'
+  package-consolidate:
+    docker:
+     - image: alpine
+    steps:
+      - attach_workspace:
+          at: '.'
       - store_artifacts:
           path: './dist'
           destination: 'build/dist'
-  test-awaiter:
-    executor: go-1_17
-    steps:
       - run:
           command: |
-            echo "Go tests complete."
+            echo "This job contains all the final artifacts."
   share-artifacts:
     executor: aws-cli/default
     steps:
@@ -419,16 +413,6 @@ jobs:
       - generate-config:
           os: windows
 
-commonjobs:
-  - &test-awaiter
-    'test-awaiter':
-      requires:
-        - 'test-go-1_17'
-        - 'test-go-1_17-386'
-      filters:
-        tags:
-          only: /.*/
-
 workflows:
   version: 2
   check:
@@ -457,7 +441,6 @@ workflows:
           filters:
             tags:
               only: /.*/
-      - *test-awaiter
       - 'windows-package':
           requires:
             - 'test-go-windows'
@@ -478,67 +461,78 @@ workflows:
               only: /.*/
       - 'i386-package':
           requires:
-            - 'test-awaiter'
+            - 'test-go-1_17'
+            - 'test-go-1_17-386'
           filters:
             tags:
               only: /.*/
       - 'ppc64le-package':
           requires:
-            - 'test-awaiter'
+            - 'test-go-1_17'
+            - 'test-go-1_17-386'
           filters:
             tags:
               only: /.*/
       - 'riscv64-package':
           requires:
-            - 'test-awaiter'
+            - 'test-go-1_17'
+            - 'test-go-1_17-386'
           filters:
             tags:
               only: /.*/
       - 's390x-package':
           requires:
-            - 'test-awaiter'
+            - 'test-go-1_17'
+            - 'test-go-1_17-386'
           filters:
             tags:
               only: /.*/
       - 'armel-package':
           requires:
-            - 'test-awaiter'
+            - 'test-go-1_17'
+            - 'test-go-1_17-386'
           filters:
             tags:
               only: /.*/
       - 'amd64-package':
           requires:
-            - 'test-awaiter'
+            - 'test-go-1_17'
+            - 'test-go-1_17-386'
           filters:
             tags:
               only: /.*/
       - 'arm64-package':
           requires:
-            - 'test-awaiter'
+            - 'test-go-1_17'
+            - 'test-go-1_17-386'
           filters:
             tags:
               only: /.*/
       - 'armhf-package':
           requires:
-            - 'test-awaiter'
+            - 'test-go-1_17'
+            - 'test-go-1_17-386'
           filters:
             tags:
               only: /.*/
       - 'static-package':
           requires:
-            - 'test-awaiter'
+            - 'test-go-1_17'
+            - 'test-go-1_17-386'
           filters:
             tags:
               only: /.*/
       - 'mipsel-package':
           requires:
-            - 'test-awaiter'
+            - 'test-go-1_17'
+            - 'test-go-1_17-386'
           filters:
             tags:
               only: /.*/
       - 'mips-package':
           requires:
-            - 'test-awaiter'
+            - 'test-go-1_17'
+            - 'test-go-1_17-386'
           filters:
             tags:
               only: /.*/
@@ -581,19 +575,7 @@ workflows:
               ignore: /.*/
       - 'package-sign-windows':
           requires:
-            - 'i386-package'
-            - 'ppc64le-package'
-            - 's390x-package'
-            - 'armel-package'
-            - 'amd64-package'
-            - 'mipsel-package'
-            - 'mips-package'
-            - 'darwin-amd64-package'
-            - 'darwin-arm64-package'
             - 'windows-package'
-            - 'static-package'
-            - 'arm64-package'
-            - 'armhf-package'
           filters:
               tags:
                 only: /.*/
@@ -601,12 +583,33 @@ workflows:
                 ignore: /.*/
       - 'package-sign-mac':
            requires:
-             - 'package-sign-windows'
+            - 'darwin-amd64-package'
+            - 'darwin-arm64-package'
            filters:
               tags:
                 only: /.*/
               branches:
                 ignore: /.*/
+      - 'package-consolidate':
+           requires:
+            - 'i386-package'
+            - 'ppc64le-package'
+            - 's390x-package'
+            - 'armel-package'
+            - 'amd64-package'
+            - 'mipsel-package'
+            - 'mips-package'
+            - 'static-package'
+            - 'arm64-package'
+            - 'armhf-package'
+            - 'riscv64-package'
+            - 'package-sign-mac'
+            - 'package-sign-windows'
+           filters:
+            tags:
+              only: /.*/
+            branches:
+              ignore: /.*/
 
   nightly:
     jobs:
@@ -619,7 +622,6 @@ workflows:
             - 'deps'
       - 'test-go-mac'
       - 'test-go-windows'
-      - *test-awaiter
       - 'windows-package':
           name: 'windows-package-nightly'
           nightly: true
@@ -639,57 +641,68 @@ workflows:
           name: 'i386-package-nightly'
           nightly: true
           requires:
-            - 'test-awaiter'
+            - 'test-go-1_17'
+            - 'test-go-1_17-386'
       - 'ppc64le-package':
           name: 'ppc64le-package-nightly'
           nightly: true
           requires:
-            - 'test-awaiter'
+            - 'test-go-1_17'
+            - 'test-go-1_17-386'
       - 'riscv64-package':
           name: 'riscv64-package-nightly'
           nightly: true
           requires:
-            - 'test-awaiter'
+            - 'test-go-1_17'
+            - 'test-go-1_17-386'
       - 's390x-package':
           name: 's390x-package-nightly'
           nightly: true
           requires:
-            - 'test-awaiter'
+            - 'test-go-1_17'
+            - 'test-go-1_17-386'
       - 'armel-package':
           name: 'armel-package-nightly'
           nightly: true
           requires:
-            - 'test-awaiter'
+            - 'test-go-1_17'
+            - 'test-go-1_17-386'
       - 'amd64-package':
           name: 'amd64-package-nightly'
           nightly: true
           requires:
-            - 'test-awaiter'
+            - 'test-go-1_17'
+            - 'test-go-1_17-386'
       - 'arm64-package':
           name: 'arm64-package-nightly'
           nightly: true
           requires:
-            - 'test-awaiter'
+            - 'test-go-1_17'
+            - 'test-go-1_17-386'
       - 'armhf-package':
           name: 'armhf-package-nightly'
           nightly: true
           requires:
-            - 'test-awaiter'
+            - 'test-go-1_17'
+            - 'test-go-1_17-386'
       - 'static-package':
           name: 'static-package-nightly'
           nightly: true
           requires:
-            - 'test-awaiter'
+            - 'test-go-1_17'
+            - 'test-go-1_17-386'
       - 'mipsel-package':
           name: 'mipsel-package-nightly'
           nightly: true
           requires:
-            - 'test-awaiter'
+            - 'test-go-1_17'
+            - 'test-go-1_17-386'
       - 'mips-package':
           name: 'mips-package-nightly'
           nightly: true
           requires:
-            - 'test-awaiter'
+            - 'test-go-1_17'
+            - 'test-go-1_17-386'
       - nightly:
           requires:
             - 'i386-package-nightly'
diff --git a/scripts/mac-signing.sh b/scripts/mac-signing.sh
index 8d0bbefba..a2c16a83b 100644
--- a/scripts/mac-signing.sh
+++ b/scripts/mac-signing.sh
@@ -95,7 +95,8 @@ do
   xcrun stapler staple "$baseName".dmg
   cleanup
 
-  mv "$baseName".dmg ~/project/dist
+  mkdir -p ~/project/build/dist
+  mv "$baseName".dmg ~/project/build/dist
 
   echo "$baseName.dmg signed and notarized!"
 done