diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1bc5a6f072b0b84282eac06eedbe9c53e6b71871..c1e56d48d267011ea9b9139b9f6c0f49b255ae6f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -552,10 +552,17 @@ stages:
     - *update-scripts-repo
     - *copy-ltv-files-to-testv-dir
     - python3 ci/remove_unsupported_testcases.py $PRM_FILES
-    - *build-reference-and-dut-binaries
+
+    - *build-reference-binaries
+    - set -euxo pipefail
+    - make_args="CLANG=$CLANG_NUM"
+    - if [[ $CLANG_NUM == 3 ]]; then
+    -   export UBSAN_OPTIONS="suppressions=scripts/ubsan_basop.supp,report_error_type=1"
+    -   python3 scripts/basop_create_ignorelist_for_ubsan.py
+    -   make_args="$make_args IGNORELIST=1"
+    - fi
     - make clean
-    - make -j CLANG=$CLANG_NUM
-    - if [[ $CLANG_NUM == 3 ]]; then export UBSAN_OPTIONS="suppressions=scripts/ubsan_basop.supp,report_error_type=1"; fi
+    - make -j $make_args
     - testcase_timeout=$TESTCASE_TIMEOUT_LTV_SANITIZERS
     - 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:
diff --git a/Makefile b/Makefile
index 4e92bc951388c8564bc2f2319e1a646aef1e01b1..9d18cbde3d47ff872b918dc70675543fc18cfba9 100644
--- a/Makefile
+++ b/Makefile
@@ -82,10 +82,15 @@ ifeq "$(CLANG)" "3"
 CC       = $(CCCLANG) 
 # NOTE: keep in sync with list in CMakeLists.txt
 usan_checks = undefined,float-divide-by-zero,implicit-conversion,local-bounds
-CFLAGS  += -fsanitize=$(usan_checks) 
+CFLAGS  += -fsanitize=$(usan_checks)
 CFLAGS  += -fsanitize-recover=$(usan_checks) 
 LDFLAGS += -fsanitize=$(usan_checks)
 LDFLAGS += -fsanitize-recover=$(usan_checks)
+
+ifeq "$(IGNORELIST)" "1"
+CFLAGS  += -fsanitize-ignorelist=ubsan_ignorelist.txt
+LDFLAGS += -fsanitize-ignorelist=ubsan_ignorelist.txt
+endif
 endif
 
 ifeq "$(RELEASE)" "1"