diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 526414850f4..f06391ff1d1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -408,7 +408,7 @@ arm64_test:
   extends:
     - .use-arm_test-base
   variables:
-    MESA_IMAGE_TAG: &arm64_test "2020-12-17-fdo-upstream-repo"
+    MESA_IMAGE_TAG: &arm64_test "2020-12-18-lava"
 
 .use-arm64_test:
   variables:
@@ -422,7 +422,7 @@ armhf_test:
   extends:
     - .use-arm_test-base
   variables:
-    MESA_IMAGE_TAG: &armhf_test "2020-12-17-fdo-upstream-repo"
+    MESA_IMAGE_TAG: &armhf_test "2020-12-18-lava"
 
 .use-armhf_test:
   variables:
diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index a4a6661cfe6..62c0bcd1c43 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -97,15 +97,19 @@ if [[ "$DEBIAN_ARCH" = "armhf" ]]; then
                        qtbase5-dev:armhf
 fi
 
-############### Build dEQP runner
 
+############### Building
+STRIP_CMD="${GCC_ARCH}-strip"
+mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}
+
+
+############### Build dEQP runner
 . .gitlab-ci/build-deqp-runner.sh
 mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/usr/bin
 mv /usr/local/bin/deqp-runner /lava-files/rootfs-${DEBIAN_ARCH}/usr/bin/.
 
 
 ############### Build dEQP
-STRIP_CMD="${GCC_ARCH}-strip"
 DEQP_TARGET=surfaceless . .gitlab-ci/build-deqp.sh
 
 mv /deqp /lava-files/rootfs-${DEBIAN_ARCH}/.
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index f5e635c5191..79784e2f2e0 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  DISTRIBUTION_TAG: "2020-12-17-fdo-upstream-repo"
+  DISTRIBUTION_TAG: "2020-12-18-lava"
 
 .kernel+rootfs:
   stage: container-2