diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 13ffc92020126b425e6eeca7262c7e9e311927c0..9a8491cc5d7fe65cfdda5dfffb35fcf8b04b374f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,7 +41,7 @@ variables:
       - 'pytest-compare-to-input'
       - 'pytest-saturation-smoke-test'
       - 'evs-26444'
-      - 'sanitizer-stv'
+      - 'sanitizer'
       - 'pytest-renderer'
       - 'complexity'
       - 'coverage'
@@ -82,7 +82,7 @@ workflow:
     - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'evs-26444'
       variables:
         IVAS_PIPELINE_NAME: 'EVS 26.444 test: $CI_COMMIT_BRANCH'
-    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'sanitizer-stv'
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'sanitizer'
       variables:
         IVAS_PIPELINE_NAME: 'Short testvectors sanitizers'
     - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-renderer'
@@ -493,14 +493,14 @@ stages:
 .ivas-pytest-sanitizers-anchor: &ivas-pytest-sanitizers-anchor
   stage: test
   needs: ["build-codec-linux-make"]
-  timeout: "90 minutes"
+  timeout: "300 minutes"
   rules:
     - if: $CI_PIPELINE_SOURCE == 'push'
       when: never
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
       when: never
     - if: $CI_PIPELINE_SOURCE == 'schedule' && $IVAS_PYTEST_MSAN
-    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "sanitizer-stv"
+    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "sanitizer"
   script:
     - *print-common-info
     - *update-scripts-repo
@@ -510,7 +510,7 @@ stages:
     - make -j CLANG=$CLANG_NUM
     - if [[ $CLANG_NUM == 3 ]]; then export UBSAN_OPTIONS="suppressions=scripts/ubsan.supp,report_error_type=1"; fi
     - testcase_timeout=$TESTCASE_TIMEOUT_STV_SANITIZERS
-    - python3 -m pytest $SHORT_TEST_SUITE -v --tb=no --update_ref 1 --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout $testcase_timeout --ref_encoder_path $DUT_ENCODER_PATH --ref_decoder_path $DUT_DECODER_PATH
+    - python3 -m pytest $TEST_SUITE -v --tb=no --update_ref 1 --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout $testcase_timeout --ref_encoder_path $DUT_ENCODER_PATH --ref_decoder_path $DUT_DECODER_PATH
   artifacts:
     name: "$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA--results"
     when: always
@@ -846,6 +846,7 @@ ivas-pytest-enc-msan:
   before_script:
     - CLANG_NUM=1
     - DUT_DECODER_PATH=./$REF_DECODER_PATH
+    - TEST_SUITE=$LONG_TEST_SUITE
   <<: *ivas-pytest-sanitizers-anchor
 
 ivas-pytest-enc-asan:
@@ -854,6 +855,7 @@ ivas-pytest-enc-asan:
   before_script:
     - CLANG_NUM=2
     - DUT_DECODER_PATH=./$REF_DECODER_PATH
+    - TEST_SUITE=$LONG_TEST_SUITE
   <<: *ivas-pytest-sanitizers-anchor
 
 ivas-pytest-enc-usan:
@@ -862,6 +864,7 @@ ivas-pytest-enc-usan:
   before_script:
     - CLANG_NUM=3
     - DUT_DECODER_PATH=./$REF_DECODER_PATH
+    - TEST_SUITE=$ENCODER_TEST_SUITE
   <<: *ivas-pytest-sanitizers-anchor
   
 ### jobs that test flt encoder -> fx decoder
@@ -921,20 +924,22 @@ ivas-pytest-compare-to-input-short-enc:
     - LEVEL_SCALING=1.0
   <<: *ivas-pytest-compare-to-input-anchor
 
-ivas-pytest-dec-msan-short:
+ivas-pytest-dec-msan:
   extends:
     - .test-job-linux
   before_script:
     - CLANG_NUM=1
     - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
+    - TEST_SUITE=$LONG_TEST_SUITE_SELF_TEST
   <<: *ivas-pytest-sanitizers-anchor
 
-ivas-pytest-dec-asan-short:
+ivas-pytest-dec-asan:
   extends:
     - .test-job-linux
   before_script:
     - CLANG_NUM=2
     - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
+    - TEST_SUITE=$LONG_TEST_SUITE_SELF_TEST
   <<: *ivas-pytest-sanitizers-anchor
 
 ivas-pytest-dec-usan-short:
@@ -943,6 +948,7 @@ ivas-pytest-dec-usan-short:
   before_script:
     - CLANG_NUM=3
     - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
+    - TEST_SUITE=$SHORT_TEST_SUITE
   <<: *ivas-pytest-sanitizers-anchor
 
 # ---------------------------------------------------------------