diff --git a/.github/workflows/comprehensive.yml b/.github/workflows/comprehensive.yml
index 79e27a71..3a01bdc6 100644
--- a/.github/workflows/comprehensive.yml
+++ b/.github/workflows/comprehensive.yml
@@ -184,7 +184,8 @@ jobs:
         pwd
         cd cli-hh
         export PATH=$PATH:$(dirname $(which npx))
-        ./clean.sh
+        yarn install
+        ./clean.sh || true
         ./init.sh
         cd ../..
 
diff --git a/.github/workflows/container-test.yml b/.github/workflows/container-test.yml
index f46aca9f..186f5d83 100644
--- a/.github/workflows/container-test.yml
+++ b/.github/workflows/container-test.yml
@@ -261,6 +261,8 @@ jobs:
         export PATH=$PATH:$(dirname $(which npx))
         cd comprehensive-test
         cd s_chain_gen
+        yarn install
+        ./clean.sh || true
         ./init.sh
         cd ../..