diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9dd737bb328..22f3e5b15de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -261,7 +261,7 @@ x86_build-base:
     - .fdo.container-build@debian
     - .container
   variables:
-    MESA_IMAGE_TAG: &x86_build-base "2021-01-08-more-vulkan-cross"
+    MESA_IMAGE_TAG: &x86_build-base "2021-02-08-container-reorg"
 
 .use-x86_build-base:
   extends:
@@ -278,7 +278,7 @@ x86_build:
   extends:
     - .use-x86_build-base
   variables:
-    MESA_IMAGE_TAG: &x86_build "2021-02-02-procps"
+    MESA_IMAGE_TAG: &x86_build "2021-02-08-container-reorg"
 
 .use-x86_build:
   variables:
@@ -292,7 +292,7 @@ i386_build:
   extends:
     - .use-x86_build-base
   variables:
-    MESA_IMAGE_TAG: &i386_build "2021-01-08-more-vulkan-cross"
+    MESA_IMAGE_TAG: &i386_build "2021-02-08-container-reorg"
 
 .use-i386_build:
   variables:
@@ -306,7 +306,7 @@ ppc64el_build:
   extends:
     - .use-x86_build-base
   variables:
-    MESA_IMAGE_TAG: &ppc64el_build "2021-01-08-more-vulkan-cross"
+    MESA_IMAGE_TAG: &ppc64el_build "2021-02-08-container-reorg"
 
 .use-ppc64el_build:
   variables:
@@ -320,7 +320,7 @@ s390x_build:
   extends:
     - .use-x86_build-base
   variables:
-    MESA_IMAGE_TAG: &s390x_build "2021-01-08-more-vulkan-cross"
+    MESA_IMAGE_TAG: &s390x_build "2021-02-08-container-reorg"
 
 .use-s390x_build:
   variables:
@@ -334,7 +334,7 @@ android_build:
   extends:
     - .use-x86_build-base
   variables:
-    MESA_IMAGE_TAG: &android_build "2020-12-17-use-ephemeral"
+    MESA_IMAGE_TAG: &android_build "2021-02-08-container-reorg"
 
 .use-android_build:
   variables:
@@ -347,7 +347,7 @@ android_build:
 x86_test-base:
   extends: x86_build-base
   variables:
-    MESA_IMAGE_TAG: &x86_test-base "2021-01-14-asan"
+    MESA_IMAGE_TAG: &x86_test-base "2021-02-08-container-reorg"
 
 .use-x86_test-base:
   extends:
@@ -363,13 +363,13 @@ x86_test-base:
 x86_test-gl:
   extends: .use-x86_test-base
   variables:
-    MESA_IMAGE_TAG: &x86_test-gl "2021-02-05-runner"
+    MESA_IMAGE_TAG: &x86_test-gl "2021-02-08-container-reorg"
 
 # Debian 10 based x86 test image for VK
 x86_test-vk:
   extends: .use-x86_test-base
   variables:
-    MESA_IMAGE_TAG: &x86_test-vk "2021-02-05-runner"
+    MESA_IMAGE_TAG: &x86_test-vk "2021-02-08-container-reorg"
 
 # Debian 10 based ARM build image
 arm_build:
@@ -377,7 +377,7 @@ arm_build:
     - .fdo.container-build@debian@arm64v8
     - .container
   variables:
-    MESA_IMAGE_TAG: &arm_build "2020-12-23-opengl"
+    MESA_IMAGE_TAG: &arm_build "2021-02-08-container-reorg"
 
 .use-arm_build:
   variables:
@@ -392,7 +392,7 @@ arm_test-base:
     - .fdo.container-build@debian
     - .container
   variables:
-    MESA_IMAGE_TAG: &arm_test-base "2021-01-21-noexpect"
+    MESA_IMAGE_TAG: &arm_test-base "2021-02-08-container-reorg"
 
 .use-arm_test-base:
   extends:
@@ -409,7 +409,7 @@ arm64_test:
   extends:
     - .use-arm_test-base
   variables:
