diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 00235e4ddf..d11ff416fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ variables:
   CFLAGS_COMMON: -fno-omit-frame-pointer -fno-optimize-sibling-calls -O1 -g -Wall -Wextra 
 
   # Pass run-time flags to AddressSanitizer to get core dumps on error.
-  ASAN_OPTIONS_COMMON: abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1
+  ASAN_OPTIONS: abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1
   TSAN_OPTIONS_COMMON: "disable_coredump=0 second_deadlock_stack=1 history_size=7 log_exe_name=true log_path=tsan external_symbolizer_path=/usr/lib/llvm-12/bin/llvm-symbolizer"
 
   TARBALL_EXTENSION: xz
@@ -928,22 +928,18 @@ gcc:asan:
     CFLAGS: "${CFLAGS_COMMON} -fsanitize=address,undefined"
     LDFLAGS: "-fsanitize=address,undefined"
     EXTRA_CONFIGURE: "--with-libidn2 --without-jemalloc"
-  <<: *base_image
+  <<: *fedora_34_amd64_image
   <<: *build_job
 
 system:gcc:asan:
-  variables:
-    ASAN_OPTIONS: ${ASAN_OPTIONS_COMMON}
-  <<: *base_image
+  <<: *fedora_34_amd64_image
   <<: *system_test_job
   needs:
     - job: gcc:asan
       artifacts: true
 
 unit:gcc:asan:
-  variables:
-    ASAN_OPTIONS: ${ASAN_OPTIONS_COMMON}
-  <<: *base_image
+  <<: *fedora_34_amd64_image
   <<: *unit_test_job
   needs:
     - job: gcc:asan
@@ -959,8 +955,6 @@ clang:asan:
   <<: *build_job
 
 system:clang:asan:
-  variables:
-    ASAN_OPTIONS: ${ASAN_OPTIONS_COMMON}
   <<: *base_image
   <<: *system_test_job
   needs:
@@ -968,8 +962,6 @@ system:clang:asan:
       artifacts: true
 
 unit:clang:asan:
-  variables:
-    ASAN_OPTIONS: ${ASAN_OPTIONS_COMMON}
   <<: *base_image
   <<: *unit_test_job
   needs:
@@ -979,18 +971,18 @@ unit:clang:asan:
 # Jobs for TSAN builds on Debian 10 "buster" (amd64)
 
 gcc:tsan:
-  <<: *base_image
-  <<: *build_job
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -fsanitize=thread"
     LDFLAGS: "-fsanitize=thread"
     EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock --without-jemalloc"
+  <<: *fedora_34_amd64_image
+  <<: *build_job
 
 system:gcc:tsan:
   variables:
     TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON}
-  <<: *base_image
+  <<: *fedora_34_amd64_image
   <<: *system_test_tsan_job
   needs:
     - job: gcc:tsan
@@ -998,8 +990,8 @@ system:gcc:tsan:
 
 unit:gcc:tsan:
   variables:
-    TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON} suppressions=$CI_PROJECT_DIR/tsan-suppressions.txt
-  <<: *base_image
+    TSAN_OPTIONS: ${TSAN_OPTIONS_COMMON}
+  <<: *fedora_34_amd64_image
   <<: *unit_test_tsan_job
   needs:
     - job: gcc:tsan