diff --git a/.github/scripts/strategy-matrix/generate.py b/.github/scripts/strategy-matrix/generate.py
index 1d136781db..a6268bff0a 100755
--- a/.github/scripts/strategy-matrix/generate.py
+++ b/.github/scripts/strategy-matrix/generate.py
@@ -170,8 +170,8 @@ def generate_strategy_matrix(all: bool, config: Config) -> list:
                 # This is needed because sanitizers create very large binaries
                 # -fPIC enables position independent code to avoid relocation range issues
                 # large model removes the 2GB limitation that medium model has
-                cxx_flags += ' -mcmodel=large -fPIC -pie'
-                linker_relocation_flags+=' -mcmodel=large -fPIC -pie'
+                cxx_flags += ' -mcmodel=large -fPIC -fno-pie'
+                linker_relocation_flags+=' -mcmodel=large -fPIC -fno-pie'
 
             # Create default sanitizer flags
             sanitizers_flags = 'undefined,float-divide-by-zero'
diff --git a/.github/workflows/reusable-build-test-config.yml b/.github/workflows/reusable-build-test-config.yml
index cfe7fa6637..79f1c57413 100644
--- a/.github/workflows/reusable-build-test-config.yml
+++ b/.github/workflows/reusable-build-test-config.yml
@@ -173,7 +173,7 @@ jobs:
           PARALLELISM: ${{ runner.os == 'Windows' && '1' || steps.nproc.outputs.nproc }}
         run: |
           export ASAN_OPTIONS="suppressions=$GITHUB_WORKSPACE/external/asan.supp"
-          export TSAN_OPTIONS="second_deadlock_stack=1 suppressions=$GITHUB_WORKSPACE/external/tsan.supp"
+          export TSAN_OPTIONS="second_deadlock_stack=1 halt_on_error=0 suppressions=$GITHUB_WORKSPACE/external/tsan.supp"
           export UBSAN_OPTIONS="suppressions=$GITHUB_WORKSPACE/external/ubsan.supp"
           export LSAN_OPTIONS="suppressions=$GITHUB_WORKSPACE/external/lsan.supp"
           ctest \
@@ -188,7 +188,7 @@ jobs:
           BUILD_NPROC: ${{ steps.nproc.outputs.nproc }}
         run: |
           export ASAN_OPTIONS="suppressions=$GITHUB_WORKSPACE/external/asan.supp"
-          export TSAN_OPTIONS="second_deadlock_stack=1 suppressions=$GITHUB_WORKSPACE/external/tsan.supp"
+          export TSAN_OPTIONS="second_deadlock_stack=1 halt_on_error=0 suppressions=$GITHUB_WORKSPACE/external/tsan.supp"
           export UBSAN_OPTIONS="suppressions=$GITHUB_WORKSPACE/external/ubsan.supp"
           export LSAN_OPTIONS="suppressions=$GITHUB_WORKSPACE/external/lsan.supp"
           ./rippled --unittest --unittest-jobs "${BUILD_NPROC}"