-    MESA_IMAGE_TAG: &arm64_test "2021-02-01-runner"
+    MESA_IMAGE_TAG: &arm64_test "2021-02-08-container-reorg"
 
 .use-arm64_test:
   variables:
@@ -423,7 +423,7 @@ armhf_test:
   extends:
     - .use-arm_test-base
   variables:
-    MESA_IMAGE_TAG: &armhf_test "2021-02-01-runner"
+    MESA_IMAGE_TAG: &armhf_test "2021-02-08-container-reorg"
 
 .use-armhf_test:
   variables:
diff --git a/.gitlab-ci/container/android_build.sh b/.gitlab-ci/container/android_build.sh
index ffc42fff149..88c05af4ee2 100644
--- a/.gitlab-ci/container/android_build.sh
+++ b/.gitlab-ci/container/android_build.sh
@@ -20,12 +20,12 @@ rdfind -makehardlinks true -makeresultsfile false /android-ndk-r21d/
 # Drop some large tools we won't use in this build.
 find /android-ndk-r21d/ -type f | egrep -i "clang-check|clang-tidy|lldb" | xargs rm -f
 
-sh .gitlab-ci/create-android-ndk-pc.sh /$ndk zlib.pc "" "-lz" "1.2.3"
+sh .gitlab-ci/container/create-android-ndk-pc.sh /$ndk zlib.pc "" "-lz" "1.2.3"
 
-sh .gitlab-ci/create-android-cross-file.sh /$ndk x86_64-linux-android x86_64 x86_64
-sh .gitlab-ci/create-android-cross-file.sh /$ndk i686-linux-android x86 x86
-sh .gitlab-ci/create-android-cross-file.sh /$ndk aarch64-linux-android arm armv8
-sh .gitlab-ci/create-android-cross-file.sh /$ndk arm-linux-androideabi arm armv7hl armv7a-linux-androideabi
+sh .gitlab-ci/container/create-android-cross-file.sh /$ndk x86_64-linux-android x86_64 x86_64
+sh .gitlab-ci/container/create-android-cross-file.sh /$ndk i686-linux-android x86 x86
+sh .gitlab-ci/container/create-android-cross-file.sh /$ndk aarch64-linux-android arm armv8
+sh .gitlab-ci/container/create-android-cross-file.sh /$ndk arm-linux-androideabi arm armv7hl armv7a-linux-androideabi
 
 # Not using build-libdrm.sh because we don't want its cleanup after building
 # each arch.  Fetch and extract now.
diff --git a/.gitlab-ci/arm.config b/.gitlab-ci/container/arm.config
similarity index 100%
rename from .gitlab-ci/arm.config
rename to .gitlab-ci/container/arm.config
diff --git a/.gitlab-ci/arm64.config b/.gitlab-ci/container/arm64.config
similarity index 100%
rename from .gitlab-ci/arm64.config
rename to .gitlab-ci/container/arm64.config
diff --git a/.gitlab-ci/container/arm_build.sh b/.gitlab-ci/container/arm_build.sh
index 9cffd786733..f9a2d0cbe67 100644
--- a/.gitlab-ci/container/arm_build.sh
+++ b/.gitlab-ci/container/arm_build.sh
@@ -65,6 +65,6 @@ arch=armhf
 
 # dependencies where we want a specific version
 EXTRA_MESON_ARGS=
-. .gitlab-ci/build-libdrm.sh
+. .gitlab-ci/container/build-libdrm.sh
 
 . .gitlab-ci/container/container_post_build.sh
diff --git a/.gitlab-ci/container/baremetal_build.sh b/.gitlab-ci/container/baremetal_build.sh
index 02b2fa4c2b0..e3a4b246eb3 100644
--- a/.gitlab-ci/container/baremetal_build.sh
+++ b/.gitlab-ci/container/baremetal_build.sh
@@ -47,7 +47,7 @@ mkdir /var/cache/apt/archives/$arch
 
 ############### Create cross-files
 
