diff --git a/.github/actions/v8-snapshot/action.yml b/.github/actions/v8-snapshot/action.yml
index 058c2221..dc73b48a 100644
--- a/.github/actions/v8-snapshot/action.yml
+++ b/.github/actions/v8-snapshot/action.yml
@@ -1,6 +1,16 @@
 name: "V8 snaphsot"
 description: "Generate v8 snapshot"
 
+inputs:
+  arch:
+    description: 'CPU arch used to select the v8 lib'
+    required: false
+    default: 'x86_64'
+  os:
+    description: 'OS used to select the v8 lib'
+    required: false
+    default: 'linux'
+
 runs:
   using: "composite"
 
@@ -9,7 +19,7 @@ runs:
       # snapshot.
     - name: V8 snapshot cache key
       id: snapshot_cache_key
-      run: echo "hash=v8-snapshot-$(git log -n 1 --pretty=format:%H --
+      run: echo "hash=v8-snapshot-${{ inputs.os }}_${{ inputs.arch }}-$(git log -n 1 --pretty=format:%H --
                  src/browser/js/bridge.zig
                  src/browser/js/Snapshot.zig
                  )" >> "$GITHUB_OUTPUT"
diff --git a/.github/workflows/wpt.yml b/.github/workflows/wpt.yml
index bfabc59c..8a3b8516 100644
--- a/.github/workflows/wpt.yml
+++ b/.github/workflows/wpt.yml
@@ -36,8 +36,10 @@ jobs:
           os: ${{env.OS}}
           arch: ${{env.ARCH}}
 
-      - name: v8 snapshot
-        run: zig build -Dprebuilt_v8_path=v8/libc_v8.a -Doptimize=ReleaseFast snapshot_creator -- src/snapshot.bin
+      - uses: ./.github/actions/v8-snapshot
+        with:
+          os: ${{env.OS}}
+          arch: ${{env.ARCH}}
 
       - name: zig build release
         run: zig build -Dsnapshot_path=../../snapshot.bin -Dprebuilt_v8_path=v8/libc_v8.a -Doptimize=ReleaseFast -Dcpu=generic