diff --git a/ci/gitlab-ci.yml b/ci/gitlab-ci.yml
index fd06739f3ee317bd8e382c660601a00908d5474c..30b0b020522a69eed3ccb84308025320d0cad05a 100644
--- a/ci/gitlab-ci.yml
+++ b/ci/gitlab-ci.yml
@@ -173,20 +173,18 @@ asan-ubsan:
       - $CI_PROJECT_DIR/build/meson-logs/testlog.txt
     expire_in: 1 week
 
-test:tsan:
+.base-sanitizer:
   image: $MEDIALIBRARY_IMG
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
     - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "$CI_DEFAULT_BRANCH@videolan/medialibrary"'
   stage: test
-  variables:
-      TSAN_OPTIONS: 'suppressions=$CI_PROJECT_DIR/ci/tsan_suppress_file'
   script:
     - >
       CXX=clang++
       meson
       -Dpkg_config_path=$PKG_CONFIG_PATH:$CI_PROJECT_DIR/vlc/prefix/lib/pkgconfig
-      -Db_sanitize=thread
+      -Db_sanitize=$SANITIZERS
       -Db_lundef=false
       build
     - cd build && meson test --no-stdsplit
@@ -200,6 +198,19 @@ test:tsan:
       - $CI_PROJECT_DIR/build/meson-logs/testlog.txt
     expire_in: 1 week
 
+test:tsan:
+  extends: .base-sanitizer
+  variables:
+      TSAN_OPTIONS: 'suppressions=$CI_PROJECT_DIR/ci/tsan_suppress_file'
+      SANITIZERS: thread
+        
+test:asan-ubsan:
+  extends: .base-sanitizer
+  variables:
+    LSAN_OPTIONS: 'detect_leaks=0'
+    SANITIZERS: address,undefined
+
+
 gen-test-db:
   image: $MEDIALIBRARY_IMG
   stage: generate