diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 17fd1c7..1e69957 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -5,9 +5,9 @@ on:
   # schedule:
   #   - cron: '22 3 * * *'
   push:
-    branches: [ main, 'v0.10*' ]
+    branches: [ main, 'v0.10*', '0.10*' ]
     # Publish semver tags as releases.
-    tags: [ 'v*.*.*' ]
+    tags: [ 'v*.*.*', '0.10.*', '1.*' ]
 
 env:
   # Use docker.io for Docker Hub if empty
@@ -39,7 +39,6 @@ jobs:
             ~/.cargo/registry/index/
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
-            target/
           key: ${{ runner.os }}-cargo-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-cargo-
@@ -49,7 +48,7 @@ jobs:
       - name: Install moleculec
         run: |
           test "$(moleculec --version)" = "Moleculec 0.7.2" \
-          || CARGO_TARGET_DIR=target/ cargo install moleculec --version 0.7.2 --force
+          || cargo install moleculec --version 0.7.2 --force
       - name: Install capsule
         env:
           CAPSULE_VERSION: v0.7.0
@@ -134,6 +133,15 @@ jobs:
             build/godwoken/target/release/godwoken
             build/godwoken/target/release/gw-tools
           key: component.godwoken-${{ steps.prepare.outputs.godwoken-sha1 }}
+      - name: Cache Godwoken target directory
+        if: steps.godwoken-cache.outputs.cache-hit != 'true'
+        uses: actions/cache@v3
+        with:
+          path: |
+            build/godwoken/target
+          key: ${{ runner.os }}-cargo-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-
       - name: Build godwoken
         if: steps.godwoken-cache.outputs.cache-hit != 'true'
         working-directory: build/godwoken
@@ -164,7 +172,6 @@ jobs:
             ref.component.godwoken-scripts-sha1=${{ steps.prepare.outputs.godwoken-scripts-sha1 }}
             ref.component.godwoken-polyjuice=${{ steps.prepare.outputs.POLYJUICE_REF }}
             ref.component.godwoken-polyjuice-sha1=${{ steps.prepare.outputs.godwoken-polyjuice-sha1 }}
-
             ref.component.clerkb=${{ steps.prepare.outputs.OMNI_LOCK_REF }}
             ref.component.clerkb-sha1=${{ steps.prepare.outputs.clerkb-sha1 }}
 
diff --git a/Makefile b/Makefile
index 66adc55..154208c 100644
--- a/Makefile
+++ b/Makefile
@@ -3,13 +3,13 @@ SHELL := /bin/bash
 # components repos
 GODWOKEN_REPO := https://github.com/nervosnetwork/godwoken.git
 GODWOKEN_SCRIPTS_REPO := https://github.com/nervosnetwork/godwoken-scripts.git
-POLYJUICE_REPO := https://github.com/Flouse/polyjuice.git
+POLYJUICE_REPO := https://github.com/nervosnetwork/godwoken-polyjuice.git
 CLERKB_REPO := https://github.com/nervosnetwork/clerkb.git
 
 # components tags
-GODWOKEN_REF := v0.10.4
-GODWOKEN_SCRIPTS_REF := v0.8.4
-POLYJUICE_REF := v0.8.14
+GODWOKEN_REF := v0.10.7 # https://github.com/nervosnetwork/godwoken/releases/tag/v0.10.7
+GODWOKEN_SCRIPTS_REF := v0.9.0 # https://github.com/nervosnetwork/godwoken-scripts/releases/tag/v0.9.0
+POLYJUICE_REF := 0.8.14 # https://github.com/nervosnetwork/godwoken-polyjuice/releases/tag/0.8.14
 CLERKB_REF := v0.4.0
 
 define prepare_repo