diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7bebd1f37c53..a913ed226873 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -44,4 +44,7 @@ jobs:
           path: ./node_modules.tgz
 
       - store_artifacts:
-          path: ./scripts/error-codes/codes.json
\ No newline at end of file
+          path: ./build.tgz
+
+      - store_artifacts:
+          path: ./scripts/error-codes/codes.json
diff --git a/scripts/circleci/pack_and_store_artifact.sh b/scripts/circleci/pack_and_store_artifact.sh
index 0475feeba229..061101b6fdec 100755
--- a/scripts/circleci/pack_and_store_artifact.sh
+++ b/scripts/circleci/pack_and_store_artifact.sh
@@ -2,10 +2,14 @@
 
 set -e
 
+# Compress build directory into a single tarball for easy download
+tar -zcvf ./build.tgz ./build
+
 # NPM pack all modules to ensure we archive the correct set of files
-for dir in ./build/node_modules/* ; do
+cd ./build/node_modules
+for dir in ./* ; do
   npm pack "$dir"
 done
 
-# Wrap everything in a single zip file for easy download by the publish script
-tar -zcvf ./node_modules.tgz ./*.tgz
\ No newline at end of file
+# Compress packed modules into a single tarball for easy download by the publish script
+tar -zcvf ../../node_modules.tgz ./*.tgz