diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fbff9d20497..9f076af9475 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -259,7 +259,7 @@ x86_build-base:
     - .fdo.container-build@debian
     - .container
   variables:
-    MESA_IMAGE_TAG: &x86_build-base "2020-12-02"
+    MESA_IMAGE_TAG: &x86_build-base "2020-12-09-sanitizers"
 
 .use-x86_build-base:
   extends:
@@ -276,7 +276,7 @@ x86_build:
   extends:
     - .use-x86_build-base
   variables:
-    MESA_IMAGE_TAG: &x86_build "2020-12-09"
+    MESA_IMAGE_TAG: &x86_build "2020-12-11-sanitizers"
 
 .use-x86_build:
   variables:
@@ -290,7 +290,7 @@ i386_build:
   extends:
     - .use-x86_build-base
   variables:
-    MESA_IMAGE_TAG: &i386_build "2020-12-02"
+    MESA_IMAGE_TAG: &i386_build "2020-12-09-sanitizers"
 
 .use-i386_build:
   variables:
@@ -304,7 +304,7 @@ ppc64el_build:
   extends:
     - .use-x86_build-base
   variables:
-    MESA_IMAGE_TAG: &ppc64el_build "2020-12-02"
+    MESA_IMAGE_TAG: &ppc64el_build "2020-12-09-sanitizers"
 
 .use-ppc64el_build:
   variables:
@@ -318,7 +318,7 @@ s390x_build:
   extends:
     - .use-x86_build-base
   variables:
-    MESA_IMAGE_TAG: &s390x_build "2020-12-02"
+    MESA_IMAGE_TAG: &s390x_build "2020-12-09-sanitizers"
 
 .use-s390x_build:
   variables:
@@ -332,7 +332,7 @@ android_build:
   extends:
     - .use-x86_build-base
   variables:
-    MESA_IMAGE_TAG: &android_build "2020-12-02"
+    MESA_IMAGE_TAG: &android_build "2020-12-09-sanitizers"
 
 .use-android_build:
   variables:
@@ -345,7 +345,7 @@ android_build:
 x86_test-base:
   extends: x86_build-base
   variables:
-    MESA_IMAGE_TAG: &x86_test-base "2020-12-02"
+    MESA_IMAGE_TAG: &x86_test-base "2020-12-09-sanitizers"
 
 .use-x86_test-base:
   extends:
@@ -599,6 +599,14 @@ meson-testing:
     - .gitlab-ci/meson-build.sh
     - .gitlab-ci/prepare-artifacts.sh
 
+meson-testing-asan:
+  extends:
+    - meson-testing
+  variables:
+    EXTRA_OPTION: >
+      -D b_sanitize=address
+    UPLOAD_FOR_LAVA: ""
+
 meson-clover-testing:
   extends:
     - .meson-build
diff --git a/.gitlab-ci/container/x86_build-base.sh b/.gitlab-ci/container/x86_build-base.sh
index 4faf7bd8b22..ceb06373169 100644
--- a/.gitlab-ci/container/x86_build-base.sh
+++ b/.gitlab-ci/container/x86_build-base.sh
@@ -69,6 +69,7 @@ apt-get install -y --no-remove \
         python3-setuptools \
         qemu-user \
         scons \
+        valgrind \
         wine64-development \
         x11proto-dri2-dev \
         x11proto-gl-dev \
diff --git a/.gitlab-ci/container/x86_build.sh b/.gitlab-ci/container/x86_build.sh
index d921e4bb33b..6444290c11d 100644
--- a/.gitlab-ci/container/x86_build.sh
+++ b/.gitlab-ci/container/x86_build.sh
@@ -26,6 +26,7 @@ apt-get update
 
 apt-get install -y --no-remove \
       $STABLE_EPHEMERAL \
+      libasan5 \
       libarchive-dev \
       libclang-cpp10-dev \
       liblua5.3-dev \