diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ef8316c02a..0ecc639af7e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,9 @@ include:
     ref: 43ac932d5b8ebf43040d302de3c6e734df178384
     file:
       - '/templates/ci-fairy.yml'
+  - project: 'freedesktop/ci-templates'
+    ref: 52dd4a94044449c8481d18dcdc221a3c636366d2
+    file:
       - '/templates/debian.yml'
   - local: '.gitlab-ci/lava-gitlab-ci.yml'
   - local: '.gitlab-ci/test-source-dep.yml'
@@ -238,7 +241,7 @@ x86_build-base:
     - .fdo.container-build@debian
     - .container
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_build-base "2020-12-01-no-more-dri1"
+    FDO_DISTRIBUTION_TAG: &x86_build-base "2020-12-02"
 
 .use-x86_build-base:
   extends:
@@ -256,7 +259,7 @@ x86_build:
   extends:
     - .use-x86_build-base
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_build "2020-12-01-no-more-dri1"
+    FDO_DISTRIBUTION_TAG: &x86_build "2020-12-02"
 
 .use-x86_build:
   variables:
@@ -270,7 +273,7 @@ i386_build:
   extends:
     - .use-x86_build-base
   variables:
-    FDO_DISTRIBUTION_TAG: &i386_build "2020-12-01-no-more-dri1"
+    FDO_DISTRIBUTION_TAG: &i386_build "2020-12-02"
 
 .use-i386_build:
   variables:
@@ -284,7 +287,7 @@ ppc64el_build:
   extends:
     - .use-x86_build-base
   variables:
-    FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-12-01-no-more-dri1"
+    FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-12-02"
 
 .use-ppc64el_build:
   variables:
@@ -298,7 +301,7 @@ s390x_build:
   extends:
     - .use-x86_build-base
   variables:
-    FDO_DISTRIBUTION_TAG: &s390x_build "2020-12-01-no-more-dri1"
+    FDO_DISTRIBUTION_TAG: &s390x_build "2020-12-02"
 
 .use-s390x_build:
   variables:
@@ -312,7 +315,7 @@ android_build:
   extends:
     - .use-x86_build-base
   variables:
-    FDO_DISTRIBUTION_TAG: &android_build "2020-12-01-no-more-dri1"
+    FDO_DISTRIBUTION_TAG: &android_build "2020-12-02"
 
 .use-android_build:
   variables:
@@ -325,7 +328,7 @@ android_build:
 x86_test-base:
   extends: x86_build-base
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_test-base "2020-12-01-no-more-dri1"
+    FDO_DISTRIBUTION_TAG: &x86_test-base "2020-12-02"
 
 .use-x86_test-base:
   extends:
@@ -354,7 +357,7 @@ x86_test-vk:
 x86_build_old:
   extends: x86_build-base
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_build_old "2020-12-01-no-more-dri1"
+    FDO_DISTRIBUTION_TAG: &x86_build_old "2020-12-02"
     FDO_DISTRIBUTION_VERSION: stretch-slim
 
 .use-x86_build_old:
@@ -367,10 +370,10 @@ x86_build_old:
 # Debian 10 based ARM build image
 arm_build:
   extends:
-    - .fdo.container-build@debian@aarch64
+    - .fdo.container-build@debian@arm64v8
     - .container
   variables:
-    FDO_DISTRIBUTION_TAG: &arm_build "2020-12-01-no-more-dri1"
+    FDO_DISTRIBUTION_TAG: &arm_build "2020-12-02"
 
 .use-arm_build:
   variables:
@@ -426,7 +429,7 @@ arm64_test:
 
 .windows-docker-vs2019:
   variables:
-    WINDOWS_TAG: "2020-12-01-piglit"
+    WINDOWS_TAG: "2020-12-02"
     WINDOWS_IMAGE: "$CI_REGISTRY_IMAGE/windows/x64_build:$WINDOWS_TAG"
     WINDOWS_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/windows/x64_build:$WINDOWS_TAG"