-. .gitlab-ci/create-cross-file.sh $arch
+. .gitlab-ci/container/create-cross-file.sh $arch
 
 . .gitlab-ci/container/container_pre_build.sh
 
diff --git a/.gitlab-ci/build-apitrace.sh b/.gitlab-ci/container/build-apitrace.sh
similarity index 100%
rename from .gitlab-ci/build-apitrace.sh
rename to .gitlab-ci/container/build-apitrace.sh
diff --git a/.gitlab-ci/build-deqp-runner.sh b/.gitlab-ci/container/build-deqp-runner.sh
similarity index 100%
rename from .gitlab-ci/build-deqp-runner.sh
rename to .gitlab-ci/container/build-deqp-runner.sh
diff --git a/.gitlab-ci/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh
similarity index 100%
rename from .gitlab-ci/build-deqp.sh
rename to .gitlab-ci/container/build-deqp.sh
diff --git a/.gitlab-ci/build-fossilize.sh b/.gitlab-ci/container/build-fossilize.sh
similarity index 100%
rename from .gitlab-ci/build-fossilize.sh
rename to .gitlab-ci/container/build-fossilize.sh
diff --git a/.gitlab-ci/build-gfxreconstruct.sh b/.gitlab-ci/container/build-gfxreconstruct.sh
similarity index 100%
rename from .gitlab-ci/build-gfxreconstruct.sh
rename to .gitlab-ci/container/build-gfxreconstruct.sh
diff --git a/.gitlab-ci/build-libclc.sh b/.gitlab-ci/container/build-libclc.sh
similarity index 100%
rename from .gitlab-ci/build-libclc.sh
rename to .gitlab-ci/container/build-libclc.sh
diff --git a/.gitlab-ci/build-libdrm.sh b/.gitlab-ci/container/build-libdrm.sh
similarity index 100%
rename from .gitlab-ci/build-libdrm.sh
rename to .gitlab-ci/container/build-libdrm.sh
diff --git a/.gitlab-ci/build-piglit.sh b/.gitlab-ci/container/build-piglit.sh
similarity index 100%
rename from .gitlab-ci/build-piglit.sh
rename to .gitlab-ci/container/build-piglit.sh
diff --git a/.gitlab-ci/build-renderdoc.sh b/.gitlab-ci/container/build-renderdoc.sh
similarity index 100%
rename from .gitlab-ci/build-renderdoc.sh
rename to .gitlab-ci/container/build-renderdoc.sh
diff --git a/.gitlab-ci/build-rust.sh b/.gitlab-ci/container/build-rust.sh
similarity index 100%
rename from .gitlab-ci/build-rust.sh
rename to .gitlab-ci/container/build-rust.sh
diff --git a/.gitlab-ci/build-spirv-tools.sh b/.gitlab-ci/container/build-spirv-tools.sh
similarity index 100%
rename from .gitlab-ci/build-spirv-tools.sh
rename to .gitlab-ci/container/build-spirv-tools.sh
diff --git a/.gitlab-ci/build-virglrenderer.sh b/.gitlab-ci/container/build-virglrenderer.sh
similarity index 100%
rename from .gitlab-ci/build-virglrenderer.sh
rename to .gitlab-ci/container/build-virglrenderer.sh
diff --git a/.gitlab-ci/build-vulkantools.sh b/.gitlab-ci/container/build-vulkantools.sh
similarity index 100%
rename from .gitlab-ci/build-vulkantools.sh
rename to .gitlab-ci/container/build-vulkantools.sh
diff --git a/.gitlab-ci/create-android-cross-file.sh b/.gitlab-ci/container/create-android-cross-file.sh
similarity index 100%
rename from .gitlab-ci/create-android-cross-file.sh
rename to .gitlab-ci/container/create-android-cross-file.sh
diff --git a/.gitlab-ci/create-android-ndk-pc.sh b/.gitlab-ci/container/create-android-ndk-pc.sh
similarity index 100%
rename from .gitlab-ci/create-android-ndk-pc.sh
rename to .gitlab-ci/container/create-android-ndk-pc.sh
diff --git a/.gitlab-ci/create-cross-file.sh b/.gitlab-ci/container/create-cross-file.sh
similarity index 100%
rename from .gitlab-ci/create-cross-file.sh
rename to .gitlab-ci/container/create-cross-file.sh
diff --git a/.gitlab-ci/create-rootfs.sh b/.gitlab-ci/container/create-rootfs.sh
similarity index 100%
rename from .gitlab-ci/create-rootfs.sh
rename to .gitlab-ci/container/create-rootfs.sh
diff --git a/.gitlab-ci/container/cross_build.sh b/.gitlab-ci/container/cross_build.sh
index 8d74cf23e41..15d28b1acc8 100644
--- a/.gitlab-ci/container/cross_build.sh
+++ b/.gitlab-ci/container/cross_build.sh
@@ -47,7 +47,7 @@ fi
 apt-get install -y --no-remove -t buster-backports \
         $LLVM:$arch
 
