diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 43fb8beb..9b6430e7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -81,6 +81,7 @@ jobs:
           - name: tsan
             options: ENABLE_SANITIZER_THREAD=ON
             cxx-compiler: clang++
+            cxx-flags: -fuse-ld=lld
 
     steps:
       - uses: actions/checkout@v6
@@ -100,6 +101,10 @@ jobs:
           key: ${{ github.job }}-${{ matrix.sanitizer.name }}
           max-size: 500M
 
+      - name: Install lld
+        if: matrix.sanitizer.name == 'tsan'
+        run: sudo apt-get update && sudo apt-get install -y lld
+
       - name: Configure and Build
         uses: threeal/cmake-action@v2
         with:
diff --git a/cmake/FairMQBundlePackageHelper.cmake b/cmake/FairMQBundlePackageHelper.cmake
index e8bb9586..52ba33b7 100644
--- a/cmake/FairMQBundlePackageHelper.cmake
+++ b/cmake/FairMQBundlePackageHelper.cmake
@@ -68,6 +68,7 @@ function(build_bundled package bundle)
 
     exec(${CMAKE_COMMAND} -S ${${package}_SOURCE_DIR} -B ${${package}_BINARY_DIR} -G ${CMAKE_GENERATOR}
       -DCMAKE_INSTALL_PREFIX=${${package}_INSTALL_DIR} -DBUILD_GMOCK=OFF
+      -DCMAKE_POSITION_INDEPENDENT_CODE=ON
     )
     exec(${CMAKE_COMMAND} --build ${${package}_BINARY_DIR})
     exec(${CMAKE_COMMAND} --build ${${package}_BINARY_DIR} --target install)