diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index f6dbe329..648a6c3f 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
 
     outputs:
-      fluence-js-version: "${{ steps.snapshot.outputs.version }}"
+      fluence-js-version: "v${{ steps.snapshot.outputs.version }}"
 
     permissions:
       contents: read
@@ -51,13 +51,21 @@ jobs:
 
       - name: Set avm version
         if: inputs.avm-version != ''
-        working-directory: packages/fluence-js
-        run: pnpm i --save -E @fluencelabs/avm@${{ inputs.avm-version }}
+        uses: fluencelabs/github-actions/npm-set-dependency@main
+        with:
+          package: "@fluencelabs/avm"
+          version: ${{ inputs.avm-version }}
+          working-directory: packages/fluence-js
+          package-manager: pnpm
 
       - name: Set marine-js version
         if: inputs.marine-js-version != ''
-        working-directory: packages/fluence-js
-        run: pnpm i --save -E @fluencelabs/marine-js@${{ inputs.marine-js-version }}
+        uses: fluencelabs/github-actions/npm-set-dependency@main
+        with:
+          package: "@fluencelabs/marine-js"
+          version: ${{ inputs.marine-js-version }}
+          working-directory: packages/fluence-js
+          package-manager: pnpm
 
       - name: Import secrets
         uses: hashicorp/vault-action@v2.4.3
@@ -77,21 +85,15 @@ jobs:
         uses: fluencelabs/github-actions/generate-snapshot-id@main
 
       - name: Set package version
-        id: snapshot
-        run: |
-          node ci.js bump-version ${{ steps.version.outputs.id }}
-          echo "version=$(node ci.js get-version)" >> $GITHUB_OUTPUT
+        run: node ci.js bump-version ${{ steps.version.outputs.id }}
 
       - run: pnpm -r build
 
-      - name: Publish to self-hosted npm repo
-        run: |
-          # Publish to self-hosted npm repo
-          pnpm --no-git-checks --registry https://npm.fluence.dev -r publish --tag snapshot -filter '@fluencelabs/*'
-
-      - name: Print info to check summary
+      - name: Publish snapshots
+        id: snapshot
         uses: fluencelabs/github-actions/npm-publish-snapshot@main
         with:
           working-directory: packages/fluence-js
           id: ${{ steps.version.outputs.id }}
-          publish: false
+          package-manager: pnpm
+          flags: "-r --registry https://npm.fluence.dev --no-git-checks --tag snapsot -filter '@fluencelabs/*'"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e3ec825c..cf2514cc 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -85,13 +85,21 @@ jobs:
 
       - name: Set avm version
         if: inputs.avm-version != ''
-        working-directory: packages/fluence-js
-        run: pnpm i --save -E @fluencelabs/avm@${{ inputs.avm-version }}
+        uses: fluencelabs/github-actions/npm-set-dependency@main
+        with:
+          package: "@fluencelabs/avm"
+          version: ${{ inputs.avm-version }}
+          working-directory: packages/fluence-js
+          package-manager: pnpm
 
       - name: Set marine-js version
         if: inputs.marine-js-version != ''
-        working-directory: packages/fluence-js
-        run: pnpm i --save -E @fluencelabs/marine-js@${{ inputs.marine-js-version }}
+        uses: fluencelabs/github-actions/npm-set-dependency@main
+        with:
+          package: "@fluencelabs/marine-js"
+          version: ${{ inputs.marine-js-version }}
+          working-directory: packages/fluence-js
+          package-manager: pnpm
 
       - run: pnpm -r build
       - run: pnpm -r test