diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f37b11dc326..38c69962218 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -355,7 +355,7 @@ arm64_test:
   extends:
     - .use-arm_test-base
   variables:
-    FDO_DISTRIBUTION_TAG: &arm64_test "2020-08-04-nfs-2"
+    FDO_DISTRIBUTION_TAG: &arm64_test "2020-08-18"
 
 .use-arm64_test:
   variables:
diff --git a/.gitlab-ci/container/baremetal_build.sh b/.gitlab-ci/container/baremetal_build.sh
index fedb7b61c31..a2d3a1ea88e 100644
--- a/.gitlab-ci/container/baremetal_build.sh
+++ b/.gitlab-ci/container/baremetal_build.sh
@@ -53,8 +53,8 @@ KERNEL_URL=https://gitlab.freedesktop.org/drm/msm/-/archive/drm-msm-fixes-2020-0
 
 DEBIAN_ARCH=$arch INCLUDE_VK_CTS=1 . .gitlab-ci/container/lava_build.sh
 
-ccache --show-stats
-
-. .gitlab-ci/container/container_post_build.sh
+############### Uninstall the build software
 
 apt-get purge -y $BAREMETAL_EPHEMERAL
+
+. .gitlab-ci/container/container_post_build.sh