-. .gitlab-ci/create-cross-file.sh $arch
+. .gitlab-ci/container/create-cross-file.sh $arch
 
 
 . .gitlab-ci/container/container_pre_build.sh
@@ -55,7 +55,7 @@ apt-get install -y --no-remove -t buster-backports \
 
 # dependencies where we want a specific version
 EXTRA_MESON_ARGS="--cross-file=/cross_file-${arch}.txt -D libdir=lib/$(dpkg-architecture -A $arch -qDEB_TARGET_MULTIARCH)"
-. .gitlab-ci/build-libdrm.sh
+. .gitlab-ci/container/build-libdrm.sh
 
 apt-get purge -y \
         $STABLE_EPHEMERAL
diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index d4bb92371b0..36c5c1840fd 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -18,7 +18,7 @@ check_minio "${CI_PROJECT_PATH}"
 . .gitlab-ci/container/container_pre_build.sh
 
 # Install rust, which we'll be using for deqp-runner.  It will be cleaned up at the end.
-. .gitlab-ci/build-rust.sh
+. .gitlab-ci/container/build-rust.sh
 
 if [[ "$DEBIAN_ARCH" = "arm64" ]]; then
     GCC_ARCH="aarch64-linux-gnu"
@@ -32,7 +32,7 @@ elif [[ "$DEBIAN_ARCH" = "armhf" ]]; then
     DEFCONFIG="arch/arm/configs/multi_v7_defconfig"
     DEVICE_TREES="arch/arm/boot/dts/rk3288-veyron-jaq.dtb arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dtb"
     KERNEL_IMAGE_NAME="zImage"
-    . .gitlab-ci/create-cross-file.sh armhf
+    . .gitlab-ci/container/create-cross-file.sh armhf
 else
     GCC_ARCH="x86_64-linux-gnu"
     KERNEL_ARCH="x86_64"
@@ -111,26 +111,26 @@ mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}
 
 
 ############### Build dEQP runner
-. .gitlab-ci/build-deqp-runner.sh
+. .gitlab-ci/container/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
-DEQP_TARGET=surfaceless . .gitlab-ci/build-deqp.sh
+DEQP_TARGET=surfaceless . .gitlab-ci/container/build-deqp.sh
 
 mv /deqp /lava-files/rootfs-${DEBIAN_ARCH}/.
 
 
 ############### Build piglit
 if [ -n "$INCLUDE_PIGLIT" ]; then
-    . .gitlab-ci/build-piglit.sh
+    . .gitlab-ci/container/build-piglit.sh
     mv /piglit /lava-files/rootfs-${DEBIAN_ARCH}/.
 fi
 
 
 ############### Build apitrace
-. .gitlab-ci/build-apitrace.sh
+. .gitlab-ci/container/build-apitrace.sh
 mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/apitrace
 mv /apitrace/build /lava-files/rootfs-${DEBIAN_ARCH}/apitrace
 rm -rf /apitrace
