diff --git a/.github/workflows/npm_on_release.yml b/.github/workflows/npm_on_release.yml
index 53916e7711..bf4af33f80 100644
--- a/.github/workflows/npm_on_release.yml
+++ b/.github/workflows/npm_on_release.yml
@@ -1,21 +1,33 @@
-name: Publish typescript-client
+name: Publish typescript-client & CLI to NPM on release
 on:
   push:
     tags:
       - "v*"
+  workflow_dispatch:
 
 jobs:
-  build_npm:
+  publish_typescript_client:
     runs-on: ubicloud-standard-8
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
-          node-version: "16.x"
+          node-version: "20.x"
           registry-url: "https://registry.npmjs.org"
       - run: cd typescript-client && ./publish.sh && cd ..
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+  publish_cli:
+    runs-on: ubicloud-standard-8
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v3
+        with:
+          node-version: "20.x"
+          registry-url: "https://registry.npmjs.org"
+      - uses: denoland/setup-deno@v1
+        with:
+          deno-version: v1.x
       - run: cd cli && ./build.sh && cd npm && npm publish
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}