diff --git a/.github/workflows/build_cli.yml b/.github/workflows/build_cli.yml
new file mode 100644
index 000000000..deefc09c5
--- /dev/null
+++ b/.github/workflows/build_cli.yml
@@ -0,0 +1,49 @@
+name: Ontime CLI build
+
+on:
+  push:
+    tags: [ "*" ]
+  workflow_dispatch:
+
+jobs:
+  build_cli:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18.18.2
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v3
+        with:
+          version: 8
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Build project packages
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+        run: pnpm build
+
+      - name: Copy server
+        run: mkdir -p apps/cli/server && cp apps/server/dist/index.cjs apps/cli/server/index.cjs
+      
+      - name: Copy client
+        run: cp -R apps/client/build apps/cli/client
+
+      - name: Copy external
+        run: cp -R apps/server/src/external apps/cli/external
+      
+      - name: Build CLI
+        run:  pnpm build:cli
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          files: './apps/cli/dist/*'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/package.json b/package.json
index a88fcf16f..575a6eba6 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
     "build:local": "turbo run build:local",
     "build:electron": "turbo run build:electron",
     "build:localdocker": "turbo run build:localdocker",
+    "build:cli": "turbo run build:cli",
     "dist-win": "turbo run dist-win",
     "dist-mac": "turbo run dist-mac",
     "dist-linux": "turbo run dist-linux",
diff --git a/turbo.json b/turbo.json
index 9b582f876..09d7473df 100644
--- a/turbo.json
+++ b/turbo.json
@@ -26,6 +26,7 @@
     "build:local": {},
     "build:electron": {},
     "build:localdocker": {},
+    "build:cli": {},
     "e2e": {
       "dependsOn": ["^build"]
     },