diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index db4ee59..d9f44f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -355,7 +355,7 @@
   extends:
     - .use-arm_test-base
   variables:
-    FDO_DISTRIBUTION_TAG: &arm64_test "2020-07-31-ntp"
+    FDO_DISTRIBUTION_TAG: &arm64_test "2020-07-31-minio"
 
 .use-arm64_test:
   variables:
diff --git a/.gitlab-ci/container/baremetal_build.sh b/.gitlab-ci/container/baremetal_build.sh
index edfd4f9..fedb7b6 100644
--- a/.gitlab-ci/container/baremetal_build.sh
+++ b/.gitlab-ci/container/baremetal_build.sh
@@ -53,20 +53,6 @@
 
 DEBIAN_ARCH=$arch INCLUDE_VK_CTS=1 . .gitlab-ci/container/lava_build.sh
 
-############### Store traces
-# Clone the traces-db at container build time so we don't have to pull traces
-# per run (too much egress cost for fd.o).
-git clone \
-    --depth 1 \
-    -b mesa-ci-2020-06-08 \
-    https://gitlab.freedesktop.org/gfx-ci/tracie/traces-db.git \
-    $ROOTFS/traces-db
-rm -rf $ROOTFS/traces-db/.git
-find $ROOTFS/traces-db -type f \
-     -a -not -name '*.trace' \
-     -a -not -name '*.rdc' \
-     -delete
-
 ccache --show-stats
 
 . .gitlab-ci/container/container_post_build.sh
diff --git a/.gitlab-ci/traces-baremetal.yml b/.gitlab-ci/traces-baremetal.yml
index 5558a4b..72905a3 100644
--- a/.gitlab-ci/traces-baremetal.yml
+++ b/.gitlab-ci/traces-baremetal.yml
@@ -1,6 +1,5 @@
-# bare-metal has traces-db baked into the container until we can sort
-# out LFS caching, so we use a separate yml without the git repo
-# declaration at the top.
+traces-db:
+  download-url: "https://minio-packet.freedesktop.org/mesa-tracie-public/"
 
 traces:
 # This trace takes an egregious amount of time in replay (5 minutes)