diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9bd7ddd125a..3977eeb1d20 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -285,7 +285,7 @@ debian/x86_build-base:
     - .fdo.container-build@debian
     - .container
   variables:
-    MESA_IMAGE_TAG: &debian-x86_build-base "2021-07-02-bump-libdrm"
+    MESA_IMAGE_TAG: &debian-x86_build-base "2021-07-26-python"
 
 .use-debian/x86_build-base:
   extends:
@@ -387,7 +387,7 @@ debian/android_build:
 debian/x86_test-base:
   extends: debian/x86_build-base
   variables:
-    MESA_IMAGE_TAG: &debian-x86_test-base "2021-07-30-deqp-runner"
+    MESA_IMAGE_TAG: &debian-x86_test-base "2021-07-26-python"
 
 .use-debian/x86_test-base:
   extends:
@@ -421,7 +421,7 @@ debian/arm_build:
   tags:
     - aarch64
   variables:
-    MESA_IMAGE_TAG: &debian-arm_build "2021-07-02-bump-libdrm"
+    MESA_IMAGE_TAG: &debian-arm_build "2021-07-26-python"
 
 .use-debian/arm_build:
   extends:
@@ -515,7 +515,7 @@ debian/arm_test:
     FDO_DISTRIBUTION_EXEC: 'env ARTIFACTS_PREFIX=https://${MINIO_HOST}/mesa-lava ARTIFACTS_SUFFIX=${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT} CI_PROJECT_PATH=${CI_PROJECT_PATH} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} FDO_UPSTREAM_REPO=${FDO_UPSTREAM_REPO} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
     FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}"
     MESA_ARM_BUILD_TAG: *debian-arm_build
-    MESA_IMAGE_TAG: &debian-arm_test "2021-07-02-bump-libdrm"
+    MESA_IMAGE_TAG: &debian-arm_test "2021-07-26-python"
     MESA_ROOTFS_TAG: *kernel-rootfs
 
 .use-debian/arm_test:
diff --git a/.gitlab-ci/container/debian/arm_build.sh b/.gitlab-ci/container/debian/arm_build.sh
index 1ada5682bce..c16e9474de0 100644
--- a/.gitlab-ci/container/debian/arm_build.sh
+++ b/.gitlab-ci/container/debian/arm_build.sh
@@ -43,7 +43,6 @@ apt-get -y install \
 	llvm-11-dev \
 	meson \
 	pkg-config \
-	python-is-python3 \
 	python3-mako \
 	python3-pil \
 	python3-pip \
diff --git a/.gitlab-ci/container/debian/arm_test.sh b/.gitlab-ci/container/debian/arm_test.sh
index 48641152c9c..eedb88e91c8 100644
--- a/.gitlab-ci/container/debian/arm_test.sh
+++ b/.gitlab-ci/container/debian/arm_test.sh
@@ -14,7 +14,6 @@ apt-get install -y --no-remove \
         fastboot \
         netcat \
         procps \
-        python-is-python3 \
         python3-distutils \
         python3-minimal \
         python3-serial \
diff --git a/.gitlab-ci/container/debian/x86_build-base.sh b/.gitlab-ci/container/debian/x86_build-base.sh
index 26defedb940..6333fa70e09 100644
--- a/.gitlab-ci/container/debian/x86_build-base.sh
+++ b/.gitlab-ci/container/debian/x86_build-base.sh
@@ -58,7 +58,6 @@ apt-get install -y --no-remove \
         make \
         meson \
         pkg-config \
-        python-is-python3 \
         python3-mako \
         python3-pil \
         python3-requests \
diff --git a/.gitlab-ci/container/debian/x86_test-base.sh b/.gitlab-ci/container/debian/x86_test-base.sh
index 0eff8b4e42c..362cf7e9e7b 100644
--- a/.gitlab-ci/container/debian/x86_test-base.sh
+++ b/.gitlab-ci/container/debian/x86_test-base.sh
@@ -41,7 +41,6 @@ apt-get install -y --no-remove \
       libxkbcommon0 \
       libxrandr2 \
       libxrender1 \
-      python-is-python3 \
       python3-mako \
       python3-numpy \
       python3-packaging \