@@ -142,7 +142,7 @@ rm -rf /waffle
 
 ############### Build renderdoc
 EXTRA_CMAKE_ARGS+=" -DENABLE_XCB=false"
-. .gitlab-ci/build-renderdoc.sh
+. .gitlab-ci/container/build-renderdoc.sh
 mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/renderdoc
 mv /renderdoc/build /lava-files/rootfs-${DEBIAN_ARCH}/renderdoc
 rm -rf /renderdoc
@@ -150,7 +150,7 @@ rm -rf /renderdoc
 
 ############### Build libdrm
 EXTRA_MESON_ARGS+=" -D prefix=/libdrm"
-. .gitlab-ci/build-libdrm.sh
+. .gitlab-ci/container/build-libdrm.sh
 
 
 ############### Cross-build kernel
@@ -173,7 +173,7 @@ if [ -n "$INSTALL_KERNEL_MODULES" ]; then
     sed -i 's/=m/=n/g' ${DEFCONFIG}
 fi
 
-./scripts/kconfig/merge_config.sh ${DEFCONFIG} ../.gitlab-ci/${KERNEL_ARCH}.config
+./scripts/kconfig/merge_config.sh ${DEFCONFIG} ../.gitlab-ci/container/${KERNEL_ARCH}.config
 make ${KERNEL_IMAGE_NAME}
 for image in ${KERNEL_IMAGE_NAME}; do
     cp arch/${KERNEL_ARCH}/boot/${image} /lava-files/.
@@ -220,7 +220,7 @@ debootstrap \
 cat /lava-files/rootfs-${DEBIAN_ARCH}/debootstrap/debootstrap.log
 set -e
 
-cp .gitlab-ci/create-rootfs.sh /lava-files/rootfs-${DEBIAN_ARCH}/.
+cp .gitlab-ci/container/create-rootfs.sh /lava-files/rootfs-${DEBIAN_ARCH}/.
 cp .gitlab-ci/container/llvm-snapshot.gpg.key /lava-files/rootfs-${DEBIAN_ARCH}/.
 chroot /lava-files/rootfs-${DEBIAN_ARCH} \
     sh -c "INCLUDE_PIGLIT=$INCLUDE_PIGLIT sh /create-rootfs.sh"
diff --git a/.gitlab-ci/x86_64.config b/.gitlab-ci/container/x86_64.config
similarity index 100%
rename from .gitlab-ci/x86_64.config
rename to .gitlab-ci/container/x86_64.config
diff --git a/.gitlab-ci/container/x86_build.sh b/.gitlab-ci/container/x86_build.sh
index c7e46476ef3..33d596c751e 100644
--- a/.gitlab-ci/container/x86_build.sh
+++ b/.gitlab-ci/container/x86_build.sh
@@ -81,7 +81,7 @@ tar -xvf $LIBXCB_VERSION.tar.bz2 && rm $LIBXCB_VERSION.tar.bz2
 cd $LIBXCB_VERSION; ./configure; make install; cd ..
 rm -rf $LIBXCB_VERSION
 
-. .gitlab-ci/build-libdrm.sh
+. .gitlab-ci/container/build-libdrm.sh
 
 wget $WAYLAND_RELEASES/$LIBWAYLAND_VERSION.tar.xz
 tar -xvf $LIBWAYLAND_VERSION.tar.xz && rm $LIBWAYLAND_VERSION.tar.xz
@@ -103,7 +103,7 @@ tar -xvf libglvnd-v$GLVND_VERSION.tar.gz && rm libglvnd-v$GLVND_VERSION.tar.gz
 pushd libglvnd-v$GLVND_VERSION; ./autogen.sh; ./configure; make install; popd
 rm -rf libglvnd-v$GLVND_VERSION
 
-. .gitlab-ci/build-spirv-tools.sh
+. .gitlab-ci/container/build-spirv-tools.sh
 
 git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator -b llvm_release_100 --depth 1
 pushd SPIRV-LLVM-Translator
