diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 9500f835f95..85923730254 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -72,15 +72,11 @@ jobs:
       - name: Split Loadtest Jobs
         id: splitloadtest
         run: ./.github/workflows/scripts/setup_load_tests.sh
-      - name: Add Execute Permissions to Binaries
-        run: chmod -R +x /home/runner/go/bin
-      - name: Create Tool Binaries Archive
-        run: tar -cvf tool-bin.tar /home/runner/go/bin
       - name: Upload Tool Binaries
         uses: actions/upload-artifact@v1
         with:
           name: tool-binaries
-          path: ./tool-bin.tar
+          path: /home/runner/go/bin
   lint:
     runs-on: ubuntu-latest
     needs: [setup-environment]
@@ -106,8 +102,9 @@ jobs:
         uses: actions/download-artifact@v1
         with:
           name: tool-binaries
-      - name: Extract Tool Binaries Archive
-        run: tar -xvf tool-binaries/tool-bin.tar -C /
+          path: /home/runner/go/bin
+      - name: Add Permissions to Tool Binaries
+        run: chmod -R +x /home/runner/go/bin
       - name: Lint
         run: make -j4 gochecklicense goimpi golint gomisspell
       - name: Gen Metadata
@@ -139,8 +136,9 @@ jobs:
         uses: actions/download-artifact@v1
         with:
           name: tool-binaries
-      - name: Extract Tool Binaries Archive
-        run: tar -xvf tool-binaries/tool-bin.tar -C /
+          path: /home/runner/go/bin
+      - name: Add Permissions to Tool Binaries
+        run: chmod -R +x /home/runner/go/bin
       - name: Build Collector for All Architectures
         run: grep ^binaries-all-sys Makefile|fmt -w 1|tail -n +2|xargs make
       - name: Create Collector Binaries Archive
@@ -232,8 +230,9 @@ jobs:
         uses: actions/download-artifact@v1
         with:
           name: tool-binaries
-      - name: Extract Tool Binaries Archive
-        run: tar -xvf tool-binaries/tool-bin.tar -C /
+          path: /home/runner/go/bin
+      - name: Add Permissions to Tool Binaries
+        run: chmod -R +x /home/runner/go/bin
       - name: Loadtest
         run: make testbed-correctness
       - name: GitHub Issue Generator