diff --git a/.gitmodules b/.gitmodules
index 1d345d4f..20df3fba 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,6 @@
 [submodule "packages/platforms-closed"]
 	path = packages/platforms-closed
 	url = git@github.com:opennetworklinux/platforms-closed
+[submodule "sm/build-artifacts"]
+	path = sm/build-artifacts
+	url = git@github.com:opennetworklinux/build-artifacts
diff --git a/packages/platforms/delta/x86-64/x86-64-delta-ag5648/.gitignore b/packages/platforms/delta/x86-64/x86-64-delta-ag5648/.gitignore
index 76483140..269535f7 100644
--- a/packages/platforms/delta/x86-64/x86-64-delta-ag5648/.gitignore
+++ b/packages/platforms/delta/x86-64/x86-64-delta-ag5648/.gitignore
@@ -1,3 +1,2 @@
-*x86*64*delta_agc7648a*.mk
+*x86*64*delta*ag5648*.mk
 onlpdump.mk
-
diff --git a/packages/platforms/quanta/x86-64/x86-64-quanta-ly4r/.gitignore b/packages/platforms/quanta/x86-64/x86-64-quanta-ly4r/.gitignore
index 64d7ff10..651bf060 100755
--- a/packages/platforms/quanta/x86-64/x86-64-quanta-ly4r/.gitignore
+++ b/packages/platforms/quanta/x86-64/x86-64-quanta-ly4r/.gitignore
@@ -1,2 +1,2 @@
-*x86*64*quanta*ly4r*rangeley.mk
+*x86*64*quanta*ly4r*.mk
 onlpdump.mk
diff --git a/setup.env b/setup.env
index 7e6f7f33..667ba08f 100755
--- a/setup.env
+++ b/setup.env
@@ -36,6 +36,10 @@ export BUILDROOTMIRROR=${BUILDROOTMIRROR:-"http://buildroot.opennetlinux.org/dl"
 # These submodules are required for almost everything.
 $ONL/tools/submodules.py $ONL sm/infra
 $ONL/tools/submodules.py $ONL sm/bigcode
+$ONL/tools/submodules.py $ONL sm/build-artifacts
+
+# Prepopulate local REPO with build-artifacts.
+cp -R $ONL/sm/build-artifacts/REPO/* $ONL/REPO
 
 # Export the current debian suite
 export ONL_DEBIAN_SUITE=$(lsb_release -c -s)
@@ -46,4 +50,4 @@ if [ ! -f $ONL/.git/hooks/post-merge ] && [ -d $ONL/.git ]; then
 fi
 
 # submodule post update scripts.
-export ONL_SUBMODULE_UPDATED_SCRIPTS="$ONL/tools/scripts/submodule-updated.sh"
\ No newline at end of file
+export ONL_SUBMODULE_UPDATED_SCRIPTS="$ONL/tools/scripts/submodule-updated.sh"
diff --git a/sm/build-artifacts b/sm/build-artifacts
new file mode 160000
index 00000000..54005ad5
--- /dev/null
+++ b/sm/build-artifacts
@@ -0,0 +1 @@
+Subproject commit 54005ad5e9e03fe9235cf17378d53a30544dd155