diff --git a/.github/workflows/blobstorage-preview.yml b/.github/workflows/blobstorage-preview.yml
index 6f71a615d2e..5c8e87c9fa5 100644
--- a/.github/workflows/blobstorage-preview.yml
+++ b/.github/workflows/blobstorage-preview.yml
@@ -13,7 +13,7 @@ on:
       - "packages/blobstorage/**"
 
 jobs:
-  deploy-bolbstorage-preview:
+  deploy-blobstorage-preview:
     runs-on: [taiko-runner]
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/taiko-client-proverapi-preview.yml b/.github/workflows/taiko-client-proverapi-preview.yml
new file mode 100644
index 00000000000..faa4440f9e6
--- /dev/null
+++ b/.github/workflows/taiko-client-proverapi-preview.yml
@@ -0,0 +1,46 @@
+name: Prover Server API Preview
+
+env:
+  VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
+  VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID_PROVER_SERVER }}
+
+on:
+  workflow_dispatch:
+  push:
+    branches-ignore:
+      - main
+      - release-please-*
+    paths:
+      - "packages/taiko-client/**"
+
+jobs:
+  deploy-proverserver-api-preview:
+    runs-on: [taiko-runner]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install pnpm dependencies
+        uses: ./.github/actions/install-pnpm-dependencies
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.22.0
+
+      - name: Install swag cli
+        run: go install github.com/swaggo/swag/cmd/swag@latest
+
+      - name: Install Vercel CLI
+        run: pnpm add --global vercel@latest
+
+      - name: Swag autogen
+        working-directory: packages/taiko-client
+        run: ./scripts/gen_swagger_json.sh
+
+      - name: Pull Vercel Environment Information
+        run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
+
+      - name: Deploy Project Artifacts to Vercel
+        working-directory: packages/taiko-client
+        run: vercel --token=${{ secrets.VERCEL_TOKEN }}
diff --git a/.github/workflows/taiko-client-proverapi-production.yml b/.github/workflows/taiko-client-proverapi-production.yml
new file mode 100644
index 00000000000..d6f768ef6a0
--- /dev/null
+++ b/.github/workflows/taiko-client-proverapi-production.yml
@@ -0,0 +1,43 @@
+name: Prover Server API Production
+
+env:
+  VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
+  VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID_PROVER_SERVER }}
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - "taiko-client-*"
+
+jobs:
+  deploy-proverserver-api-production:
+    runs-on: [taiko-runner]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install pnpm dependencies
+        uses: ./.github/actions/install-pnpm-dependencies
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: 1.22.0
+
+      - name: Install swag cli
+        run: go install github.com/swaggo/swag/cmd/swag@latest
+
+      - name: Install Vercel CLI
+        run: pnpm add --global vercel@latest
+
+      - name: Swag autogen
+        working-directory: packages/taiko-client
+        run: ./scripts/gen_swagger_json.sh
+
+      - name: Pull Vercel Environment Information
+        run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
+
+      - name: Deploy Project Artifacts to Vercel
+        working-directory: packages/taiko-client
+        run: vercel --token=${{ secrets.VERCEL_TOKEN }}
diff --git a/.github/workflows/taiko-client-swagger.yml b/.github/workflows/taiko-client-swagger.yml
deleted file mode 100644
index a1dfcf46149..00000000000
--- a/.github/workflows/taiko-client-swagger.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-name: Swagger
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - "packages/taiko-client/**"
-
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
-concurrency:
-  group: "pages"
-  cancel-in-progress: false
-
-jobs:
-  build:
-    name: Swagger autogen docs
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-
-      - name: Set up Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: 1.21
-          cache: true
-
-      - name: install swag cli
-        run: go install github.com/swaggo/swag/cmd/swag@latest
-
-      - name: swag init
-        working-directory: packages/taiko-client
-        run: ./scripts/gen_swagger_json.sh
-
-  # TODO(d1onys1us/RogerLamTd): Fix this (should probably deploy to vercel)
-  # deploy:
-  #   if: ${{ always() }}
-  #   needs: build
-  #   environment:
-  #     name: github-pages
-  #     url: ${{ steps.deployment.outputs.page_url }}
-  #   name: github pages deploy swagger docs
-  #   runs-on: ubuntu-latest
-
-  #   steps:
-  #     - name: checkout
-  #       uses: actions/checkout@v2
-
-  #     - name: Setup Pages
-  #       uses: actions/configure-pages@v3
-
-  #     - name: Upload artifact
-  #       uses: actions/upload-pages-artifact@v2
-  #       with:
-  #         path: "packages/taiko-client"
-
-  #     - name: Deploy to GitHub Pages
-  #       id: deployment
-  #       uses: actions/deploy-pages@v2
diff --git a/packages/taiko-client/index.html b/packages/taiko-client/docs/index.html
similarity index 92%
rename from packages/taiko-client/index.html
rename to packages/taiko-client/docs/index.html
index 6a06a93af5b..f6092ef03c9 100644
--- a/packages/taiko-client/index.html
+++ b/packages/taiko-client/docs/index.html
@@ -11,7 +11,7 @@
             window.onload = function () {
                 // Begin Swagger UI call region
                 const ui = SwaggerUIBundle({
-                    url: "./docs/swagger.json", //Location of Open API spec in the repo
+                    url: "/swagger.json", // Location of Open API spec in the repo
                     dom_id: '#swagger-ui',
                     deepLinking: true,
                     presets: [