diff --git a/.clusterfuzzlite/Dockerfile b/.clusterfuzzlite/Dockerfile
index c0d3d43b..6bb43fee 100644
--- a/.clusterfuzzlite/Dockerfile
+++ b/.clusterfuzzlite/Dockerfile
@@ -12,6 +12,6 @@ RUN apt-get update && apt-get install -y \
 
 COPY . $SRC/lua-c-api-tests
 WORKDIR $SRC/lua-c-api-tests
-RUN git submodule update --init --recursive --force
-RUN cd corpus && git checkout cfl
+RUN rm -rf corpus
+RUN git clone --depth 1 --branch cfl https://github.com/ligurio/lua-c-api-corpus corpus
 COPY .clusterfuzzlite/build.sh $SRC/
diff --git a/.clusterfuzzlite/build.sh b/.clusterfuzzlite/build.sh
index 17b89e7c..a9e930bb 100755
--- a/.clusterfuzzlite/build.sh
+++ b/.clusterfuzzlite/build.sh
@@ -74,16 +74,16 @@ do
   echo "Copying for $module";
   cp $f $OUT/
   if [ -e "$corpus_dir" ]; then
-    find "$corpus_dir" -mindepth 1 -maxdepth 1 | zip -@ -j $OUT/"$name"_seed_corpus.zip
+    find "$corpus_dir" -mindepth 1 -maxdepth 1 | zip -@ -j --quiet $OUT/"$name"_seed_corpus.zip
   fi
 
   dict_path="corpus/$name.dict"
   if [ -e "$dict_path" ]; then
-    zip -urj $OUT/"$name"_seed_corpus.zip $dict_path
+    zip -urj $OUT/"$name"_seed_corpus.zip "$dict_path"
   fi
 
   options_path="corpus/$name.options"
   if [ -e "$options_path" ]; then
-    zip -urj $OUT/"$name"_seed_corpus.zip $options_path
+    zip -urj $OUT/"$name"_seed_corpus.zip "$options_path"
   fi
 done
diff --git a/.github/workflows/cflite_batch.yml b/.github/workflows/cflite_batch.yml
index cbf841ae..5605787b 100644
--- a/.github/workflows/cflite_batch.yml
+++ b/.github/workflows/cflite_batch.yml
@@ -15,7 +15,7 @@ permissions: read-all
 
 jobs:
   luajit:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/cflite_build.yml b/.github/workflows/cflite_build.yml
index f03ed2bc..89a639d8 100644
--- a/.github/workflows/cflite_build.yml
+++ b/.github/workflows/cflite_build.yml
@@ -10,7 +10,7 @@ permissions: read-all
 
 jobs:
   luajit:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/cflite_cron.yml b/.github/workflows/cflite_cron.yml
index bf11a64b..3f3f2447 100644
--- a/.github/workflows/cflite_cron.yml
+++ b/.github/workflows/cflite_cron.yml
@@ -16,7 +16,7 @@ jobs:
 # are covered by fuzzing.
 
   Coverage:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
@@ -46,7 +46,7 @@ jobs:
 # code coverage.
 
   Pruning:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup
diff --git a/.github/workflows/cflite_pr.yml b/.github/workflows/cflite_pr.yml
index 39c1c29c..f9ca30d1 100644
--- a/.github/workflows/cflite_pr.yml
+++ b/.github/workflows/cflite_pr.yml
@@ -35,7 +35,7 @@ permissions: read-all
 
 jobs:
   luajit:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix: