diff --git a/.github/workflows/docker_publish_x86.yml b/.github/workflows/docker_publish_x86.yml
index aaeab098a..cd71ed000 100644
--- a/.github/workflows/docker_publish_x86.yml
+++ b/.github/workflows/docker_publish_x86.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   docker-x86-image:
     if: github.repository == 'SVF-tools/SVF'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
@@ -31,7 +31,7 @@ jobs:
           
   dispatch:
       needs: docker-x86-image
-      runs-on: ubuntu-22.04
+      runs-on: ubuntu-latest
       strategy: 
         matrix:
           repo: ['SVF-tools/Software-Security-Analysis', 'SVF-tools/Teaching-Software-Analysis', 'SVF-tools/Teaching-Software-Verification', 'SVF-tools/SVF-example']
diff --git a/.github/workflows/github-action.yml b/.github/workflows/github-action.yml
index ea0662cd2..e207b6cad 100644
--- a/.github/workflows/github-action.yml
+++ b/.github/workflows/github-action.yml
@@ -16,9 +16,9 @@ jobs:
       XCODE_VERSION: '15.3.0'
     strategy:
       matrix:
-        os: [ubuntu-22.04, macos-latest]
+        os: [ubuntu-latest, macos-latest]
         include:
-          - os: [ubuntu-22.04]
+          - os: [ubuntu-latest]
             sanitizer: address
     steps:
       # checkout the repo
diff --git a/.github/workflows/svf-lib_publish.yml b/.github/workflows/svf-lib_publish.yml
index 41d2e0cc5..309c86af5 100644
--- a/.github/workflows/svf-lib_publish.yml
+++ b/.github/workflows/svf-lib_publish.yml
@@ -19,7 +19,7 @@ jobs:
       XCODE_VERSION: '15.3.0'  # Define Xcode version here to reuse it
     strategy:
       matrix:
-        os: [ubuntu-22.04, macos-latest]
+        os: [ubuntu-latest, macos-latest]
     steps:
       # checkout the repo
       - uses: actions/checkout@v2
diff --git a/build.sh b/build.sh
index 5233c2733..edd7a2d7f 100755
--- a/build.sh
+++ b/build.sh
@@ -250,10 +250,12 @@ BUILD_DIR="./${BUILD_TYPE}-build"
 rm -rf "${BUILD_DIR}"
 mkdir "${BUILD_DIR}"
 # If you need shared libs, turn BUILD_SHARED_LIBS on
-cmake -D CMAKE_BUILD_TYPE:STRING="${BUILD_TYPE}" \
-    -DSVF_ENABLE_ASSERTIONS:BOOL=true            \
-    -DSVF_SANITIZE="${SVF_SANITIZER}"            \
-    -DBUILD_SHARED_LIBS=off                      \
+cmake -D CMAKE_BUILD_TYPE:STRING="${BUILD_TYPE}"   \
+    -DCMAKE_C_COMPILER="${LLVM_DIR}/bin/clang"     \
+    -DCMAKE_CXX_COMPILER="${LLVM_DIR}/bin/clang++" \
+    -DSVF_ENABLE_ASSERTIONS:BOOL=true              \
+    -DSVF_SANITIZE="${SVF_SANITIZER}"              \
+    -DBUILD_SHARED_LIBS=off                        \
     -S "${SVFHOME}" -B "${BUILD_DIR}"
 cmake --build "${BUILD_DIR}" -j ${jobs}