diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7275795fd0b..4ff9e432eeb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -42,7 +42,7 @@ jobs:
         name: android-hermes
         path: output
   linux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Install dependencies
       run: |-
@@ -54,13 +54,8 @@ jobs:
         path: hermes
     - name: Build linux CLI
       run: |-
-        cmake -S hermes -B build_hdb -DHERMES_STATIC_LINK=ON -DCMAKE_BUILD_TYPE=Release \
-          -DCMAKE_CXX_FLAGS=-s -DCMAKE_C_FLAGS=-s \
-          -DCMAKE_EXE_LINKER_FLAGS="-Wl,--whole-archive -lpthread -Wl,--no-whole-archive"
-        cmake -S hermes -B build -DHERMES_STATIC_LINK=ON -DCMAKE_BUILD_TYPE=Release \
-          -DCMAKE_CXX_FLAGS=-s -DCMAKE_C_FLAGS=-s \
-          -DCMAKE_EXE_LINKER_FLAGS="-Wl,--whole-archive -lpthread -Wl,--no-whole-archive" \
-          -DHERMES_ENABLE_DEBUGGER=False
+        cmake -S hermes -B build_hdb
+        cmake -S hermes -B build
         cmake --build build_hdb --target hdb
         cmake --build build --target check-hermes hermes hvm hbcdump hermesc
     - name: Create CLI tarball
diff --git a/external/llvh/utils/lit/lit/main.py b/external/llvh/utils/lit/lit/main.py
index 49aaf638a22..ab5a7fff6d4 100755
--- a/external/llvh/utils/lit/lit/main.py
+++ b/external/llvh/utils/lit/lit/main.py
@@ -335,7 +335,7 @@ def main_with_tmp(builtinParameters):
         parser.error('No inputs specified')
 
     if opts.numThreads is None:
-        opts.numThreads = lit.util.detectCPUs()
+        opts.numThreads = 1
     elif opts.numThreads <= 0:
         parser.error("Option '--threads' or '-j' requires positive integer")