diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
index 3abed588..cf876aa5 100644
--- a/.github/workflows/fuzz.yml
+++ b/.github/workflows/fuzz.yml
@@ -55,6 +55,16 @@ jobs:
       working-directory: ./polyjuice-tests/fuzz
       run: make build/test_contracts && ./build/test_contracts
 
+    - name: Set MAX_FUZZ_TIME for different branches
+      run: |
+        if [[ ${{ github.event_name == 'pull_request' }} ]]; then
+          echo "MAX_FUZZ_TIME=6" >> $GITHUB_ENV
+        elif [[ ${{ startsWith(github.base_ref, 'fuzz') }} ]]; then
+          echo "MAX_FUZZ_TIME=3600" >> $GITHUB_ENV
+        else
+          echo "MAX_FUZZ_TIME=60" >> $GITHUB_ENV
+        fi
+
     - name: Fuzzing Polyjuice Generator 1 hour
       working-directory: polyjuice-tests/fuzz
       run: |
@@ -62,7 +72,7 @@ jobs:
         ls corpus-cache
         make build/polyjuice_generator_fuzzer && \
         ./build/polyjuice_generator_fuzzer corpus corpus-cache \
-          -max_total_time=3600 -timeout=120 \
+          -max_total_time=$MAX_FUZZ_TIME -timeout=120 \
           -max_len=25000 -rss_limit_mb=0
       # Max data buffer size: 24KB < 25000 bytes
         
diff --git a/c/polyjuice_globals.h b/c/polyjuice_globals.h
index 93a77799..e2f2141c 100644
--- a/c/polyjuice_globals.h
+++ b/c/polyjuice_globals.h
@@ -1,7 +1,7 @@
 #ifndef POLYJUICE_GLOBALS_H
 #define POLYJUICE_GLOBALS_H
 
-#define POLYJUICE_VERSION "v0.8.6-rc"
+#define POLYJUICE_VERSION "v0.8.7"
 #define POLYJUICE_SHORT_ADDR_LEN 20
 /* 32 + 4 + 20 */
 #define SCRIPT_ARGS_LEN 56
diff --git a/deps/godwoken-scripts b/deps/godwoken-scripts
index 1f80d1dc..addb27a4 160000
--- a/deps/godwoken-scripts
+++ b/deps/godwoken-scripts
@@ -1 +1 @@
-Subproject commit 1f80d1dcc8641f31ae5bf4fb45e8df01a60b9be1
+Subproject commit addb27a40f12008764f7f5856c94fb51b3d87a25
diff --git a/devtools/ci/integration-test.sh b/devtools/ci/integration-test.sh
index f8c40466..c6a22521 100644
--- a/devtools/ci/integration-test.sh
+++ b/devtools/ci/integration-test.sh
@@ -15,7 +15,7 @@ else
     git clone -b master https://github.com/nervosnetwork/godwoken.git $GODWOKEN_DIR
 fi
 cd $GODWOKEN_DIR
-git checkout 5a59b6d3ac83c0b9378b199148db8e934c4ea658
+git checkout v0.6.5-rc4
 git submodule update --init --recursive
 
 cd tests-deps/godwoken-scripts/c