diff --git a/.gitlab-ci/container/x86_test-gl.sh b/.gitlab-ci/container/x86_test-gl.sh
index 1fb616cf656..490a6fc994a 100644
--- a/.gitlab-ci/container/x86_test-gl.sh
+++ b/.gitlab-ci/container/x86_test-gl.sh
@@ -52,40 +52,40 @@ apt-get install -y --no-remove \
 
 ############### Build spirv-tools (debian too old)
 
-. .gitlab-ci/build-spirv-tools.sh
+. .gitlab-ci/container/build-spirv-tools.sh
 
 ############### Build libclc
 
-. .gitlab-ci/build-libclc.sh
+. .gitlab-ci/container/build-libclc.sh
 
 ############### Build virglrenderer
 
-. .gitlab-ci/build-virglrenderer.sh
+. .gitlab-ci/container/build-virglrenderer.sh
 
 ############### Build piglit
 
-INCLUDE_OPENCL_TESTS=1 . .gitlab-ci/build-piglit.sh
+INCLUDE_OPENCL_TESTS=1 . .gitlab-ci/container/build-piglit.sh
 
 ############### Build dEQP runner (and install rust temporarily for it)
-. .gitlab-ci/build-rust.sh
-. .gitlab-ci/build-deqp-runner.sh
+. .gitlab-ci/container/build-rust.sh
+. .gitlab-ci/container/build-deqp-runner.sh
 rm -rf /root/.rustup /root/.cargo
 
 ############### Build dEQP GL
 
-DEQP_TARGET=surfaceless . .gitlab-ci/build-deqp.sh
+DEQP_TARGET=surfaceless . .gitlab-ci/container/build-deqp.sh
 
 ############### Build apitrace
 
-. .gitlab-ci/build-apitrace.sh
+. .gitlab-ci/container/build-apitrace.sh
 
 ############### Build renderdoc
 
-. .gitlab-ci/build-renderdoc.sh
+. .gitlab-ci/container/build-renderdoc.sh
 
 ############### Build libdrm
 
-. .gitlab-ci/build-libdrm.sh
+. .gitlab-ci/container/build-libdrm.sh
 
 ############### Uninstall the build software
 
diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh
index b00a739abe3..72d94e7f37c 100644
--- a/.gitlab-ci/container/x86_test-vk.sh
+++ b/.gitlab-ci/container/x86_test-vk.sh
@@ -114,27 +114,27 @@ wine \
 
 ############### Build piglit
 
-PIGLIT_BUILD_TARGETS="piglit_replayer" . .gitlab-ci/build-piglit.sh
+PIGLIT_BUILD_TARGETS="piglit_replayer" . .gitlab-ci/container/build-piglit.sh
 
 ############### Build dEQP runner (and install rust temporarily for it)
-. .gitlab-ci/build-rust.sh
-. .gitlab-ci/build-deqp-runner.sh
+. .gitlab-ci/container/build-rust.sh
+. .gitlab-ci/container/build-deqp-runner.sh
 rm -rf /root/.rustup /root/.cargo
 
 ############### Build Fossilize
 
-. .gitlab-ci/build-fossilize.sh
+. .gitlab-ci/container/build-fossilize.sh
 
 ############### Build dEQP VK
-. .gitlab-ci/build-deqp.sh
+. .gitlab-ci/container/build-deqp.sh
 
 ############### Build gfxreconstruct
 
-. .gitlab-ci/build-gfxreconstruct.sh
+. .gitlab-ci/container/build-gfxreconstruct.sh
 
 ############### Build VulkanTools
 
-. .gitlab-ci/build-vulkantools.sh
+. .gitlab-ci/container/build-vulkantools.sh
 
 ############### Uninstall the build software
 
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 6d3152ab3c4..57550b911d2 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  DISTRIBUTION_TAG: "2021-02-01-runner"
+  DISTRIBUTION_TAG: "2021-02-08-subdir-move"
 
 .kernel+rootfs:
   stage: container-2